Check for INTERNET permission instead of our own manifest

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java

@@ -2276,7 +2276,7 @@ public class GBApplication extends Application {
     }
 
     public static boolean hasDirectInternetAccess() {
-        return BuildConfig.INTERNET_ACCESS && PermissionsUtils.checkPermission(getContext(), Manifest.permission.INTERNET);
+        return PermissionsUtils.checkPermission(getContext(), Manifest.permission.INTERNET);
     }
 
     public static boolean hasInternetAccess() {

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InternetHelperPreferencesActivity.kt

@@ -21,6 +21,7 @@ import android.os.Bundle
 import androidx.core.net.toUri
 import androidx.preference.Preference
 import nodomain.freeyourgadget.gadgetbridge.BuildConfig
+import nodomain.freeyourgadget.gadgetbridge.GBApplication
 import nodomain.freeyourgadget.gadgetbridge.R
 import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils
 import nodomain.freeyourgadget.gadgetbridge.util.PermissionsUtils.PACKAGE_INTERNET_HELPER
@@ -43,7 +44,7 @@ class InternetHelperPreferencesActivity : AbstractGBActivity() {
         ) {
             setPreferencesFromResource(R.xml.internethelper_preferences, rootKey)
             val unusedWarning = findPreference<Preference>("pref_key_internethelper_unused")
-            unusedWarning?.isVisible = BuildConfig.INTERNET_ACCESS
+            unusedWarning?.isVisible = GBApplication.hasDirectInternetAccess();
             val installWarning = findPreference<Preference>("pref_key_internethelper_not_installed")
             if (AndroidUtils.isPackageInstalled(PACKAGE_INTERNET_HELPER)) {
                 installWarning?.isVisible = false

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PermissionsUtils.java

@@ -26,6 +26,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
@@ -138,7 +139,7 @@ public class PermissionsUtils {
                     activity.getString(R.string.permission_post_notification_title),
                     activity.getString(R.string.permission_post_notification_summary)));
         }
-        if (BuildConfig.INTERNET_ACCESS) {
+        if (isPermissionDeclared(activity, Manifest.permission.INTERNET)) {
             permissionsList.add(new PermissionDetails(
                     Manifest.permission.INTERNET,
                     activity.getString(R.string.permission_internet_access_title),
@@ -261,6 +262,30 @@ public class PermissionsUtils {
                                     String summary) {
     }
 
+    public static boolean isPermissionDeclared(Context context, String permission) {
+        // Checks whether a permission has been declared in the (merged) manifest file.
+        // This also includes permissions declared by dependencies.
+        try {
+            PackageManager pm = context.getPackageManager();
+            PackageInfo info = pm.getPackageInfo(
+                    context.getPackageName(),
+                    PackageManager.GET_PERMISSIONS
+            );
+
+            String[] requestedPermissions = info.requestedPermissions;
+            if (requestedPermissions != null) {
+                for (String p : requestedPermissions) {
+                    if (p.equals(permission)) {
+                        return true;
+                    }
+                }
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            // Do nothing
+        }
+        return false;
+    }
+
     @SuppressLint("BatteryLife")
     private static void showRequestIgnoreBatteryOptimizationDialog(Activity activity) {
         Intent intent = new Intent();