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

STILL-UNTESTED: Fix for upgrading app to newer, non vuln version.

Browse Source 
Prior to this it was just trying to uninstall the app instead.
This commit is contained in:
Peter Serwylo 2017-09-05 12:01:57 +10:00
parent 63cf0742b7
commit 382ee652b8
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/org/fdroid/fdroid/views/updates/items/KnownVulnAppListItemController.java
View File

@ -5,19 +5,21 @@ import android.app.PendingIntent;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.text.TextUtils;
import android.view.View; import android.view.View;
import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.AppUpdateStatusManager;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.Apk;
import org.fdroid.fdroid.data.ApkProvider;
import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.App;
import org.fdroid.fdroid.data.AppPrefs; import org.fdroid.fdroid.data.AppPrefs;
import org.fdroid.fdroid.data.AppPrefsProvider; import org.fdroid.fdroid.data.AppPrefsProvider;
import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.installer.InstallManagerService;
import org.fdroid.fdroid.installer.Installer; import org.fdroid.fdroid.installer.Installer;
import org.fdroid.fdroid.installer.InstallerService; import org.fdroid.fdroid.installer.InstallerService;
import org.fdroid.fdroid.views.apps.AppListItemController; import org.fdroid.fdroid.views.apps.AppListItemController;
@ -40,7 +42,8 @@ public class KnownVulnAppListItemController extends AppListItemController {
String mainText; String mainText;
String actionButtonText; String actionButtonText;
if (shouldUpgradeInsteadOfUninstall(app)) { Apk suggestedApk = ApkProvider.Helper.findSuggestedApk(activity, app);
if (shouldUpgradeInsteadOfUninstall(app, suggestedApk)) {
mainText = activity.getString(R.string.updates__app_with_known_vulnerability__prompt_upgrade, app.name); mainText = activity.getString(R.string.updates__app_with_known_vulnerability__prompt_upgrade, app.name);
actionButtonText = activity.getString(R.string.menu_upgrade); actionButtonText = activity.getString(R.string.menu_upgrade);
} else { } else {
@ -54,9 +57,8 @@ public class KnownVulnAppListItemController extends AppListItemController {
.showSecondaryButton(activity.getString(R.string.updates__app_with_known_vulnerability__ignore)); .showSecondaryButton(activity.getString(R.string.updates__app_with_known_vulnerability__ignore));
} }
private boolean shouldUpgradeInsteadOfUninstall(@NonNull App app) { private boolean shouldUpgradeInsteadOfUninstall(@NonNull App app, @Nullable Apk suggestedApk) {
return app.installedVersionCode < app.suggestedVersionCode && return suggestedApk != null && app.installedVersionCode < suggestedApk.versionCode;
TextUtils.equals(app.installedSig, app.getMostAppropriateSignature());
} }
@Override @Override
@ -67,10 +69,12 @@ public class KnownVulnAppListItemController extends AppListItemController {
"Tried to upgrade or uninstall app with known vulnerability but it doesn't seem to be installed"); "Tried to upgrade or uninstall app with known vulnerability but it doesn't seem to be installed");
} }
if (shouldUpgradeInsteadOfUninstall(app)) { Apk suggestedApk = ApkProvider.Helper.findSuggestedApk(activity, app);
if (shouldUpgradeInsteadOfUninstall(app, suggestedApk)) {
LocalBroadcastManager manager = LocalBroadcastManager.getInstance(activity); LocalBroadcastManager manager = LocalBroadcastManager.getInstance(activity);
manager.registerReceiver(installReceiver, Installer.getUninstallIntentFilter(app.packageName)); Uri uri = Uri.parse(suggestedApk.getUrl());
InstallerService.uninstall(activity, installedApk); manager.registerReceiver(installReceiver, Installer.getInstallIntentFilter(uri));
InstallManagerService.queue(activity, app, suggestedApk);
} else { } else {
LocalBroadcastManager manager = LocalBroadcastManager.getInstance(activity); LocalBroadcastManager manager = LocalBroadcastManager.getInstance(activity);
manager.registerReceiver(installReceiver, Installer.getUninstallIntentFilter(app.packageName)); manager.registerReceiver(installReceiver, Installer.getUninstallIntentFilter(app.packageName));
@ -86,7 +90,7 @@ public class KnownVulnAppListItemController extends AppListItemController {
refreshUpdatesList(); refreshUpdatesList();
} }
private void unregisterUninstallReceiver() { private void unregisterInstallReceiver() {
LocalBroadcastManager.getInstance(activity).unregisterReceiver(installReceiver); LocalBroadcastManager.getInstance(activity).unregisterReceiver(installReceiver);
} }
@ -102,15 +106,18 @@ public class KnownVulnAppListItemController extends AppListItemController {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
switch (intent.getAction()) { switch (intent.getAction()) {
case Installer.ACTION_INSTALL_COMPLETE:
case Installer.ACTION_UNINSTALL_COMPLETE: case Installer.ACTION_UNINSTALL_COMPLETE:
refreshUpdatesList(); refreshUpdatesList();
unregisterUninstallReceiver(); unregisterInstallReceiver();
break; break;
case Installer.ACTION_INSTALL_INTERRUPTED:
case Installer.ACTION_UNINSTALL_INTERRUPTED: case Installer.ACTION_UNINSTALL_INTERRUPTED:
unregisterUninstallReceiver(); unregisterInstallReceiver();
break; break;
case Installer.ACTION_INSTALL_USER_INTERACTION:
case Installer.ACTION_UNINSTALL_USER_INTERACTION: case Installer.ACTION_UNINSTALL_USER_INTERACTION:
PendingIntent uninstallPendingIntent = PendingIntent uninstallPendingIntent =
intent.getParcelableExtra(Installer.EXTRA_USER_INTERACTION_PI); intent.getParcelableExtra(Installer.EXTRA_USER_INTERACTION_PI);