From 1053767ec8b07eb3af1d86a808ce8ff2c0bf68bf Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Wed, 26 Nov 2025 23:01:40 +0100
Subject: [PATCH] Hide internet helper preferences in builds with direct
 internet access

---
 .../InternetHelperPreferencesActivity.kt           |  2 --
 .../gadgetbridge/activities/SettingsActivity.java  | 14 +++++++++-----
 app/src/main/res/values/strings.xml                |  2 --
 .../main/res/xml/internethelper_preferences.xml    |  5 -----
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InternetHelperPreferencesActivity.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InternetHelperPreferencesActivity.kt
index 68b3c6aab3..25d33612c8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InternetHelperPreferencesActivity.kt
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InternetHelperPreferencesActivity.kt
@@ -38,8 +38,6 @@ class InternetHelperPreferencesActivity : AbstractSettingsActivityV2() {
                 rootKey: String?
             ) {
                 setPreferencesFromResource(R.xml.internethelper_preferences, rootKey)
-                val unusedWarning = findPreference<Preference>("pref_key_internethelper_unused")
-                unusedWarning?.isVisible = GBApplication.hasDirectInternetAccess();
                 val installWarning =
                     findPreference<Preference>("pref_key_internethelper_not_installed")
                 if (AndroidUtils.isPackageInstalled(PACKAGE_INTERNET_HELPER)) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
index e840cf7826..de17155559 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
@@ -364,11 +364,15 @@ public class SettingsActivity extends AbstractSettingsActivityV2 {
 
             pref = findPreference("pref_category_internethelper");
             if (pref != null) {
-                pref.setOnPreferenceClickListener(preference -> {
-                    Intent enableIntent = new Intent(requireContext(), InternetHelperPreferencesActivity.class);
-                    startActivity(enableIntent);
-                    return true;
-                });
+                if (GBApplication.hasDirectInternetAccess()) {
+                    pref.setVisible(false);
+                } else {
+                    pref.setOnPreferenceClickListener(preference -> {
+                        Intent enableIntent = new Intent(requireContext(), InternetHelperPreferencesActivity.class);
+                        startActivity(enableIntent);
+                        return true;
+                    });
+                }
             }
 
             pref = findPreference("pref_category_notifications");
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c06f67d2a3..829080fb58 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4471,8 +4471,6 @@
     <string name="rebble_appstore_fetching_download_file_failed">Fetching download file failed: %1$s</string>
     <string name="internet_helper_permission_title">Internet helper add-on</string>
     <string name="internet_helper_permission_summary">Permit access to the Gadgetbridge-internethelper add-on app</string>
-    <string name="internet_helper_pref_unused_settings_title">Unused settings</string>
-    <string name="internet_helper_pref_unused_settings_summary">The settings below are not used because direct internet access is available.</string>
     <string name="notification_channel_pebble_js_runner">Pebble JS runner</string>
     <string name="notification_pebble_js_service_title">Pebble JavaScript service</string>
     <string name="notification_pebble_js_service_text">Running Pebble app/watchface JavaScript</string>
diff --git a/app/src/main/res/xml/internethelper_preferences.xml b/app/src/main/res/xml/internethelper_preferences.xml
index 67f80e16a5..47e2fdac27 100644
--- a/app/src/main/res/xml/internethelper_preferences.xml
+++ b/app/src/main/res/xml/internethelper_preferences.xml
@@ -2,11 +2,6 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Preference
-        android:icon="@drawable/ic_warning"
-        android:key="pref_key_internethelper_unused"
-        android:title="@string/internet_helper_pref_unused_settings_title"
-        android:summary="@string/internet_helper_pref_unused_settings_summary" />
     <Preference
         android:icon="@drawable/ic_warning"
         android:key="pref_key_internethelper_not_installed"