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

Cleanup for getActivityInstaller

Browse Source
This commit is contained in:
Dominik Schürmann 2014-05-12 11:31:25 +02:00
parent 91ddc838a7
commit 54ce7a07a6
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/org/fdroid/fdroid/installer/Installer.java
View File

@ -109,6 +109,8 @@ abstract public class Installer {
// if root installer has been activated in preferences -> RootInstaller // if root installer has been activated in preferences -> RootInstaller
boolean useRootInstaller = Preferences.get().useRootInstaller(); boolean useRootInstaller = Preferences.get().useRootInstaller();
if (useRootInstaller) { if (useRootInstaller) {
Log.d(TAG, "root installer preference enabled -> RootInstaller");
try { try {
return new RootInstaller(activity, pm, callback); return new RootInstaller(activity, pm, callback);
} catch (AndroidNotCompatibleException e) { } catch (AndroidNotCompatibleException e) {
@ -127,28 +129,25 @@ abstract public class Installer {
} }
} }
// Android >= 4.0 // Fallback -> DefaultInstaller
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
// Default installer on Android >= 4.0
try { try {
Log.d(TAG, "try default installer for Android 4"); Log.d(TAG, "try default installer for Android >= 4");
return new DefaultInstallerSdk14(activity, pm, callback); return new DefaultInstallerSdk14(activity, pm, callback);
} catch (AndroidNotCompatibleException e) { } catch (AndroidNotCompatibleException e) {
Log.e(TAG, Log.e(TAG, "Android not compatible with DefaultInstallerSdk14!", e);
"Android not compatible with DefaultInstallerSdk14! This should really not happen!",
e);
} }
} } else {
// Default installer on Android < 4.0
try {
Log.d(TAG, "try default installer for Android < 4");
// Fallback -> DefaultInstaller return new DefaultInstaller(activity, pm, callback);
try { } catch (AndroidNotCompatibleException e) {
Log.d(TAG, "try default installer"); Log.e(TAG, "Android not compatible with DefaultInstaller!", e);
}
return new DefaultInstaller(activity, pm, callback);
} catch (AndroidNotCompatibleException e) {
Log.e(TAG,
"Android not compatible with DefaultInstaller! This should really not happen!",
e);
} }
// this should not happen! // this should not happen!
@ -182,7 +181,8 @@ abstract public class Installer {
pm.checkPermission(permission.INSTALL_PACKAGES, context.getPackageName()); pm.checkPermission(permission.INSTALL_PACKAGES, context.getPackageName());
int checkDeletePermission = int checkDeletePermission =
pm.checkPermission(permission.DELETE_PACKAGES, context.getPackageName()); pm.checkPermission(permission.DELETE_PACKAGES, context.getPackageName());
boolean permissionsGranted = (checkInstallPermission == PackageManager.PERMISSION_GRANTED boolean permissionsGranted =
(checkInstallPermission == PackageManager.PERMISSION_GRANTED
&& checkDeletePermission == PackageManager.PERMISSION_GRANTED); && checkDeletePermission == PackageManager.PERMISSION_GRANTED);
if (permissionsGranted) { if (permissionsGranted) {

2
src/org/fdroid/fdroid/installer/RootInstaller.java
View File

@ -205,7 +205,7 @@ public class RootInstaller extends Installer {
* <p/> * <p/>
* Options:<br/> * Options:<br/>
* -l: install the package with FORWARD_LOCK.<br/> * -l: install the package with FORWARD_LOCK.<br/>
* -r: reinstall an exisiting app, keeping its data.<br/> * -r: reinstall an existing app, keeping its data.<br/>
* -t: allow test .apks to be installed.<br/> * -t: allow test .apks to be installed.<br/>
* -i: specify the installer package name.<br/> * -i: specify the installer package name.<br/>
* -s: install package on sdcard.<br/> * -s: install package on sdcard.<br/>