Context menu for AndroidTV adjusted

manfred-mueller · Manfred Mueller · commit 1c01fa243b90 · 2024-10-17T12:04:21.000+02:00
Signed-off-by: Manfred Mueller &lt;kontakt@nass-ek.de&gt;
diff --git a/app/src/main/java/com/nass/ek/w3kiosk/AboutActivity.java b/app/src/main/java/com/nass/ek/w3kiosk/AboutActivity.java
@@ -1,6 +1,8 @@
 package com.nass.ek.w3kiosk;
 
+import static com.nass.ek.w3kiosk.ChecksAndConfigs.checkApps;
 import static com.nass.ek.w3kiosk.ChecksAndConfigs.connectionType;
+import static com.nass.ek.w3kiosk.ChecksAndConfigs.getIPAddress;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -50,7 +52,7 @@ public void onFinish() {
             Rooted = getString(R.string.No);
         }
         Date buildDate = new Date(Long.parseLong(BuildConfig.BUILD_TIME));
-        @SuppressLint("StringFormatMatches") String appinfo = (String.format(getString(R.string.appInfo), getString(R.string.app_name), localVersion, DateFormat.getDateInstance(DateFormat.MEDIUM).format(buildDate), connectionType(this), Rooted));
+        @SuppressLint("StringFormatMatches") String appinfo = (String.format(getString(R.string.appInfo), getString(R.string.app_name), localVersion, DateFormat.getDateInstance(DateFormat.MEDIUM).format(buildDate), String.format(connectionType(this) + " " + getIPAddress(getApplicationContext())), Rooted));
         TextView appinfoText = findViewById(R.id.textView3);
         appinfoText.setText(appinfo);
         findViewById(R.id.logo_id).setOnClickListener(view -> checkUpdate());
diff --git a/app/src/main/java/com/nass/ek/w3kiosk/ChecksAndConfigs.java b/app/src/main/java/com/nass/ek/w3kiosk/ChecksAndConfigs.java
@@ -7,14 +7,20 @@
 import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
 import android.os.Build;
+import android.text.format.Formatter;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Collections;
+import java.util.List;
 import java.util.Random;
 
 public class ChecksAndConfigs extends AppCompatActivity {
@@ -162,4 +168,48 @@ private static String generateRandomNumber() {
         int randomNumber = random.nextInt(1000000); // Change this range as needed
         return String.valueOf(randomNumber);
     }
+    public static String getIPAddress(Context context) {
+        // Check if connected to Wi-Fi
+        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
+
+        if (networkInfo != null && networkInfo.isConnected()) {
+            if (networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
+                // Get IP address when connected to Wi-Fi
+                WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+                int ipAddress = wifiManager.getConnectionInfo().getIpAddress();
+                return Formatter.formatIpAddress(ipAddress);
+            } else {
+                // Get IP address when connected to cellular or other network types
+                return getIPAddressFromNetworkInterface();
+            }
+        }
+        return "";
+    }
+
+    // This method retrieves the device's IP address from network interfaces (for cellular networks or other connections)
+    private static String getIPAddressFromNetworkInterface() {
+        try {
+            List<NetworkInterface> interfaces = Collections.list(NetworkInterface.getNetworkInterfaces());
+            for (NetworkInterface networkInterface : interfaces) {
+                List<InetAddress> addresses = Collections.list(networkInterface.getInetAddresses());
+                for (InetAddress address : addresses) {
+                    if (!address.isLoopbackAddress() && address instanceof InetAddress) {
+                        String ipAddress = address.getHostAddress();
+                        if (isIPv4Address(ipAddress)) {
+                            return ipAddress;
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    // Helper method to check if the IP address is IPv4 (ignore IPv6 for most common cases)
+    private static boolean isIPv4Address(String ipAddress) {
+        return ipAddress.indexOf(':') < 0;  // IPv6 addresses contain ':'
+    }
 }
diff --git a/app/src/main/java/com/nass/ek/w3kiosk/MainActivity.java b/app/src/main/java/com/nass/ek/w3kiosk/MainActivity.java
@@ -22,6 +22,10 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
+import android.net.LinkAddress;
+import android.net.LinkProperties;
+import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
@@ -30,6 +34,10 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.provider.Settings;
+import android.text.Layout;
+import android.text.SpannableString;
+import android.text.style.AlignmentSpan;
+import android.text.style.RelativeSizeSpan;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
@@ -65,6 +73,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
 import java.net.URL;
 import java.util.Objects;
 
@@ -82,6 +93,7 @@ public class MainActivity extends AppCompatActivity implements SharedPreferences
     public boolean marquee;
     private String marqueeText;
     private boolean marqueeVisible;
+    public String localIp;
     public String clientUrl1;
     public String clientUrl2;
     public String clientUrl3;
@@ -139,6 +151,7 @@ protected void onCreate(Bundle savedInstanceState) {
         checkmobileMode = sharedPreferences.getBoolean("mobileMode", false);
         checkAutoLogin = sharedPreferences.getBoolean("autoLogin", false);
         autoUpdate = sharedPreferences.getBoolean("autoUpdate", false);
+        localIp = getLocalIpAddress(this);
         marquee = sharedPreferences.getBoolean("marquee", false);
         appsCount = sharedPreferences.getInt("appsCount", 0);
         toSetting = sharedPreferences.getInt("urlTimeout", 0);
@@ -613,6 +626,16 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMen
         menu.add(0, 2, 0, R.string.deactivateMenubutton);
         menu.add(0, 3, 0, R.string.settings);
         menu.add(0, 4, 0, R.string.showHelp);
+
+        // Create the 5th item with centered and smaller text
+        String ipText = String.format("IP: %s", localIp);
+        SpannableString smallerCenteredText = new SpannableString(ipText);
+        // Center the text
+        smallerCenteredText.setSpan(new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER), 0, ipText.length(), 0);
+        // Make the text half the size
+        smallerCenteredText.setSpan(new RelativeSizeSpan(0.5f), 0, ipText.length(), 0);
+
+        menu.add(0, 5, 0, smallerCenteredText);
     }
 
     @Override
@@ -657,6 +680,7 @@ private void stopMarqueeHandler() {
         marqueeHandler.removeCallbacks(marqueeRunnable);
     }
 
+    @SuppressLint("StaticFieldLeak")
     public void Update(final String apkUrl1, @Nullable final String apkUrl2) {
         new AsyncTask<Void, String, String>() {
             String result = "";
@@ -813,4 +837,31 @@ public void onClick(DialogInterface dialog, int which) {
         });
         builder.show();
     }
+    public static String getLocalIpAddress(Context context) {
+        try {
+            ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+            if (connectivityManager != null) {
+                Network[] allNetworks = connectivityManager.getAllNetworks();
+                for (Network network : allNetworks) {
+                    NetworkCapabilities networkCapabilities = connectivityManager.getNetworkCapabilities(network);
+                    if (networkCapabilities != null && networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
+                        LinkProperties linkProperties = connectivityManager.getLinkProperties(network);
+                        if (linkProperties != null) {
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { // Android 7 (Nougat) or higher
+                                for (LinkAddress linkAddress : linkProperties.getLinkAddresses()) {
+                                    InetAddress address = linkAddress.getAddress();
+                                    // Check if it's a valid local IP address (IPv4 or IPv6)
+                                    if (!address.isLoopbackAddress() && (address instanceof Inet4Address)) {
+                                        return address.getHostAddress();
+                                    }
+                                }
+                            }                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null; // Return null if no IP address was found
+    }
 }
diff --git a/app/src/main/res/layout/menu_item_centered.xml b/app/src/main/res/layout/menu_item_centered.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/centered_menu_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:padding="16dp"
+    android:textColor="@android:color/black"
+    android:textSize="16sp" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="enable_autoscale">Adjust screen size</string>
     <string name="mobile_mode">Mobile Mode</string>
     <string name="website1">First client url (without %s)</string>
-    <string name="copyright" translatable="false">© 2023, NASS e.K.</string>
+    <string name="copyright" translatable="false">© 2024, NASS e.K.</string>
     <string name="set_home_button" translatable="false">Set home button</string>
     <string name="set_launcher_button" translatable="false">Set launcher button</string>
     <string name="settings_save_button" translatable="false">Settings save button</string>
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 }
 
 ext {
-    verCode = 47
+    verCode = 48
     verName = "2.6.2"
     releaseDir = file("${projectDir}/app/release")
 }
diff --git a/w3kiosk.json b/w3kiosk.json
@@ -1,5 +1,5 @@
 {
-    "versionCode":47,
+    "versionCode":48,
     "versionName":"2.6.2",
     "contentText":"Neue W3Kiosk-Version",
     "minSupport":1,

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ buildscript {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`ext {`
`14`		`- verCode = 47`
	`14`	`+ verCode = 48`
`15`	`15`	`verName = "2.6.2"`
`16`	`16`	`releaseDir = file("${projectDir}/app/release")`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "versionCode":47,`
	`2`	`+ "versionCode":48,`
`3`	`3`	`"versionName":"2.6.2",`
`4`	`4`	`"contentText":"Neue W3Kiosk-Version",`
`5`	`5`	`"minSupport":1,`