create FOSS and nonFOSS flavors and corresponding AndroidManifests

* Disable AutoUpdates in `FOSS` flavor * Move permissions to `nonFOSS` manifest
kaajjo · Feb 22, 2025 · e183f48 · e183f48
1 parent 383d6cc
commit e183f48
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 42 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -40,6 +40,16 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
+
+    flavorDimensions += "version"
+    productFlavors {
+        create("foss") {
+            dimension = "version"
+        }
+        create("nonFOSS") {
+            dimension = "version"
+        }
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17

diff --git a/app/src/foss/AndroidManifest.xml b/app/src/foss/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<manifest>
+
+    <application>
+    </application>
+
+</manifest>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,11 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-
     <application
         android:name=".LibreSudokuApp"
         android:allowBackup="true"

diff --git a/app/src/main/java/com/kaajjo/libresudoku/core/update/UpdateUtil.kt b/app/src/main/java/com/kaajjo/libresudoku/core/update/UpdateUtil.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.util.Log
 import androidx.core.content.FileProvider
 import com.kaajjo.libresudoku.BuildConfig
+import com.kaajjo.libresudoku.util.FlavorUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -64,6 +65,9 @@ object UpdateUtil {
     }
 
     fun checkForUpdate(allowBetas: Boolean = true): Release? {
+        if (FlavorUtil.isFoss()) {
+            return null
+        }
         val currentVersion = BuildConfig.VERSION_NAME.toVersion()
 
         val latestRelease = getLatestRelease(allowBetas)

diff --git a/app/src/main/java/com/kaajjo/libresudoku/ui/more/MoreScreen.kt b/app/src/main/java/com/kaajjo/libresudoku/ui/more/MoreScreen.kt
@@ -74,6 +74,7 @@ import com.kaajjo.libresudoku.ui.components.AnimatedNavigation
 import com.kaajjo.libresudoku.ui.components.PreferenceRow
 import com.kaajjo.libresudoku.ui.settings.autoupdate.UpdateChannel
 import com.kaajjo.libresudoku.ui.theme.RoundedPolygonShape
+import com.kaajjo.libresudoku.util.FlavorUtil
 import com.materialkolor.ktx.blend
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
@@ -142,37 +143,39 @@ fun MoreScreen(
                 onClick = { navigator.navigate(AboutScreenDestination()) }
             )
 
-            AnimatedVisibility(autoUpdateChannel != UpdateChannel.Disabled) {
-                var latestRelease by remember { mutableStateOf<Release?>(null) }
-                LaunchedEffect(Unit) {
-                    if (latestRelease == null) {
-                        withContext(Dispatchers.IO) {
-                            runCatching {
-                                latestRelease =
-                                    UpdateUtil.checkForUpdate(autoUpdateChannel == UpdateChannel.Beta)
+            if (!FlavorUtil.isFoss()) {
+                AnimatedVisibility(autoUpdateChannel != UpdateChannel.Disabled) {
+                    var latestRelease by remember { mutableStateOf<Release?>(null) }
+                    LaunchedEffect(Unit) {
+                        if (latestRelease == null) {
+                            withContext(Dispatchers.IO) {
+                                runCatching {
+                                    latestRelease =
+                                        UpdateUtil.checkForUpdate(autoUpdateChannel == UpdateChannel.Beta)
+                                }
                             }
                         }
                     }
-                }
-                latestRelease?.let { release ->
-                    AnimatedVisibility(
-                        visible = release.name.toString() != updateDismissedName,
-                        enter = expandVertically() + fadeIn(),
-                        exit = shrinkVertically() + fadeOut()
-                    ) {
-                        UpdateFoundBox(
-                            versionToUpdate = release.name ?: "?",
-                            onClick = {
-                                navigator.navigate(AutoUpdateScreenDestination())
-                            },
-                            onDismissed = {
-                                viewModel.dismissUpdate(release)
-                            },
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(horizontal = 12.dp)
-                                .padding(top = 8.dp)
-                        )
+                    latestRelease?.let { release ->
+                        AnimatedVisibility(
+                            visible = release.name.toString() != updateDismissedName,
+                            enter = expandVertically() + fadeIn(),
+                            exit = shrinkVertically() + fadeOut()
+                        ) {
+                            UpdateFoundBox(
+                                versionToUpdate = release.name ?: "?",
+                                onClick = {
+                                    navigator.navigate(AutoUpdateScreenDestination())
+                                },
+                                onDismissed = {
+                                    viewModel.dismissUpdate(release)
+                                },
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(horizontal = 12.dp)
+                                    .padding(top = 8.dp)
+                            )
+                        }
                     }
                 }
             }

diff --git a/app/src/main/java/com/kaajjo/libresudoku/ui/settings/SettingsCategoriesScreen.kt b/app/src/main/java/com/kaajjo/libresudoku/ui/settings/SettingsCategoriesScreen.kt
@@ -52,6 +52,7 @@ import com.kaajjo.libresudoku.ui.components.collapsing_topappbar.CollapsingTopAp
 import com.kaajjo.libresudoku.ui.components.collapsing_topappbar.rememberTopAppBarScrollBehavior
 import com.kaajjo.libresudoku.ui.settings.components.AppThemePreviewItem
 import com.kaajjo.libresudoku.ui.util.getCurrentLocaleString
+import com.kaajjo.libresudoku.util.FlavorUtil
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 
@@ -124,15 +125,17 @@ fun SettingsCategoriesScreen(
                     painter = rememberVectorPainter(Icons.Outlined.Language)
                 )
             }
-            item {
-                PreferenceRow(
-                    title = stringResource(R.string.auto_update_title),
-                    subtitle = stringResource(R.string.auto_updates_summary),
-                    onClick = {
-                        navigator.navigate(AutoUpdateScreenDestination())
-                    },
-                    painter = rememberVectorPainter(Icons.Rounded.SystemUpdate)
-                )
+            if (!FlavorUtil.isFoss()) {
+                item {
+                    PreferenceRow(
+                        title = stringResource(R.string.auto_update_title),
+                        subtitle = stringResource(R.string.auto_updates_summary),
+                        onClick = {
+                            navigator.navigate(AutoUpdateScreenDestination())
+                        },
+                        painter = rememberVectorPainter(Icons.Rounded.SystemUpdate)
+                    )
+                }
             }
             item {
                 PreferenceRow(

diff --git a/app/src/main/java/com/kaajjo/libresudoku/util/FlavorUtil.kt b/app/src/main/java/com/kaajjo/libresudoku/util/FlavorUtil.kt
@@ -0,0 +1,7 @@
+package com.kaajjo.libresudoku.util
+
+import com.kaajjo.libresudoku.BuildConfig
+
+object FlavorUtil {
+    fun isFoss(): Boolean  = BuildConfig.FLAVOR == "foss"
+}
diff --git a/app/src/nonFOSS/AndroidManifest.xml b/app/src/nonFOSS/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+
+    <application>
+    </application>
+
+</manifest>