Merge pull request #581 from appdevforall/feat/K2GO-403-disable-ota-fdroid

K2GO-403 feat(update): disable the in-app OTA self-updater in the fdroid build

Author: luisguzman-adfa

controller/app/build.gradle

@@ -58,6 +58,9 @@ android {
         // Default state of the crash-report opt-in (K2GO-401). True for conventional builds. The
         // F-Droid recipe overrides this to false so that build ships crash reporting OFF by default.
         buildConfigField "boolean", "CRASH_REPORTS_DEFAULT_ON", "true"
+        // K2GO-403: the in-app OTA self-updater. On for conventional builds; the fdroid flavor forces it
+        // off (F-Droid forbids an app that downloads and installs its own APK; the store updates it).
+        buildConfigField "boolean", "OTA_ENABLED", "true"
 
         // The APK carries the product's name, not its technical identifier: these files are
         // downloaded by people from a public bucket. The identifier still lives inside the APK.
@@ -135,6 +138,8 @@ android {
             dimension "distribution"
             buildConfigField "boolean", "ANALYTICS_ENABLED", "false"
             buildConfigField "boolean", "CRASH_REPORTS_DEFAULT_ON", "false"
+            // K2GO-403: no in-app OTA self-updater in the fdroid build (F-Droid forbids self-install).
+            buildConfigField "boolean", "OTA_ENABLED", "false"
         }
     }
 

controller/app/src/fdroid/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- K2GO-403: the fdroid build ships no in-app OTA self-updater. F-Droid forbids an app that
+         downloads and installs its own APK, so remove the self-install permission from this variant.
+         The update path is also gated off in code via BuildConfig.OTA_ENABLED (updater not created,
+         "Check for updates" row hidden). The store is the update channel for this build. -->
+    <uses-permission
+        android:name="android.permission.REQUEST_INSTALL_PACKAGES"
+        tools:node="remove" />
+</manifest>

controller/app/src/main/java/org/appdevforall/k2go/redesign/LibraryActivity.java

@@ -123,7 +123,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // ADFA-4984: OTA self-updater, active on the library screen. The manual entry lives in
         // Settings -> About; onResume runs one silent check and wires the download receiver.
-        updateController = new org.appdevforall.k2go.update.presentation.UpdateController(this);
+        // K2GO-403: the fdroid build ships no in-app OTA (F-Droid forbids self-install). Leaving the
+        // controller null keeps every OTA path off, since all call sites already null-guard it.
+        if (org.appdevforall.k2go.BuildConfig.OTA_ENABLED) {
+            updateController = new org.appdevforall.k2go.update.presentation.UpdateController(this);
+        }
 
         bottomNav = findViewById(R.id.k2go_bottom_nav);
         railNav = findViewById(R.id.k2go_nav_rail);

controller/app/src/main/java/org/appdevforall/k2go/redesign/SettingsSubFragment.java

@@ -182,13 +182,16 @@ private String endonymOf(String tag) {
     private void buildAbout(Context ctx, LinearLayout list) {
         SettingsUi.infoRow(ctx, list, getString(R.string.k2go_settings_app_version), versionName(ctx));
         // ADFA-4984: manual OTA entry ("update on the air"). LibraryActivity owns the UpdateController.
-        SettingsUi.row(ctx, list, getString(R.string.k2go_settings_check_updates), null, null, v -> {
-            if (getActivity() instanceof LibraryActivity) {
-                org.appdevforall.k2go.update.presentation.UpdateController uc =
-                        ((LibraryActivity) getActivity()).updateController();
-                if (uc != null) uc.checkForUpdatesManual();
-            }
-        });
+        // K2GO-403: hidden in the fdroid build, which ships no in-app updater (updates come from F-Droid).
+        if (org.appdevforall.k2go.BuildConfig.OTA_ENABLED) {
+            SettingsUi.row(ctx, list, getString(R.string.k2go_settings_check_updates), null, null, v -> {
+                if (getActivity() instanceof LibraryActivity) {
+                    org.appdevforall.k2go.update.presentation.UpdateController uc =
+                            ((LibraryActivity) getActivity()).updateController();
+                    if (uc != null) uc.checkForUpdatesManual();
+                }
+            });
+        }
         SettingsUi.row(ctx, list, getString(R.string.k2go_settings_permissions), null, null, v -> openAppSettings(ctx));
         // ADFA-5337: hide the usage-statistics toggle when analytics is compiled out (no
         // google-services.json), since there's nothing to share and the switch would do nothing.