fixed unable to submit ratings with microG

Author: StellarSand

app/build.gradle.kts

@@ -33,15 +33,16 @@ android {
         applicationId = "tech.techlore.plexus"
         minSdk = 23
         targetSdk = 34
-        versionCode = 201
-        versionName = "2.0.1"
+        versionCode = 202
+        versionName = "2.0.2"
         setProperty("archivesBaseName", "Plexus_v$versionName")
     }
 
     buildTypes {
         getByName("release") {
             isMinifyEnabled = true
             isShrinkResources = true
+            vcsInfo.include = false // https://f-droid.org/docs/Reproducible_Builds/#vcs-info
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
         /*getByName("debug") {

app/src/main/java/tech/techlore/plexus/activities/AppDetailsActivity.kt

@@ -27,7 +27,6 @@ import android.view.MenuItem
 import android.view.animation.AccelerateDecelerateInterpolator
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
 import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
@@ -167,7 +166,7 @@ class AppDetailsActivity : AppCompatActivity(), MenuProvider {
                                      getString(R.string.install_app_to_submit, app.name),
                                      activityBinding.bottomAppBarRadio)
 
-                    !appManager.deviceIsDeGoogled || !appManager.deviceIsMicroG ->
+                    !appManager.isDeviceDeGoogled && !appManager.isDeviceMicroG ->
                         showSnackbar(activityBinding.detailsCoordLayout,
                                      getString(R.string.device_should_be_degoogled_or_microg),
                                      activityBinding.bottomAppBarRadio)

app/src/main/java/tech/techlore/plexus/activities/SubmitActivity.kt

@@ -91,7 +91,7 @@ class SubmitActivity : AppCompatActivity() {
 
         activityBinding.dgMgText.apply {
             val (statusIcon, statusText) =
-                if (appManager.deviceIsMicroG) {
+                if (appManager.isDeviceMicroG) {
                     Pair(ContextCompat.getDrawable(context, R.drawable.ic_microg),
                          "${getString(R.string.microG)} ${getString(R.string.status)}")
                 }

app/src/main/java/tech/techlore/plexus/appmanager/ApplicationManager.kt

@@ -41,8 +41,8 @@ class ApplicationManager : Application() {
     val miniRepository by lazy { MainDataMinimalRepository(this, database.mainDataDao()) }
     val myRatingsRepository by lazy { MyRatingsRepository(database.myRatingsDao()) }
 
-    var deviceIsMicroG = false
-    var deviceIsDeGoogled = false
+    var isDeviceMicroG = false
+    var isDeviceDeGoogled = false
     var isDataUpdated = false
 
     override fun onCreate() {

app/src/main/java/tech/techlore/plexus/fragments/bottomsheets/SubmitBottomSheet.kt

@@ -113,7 +113,7 @@ class SubmitBottomSheet : BottomSheetDialogFragment() {
                             romBuild = Build.DISPLAY,
                             androidVersion = getAndroidVersionString(),
                             installedFrom = submitActivity.installedFromString,
-                            ratingType = if (appManager.deviceIsMicroG) "micro_g" else "native",
+                            ratingType = if (appManager.isDeviceMicroG) "micro_g" else "native",
                             score = mapStatusChipIdToRatingScore(submitActivity.activityBinding.submitStatusChipGroup.checkedChipId),
                             notes = submitActivity.activityBinding.submitNotesText.text.toString())
         postRatingRoot = PostRatingRoot(rating)

app/src/main/java/tech/techlore/plexus/utils/PackageUtils.kt

@@ -81,7 +81,7 @@ class PackageUtils {
             }
         }
 
-        fun getAppCertificate(packageManager: PackageManager,
+        private fun getAppCertificate(packageManager: PackageManager,
                               packageName: String): String? {
             return try {
                 val packageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES)
@@ -101,16 +101,6 @@ class PackageUtils {
             return fdroidCertificate == getAppCertificate(packageManager, packageName)
         }
 
-        fun isAppInstalled(packageManager: PackageManager, packageName: String): Boolean {
-            return try {
-                packageManager.getApplicationInfo(packageName, 0)
-                true
-            }
-            catch (e: PackageManager.NameNotFoundException) {
-                false
-            }
-        }
-        
     }
 
 }

app/src/main/java/tech/techlore/plexus/utils/SystemUtils.kt

@@ -19,9 +19,10 @@ package tech.techlore.plexus.utils
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
+import android.widget.Toast
 import tech.techlore.plexus.appmanager.ApplicationManager
-import tech.techlore.plexus.utils.PackageUtils.Companion.getAppCertificate
-import tech.techlore.plexus.utils.PackageUtils.Companion.isAppInstalled
 
 class SystemUtils {
 
@@ -35,21 +36,38 @@ class SystemUtils {
                                        "com.google.android.gsf",
                                        "com.android.vending")
 
-            val microGCertificate = "O=NOGAPPS Project,C=DE"
             val packageManager = context.packageManager
-    
+            
             val gappsCount =
                 gappsPackages.count { packageName ->
                     isAppInstalled(packageManager, packageName)
                 }
 
-            val microGCount =
-                gappsPackages.count { packageName ->
-                    microGCertificate == getAppCertificate(packageManager, packageName)
+            var microGCount =
+                if (gappsCount > 0) {
+                    gappsPackages.count { packageName ->
+                        ! packageManager.getApplicationLabel(getAppInfo(packageManager, packageName)).toString()
+                            .startsWith("Google", ignoreCase = true)
+                    }
                 }
-    
-            appManager.deviceIsMicroG = gappsCount == microGCount
-            appManager.deviceIsDeGoogled = gappsCount == 0
+                else -1
+            
+            appManager.isDeviceMicroG = gappsCount == microGCount
+            appManager.isDeviceDeGoogled = gappsCount == 0
+        }
+        
+        private fun getAppInfo(packageManager: PackageManager, packageName: String): ApplicationInfo {
+            return packageManager.getApplicationInfo(packageName, 0)
+        }
+        
+        private fun isAppInstalled(packageManager: PackageManager, packageName: String): Boolean {
+            return try {
+                getAppInfo(packageManager, packageName)
+                true
+            }
+            catch (e: PackageManager.NameNotFoundException) {
+                false
+            }
         }
 
         @SuppressLint("PrivateApi")