From 1914f5f3e11455d41a7ef64308032870ef825f3e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 27 May 2016 21:40:10 +0200 Subject: [PATCH] remove unused app.uninstallable app.uninstallable is only used in AppDetails. It is only set when generating App instances from installed APKs for the swap stuff. Since it is initialized to false and used as !app.uninstallable, it is always true when used. So it was doing nothing. This needs to be thought out more so this is not entirely complete for #628. AppDetails needs to know whether its a system app to provide proper feedback and swap needs to know whether its a system app with an update installed, otherwise it should ignore it. --- app/src/main/java/org/fdroid/fdroid/AppDetails.java | 3 --- app/src/main/java/org/fdroid/fdroid/data/App.java | 5 ----- 2 files changed, 8 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails.java b/app/src/main/java/org/fdroid/fdroid/AppDetails.java index 903b60264..41641751b 100644 --- a/app/src/main/java/org/fdroid/fdroid/AppDetails.java +++ b/app/src/main/java/org/fdroid/fdroid/AppDetails.java @@ -1571,9 +1571,6 @@ public class AppDetails extends AppCompatActivity { btMain.setText(R.string.menu_launch); } else { btMain.setText(R.string.menu_uninstall); - if (!app.uninstallable) { - btMain.setVisibility(View.GONE); - } } } btMain.setOnClickListener(mOnClickListener); diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java index 9cb4b4463..c15ddd9ee 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -129,8 +129,6 @@ public class App extends ValueObject implements Comparable { public String installedSig; - public boolean uninstallable; - public static String getIconName(String packageName, int versionCode) { return packageName + "_" + versionCode + ".png"; } @@ -314,9 +312,6 @@ public class App extends ValueObject implements Comparable { this.name = (String) appInfo.loadLabel(pm); this.icon = getIconName(packageName, packageInfo.versionCode); this.compatible = true; - boolean system = (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0; - boolean updatedSystemApp = (appInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0; - this.uninstallable = !system || updatedSystemApp; } private void initApkFromApkFile(Context context, Apk apk, PackageInfo packageInfo, SanitizedFile apkFile)