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

remove confusing messages when Privileged Extension not installed

Browse Source 
This was saying that the Privileged Extension is enabled but not properly
configured.  This is because the preference logic changed to default to on
unless the user explicitly disabled it.  So using the Privileged
Extension based on whether its installed and whether the user has disabled
it.

related to ea0700d406101b7ed6907b1dbd2918dbc214f435
This commit is contained in:
Hans-Christoph Steiner 2016-08-26 10:50:43 +02:00
parent 0577ecfc53
commit b45f7ba27c
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,6 @@
package org.fdroid.fdroid.installer; package org.fdroid.fdroid.installer;
import android.content.Context; import android.content.Context;
import android.util.Log;
import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
@ -47,17 +46,11 @@ public class InstallerFactory {
&& apk.packageName.equals(PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME)) { && apk.packageName.equals(PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME)) {
// special case for "F-Droid Privileged Extension" // special case for "F-Droid Privileged Extension"
installer = new ExtensionInstaller(context); installer = new ExtensionInstaller(context);
} else if (isPrivilegedInstallerEnabled()) { } else if (isPrivilegedInstallerEnabled()
if (PrivilegedInstaller.isExtensionInstalledCorrectly(context) && PrivilegedInstaller.isExtensionInstalledCorrectly(context)
== PrivilegedInstaller.IS_EXTENSION_INSTALLED_YES) { == PrivilegedInstaller.IS_EXTENSION_INSTALLED_YES) {
Utils.debugLog(TAG, "privileged extension correctly installed -> PrivilegedInstaller"); Utils.debugLog(TAG, "privileged extension correctly installed -> PrivilegedInstaller");
installer = new PrivilegedInstaller(context); installer = new PrivilegedInstaller(context);
} else {
Log.e(TAG, "PrivilegedInstaller is enabled in prefs, but not working correctly!");
// fallback to default installer
installer = new DefaultInstaller(context);
}
} else { } else {
installer = new DefaultInstaller(context); installer = new DefaultInstaller(context);
} }

1
app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java
View File

@ -271,7 +271,6 @@ public class PrivilegedInstaller extends Installer {
public static int isExtensionInstalledCorrectly(Context context) { public static int isExtensionInstalledCorrectly(Context context) {
// check if installed // check if installed
if (!isExtensionInstalled(context)) { if (!isExtensionInstalled(context)) {
Log.e(TAG, "IS_EXTENSION_INSTALLED_NO");
return IS_EXTENSION_INSTALLED_NO; return IS_EXTENSION_INSTALLED_NO;
} }