Fix InstallRestriction

We had a logic bug where isAllowed actually meant isDisallowed
seedvault-app · May 28, 2024 · d9642ae · d9642ae
1 parent 5184020
commit d9642ae
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallRestriction.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallRestriction.kt
@@ -6,17 +6,23 @@
 package com.stevesoltys.seedvault.restore.install
 
 import android.os.UserManager
+import android.os.UserManager.DISALLOW_INSTALL_APPS
+import android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES
+import android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY
 
 internal fun interface InstallRestriction {
     fun isAllowedToInstallApks(): Boolean
 }
 
-private fun UserManager.isRestricted(restriction: String): Boolean {
+private fun UserManager.isDisallowed(restriction: String): Boolean {
     return userRestrictions.getBoolean(restriction, false)
 }
 
 internal fun UserManager.isAllowedToInstallApks(): Boolean {
-    return isRestricted(UserManager.DISALLOW_INSTALL_APPS) ||
-        isRestricted(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES) ||
-        isRestricted(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY)
+    // install isn't allowed if one of those user restrictions is set
+    val disallowed = isDisallowed(DISALLOW_INSTALL_APPS) ||
+        isDisallowed(DISALLOW_INSTALL_UNKNOWN_SOURCES) ||
+        isDisallowed(DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY)
+    // install is allowed, if it isn't disallowed
+    return !disallowed
 }