Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'privext-updates' into 'master'

Browse Source 
InstallerFactory: Check for privext before checking if apk to be installed is privext

Closes #911

See merge request !459
This commit is contained in:
Hans-Christoph Steiner 2017-03-31 17:45:11 +00:00
commit e2ab447315
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/fdroid/fdroid/installer/InstallerFactory.java
View File

@ -45,12 +45,12 @@ public class InstallerFactory {
} }
Installer installer; Installer installer;
if (apk.packageName.equals(PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME)) { if (PrivilegedInstaller.isDefault(context)) {
// special case for installing "Privileged Extension" with root
installer = new ExtensionInstaller(context, apk);
} else if (PrivilegedInstaller.isDefault(context)) {
Utils.debugLog(TAG, "privileged extension correctly installed -> PrivilegedInstaller"); Utils.debugLog(TAG, "privileged extension correctly installed -> PrivilegedInstaller");
installer = new PrivilegedInstaller(context, apk); installer = new PrivilegedInstaller(context, apk);
} else if (apk.packageName.equals(PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME)) {
// special case for installing "Privileged Extension" with root
installer = new ExtensionInstaller(context, apk);
} else { } else {
installer = new DefaultInstaller(context, apk); installer = new DefaultInstaller(context, apk);
} }