mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

Fix InstallRestriction

Browse source 
We had a logic bug where isAllowed actually meant isDisallowed
This commit is contained in:
Torsten Grote 2024-05-28 14:32:36 -03:00
parent 5184020f2f
commit d9642aec9d
No known key found for this signature in database
GPG key ID: 3E5F77D92CF891FF
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallRestriction.kt
View file

@ -6,17 +6,23 @@
package com.stevesoltys.seedvault.restore.install package com.stevesoltys.seedvault.restore.install
import android.os.UserManager 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 { internal fun interface InstallRestriction {
fun isAllowedToInstallApks(): Boolean fun isAllowedToInstallApks(): Boolean
} }
private fun UserManager.isRestricted(restriction: String): Boolean { private fun UserManager.isDisallowed(restriction: String): Boolean {
return userRestrictions.getBoolean(restriction, false) return userRestrictions.getBoolean(restriction, false)
} }
internal fun UserManager.isAllowedToInstallApks(): Boolean { internal fun UserManager.isAllowedToInstallApks(): Boolean {
return isRestricted(UserManager.DISALLOW_INSTALL_APPS) || // install isn't allowed if one of those user restrictions is set
isRestricted(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES) || val disallowed = isDisallowed(DISALLOW_INSTALL_APPS) ||
isRestricted(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY) isDisallowed(DISALLOW_INSTALL_UNKNOWN_SOURCES) ||
isDisallowed(DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY)
// install is allowed, if it isn't disallowed
return !disallowed
} }