From 8e193cecffd9a5cdd46051bb83f63d5032a6a7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 3 Jan 2016 18:55:15 +0100
Subject: [PATCH 1/2] Apk: Don't create Integer object just to compare

---
 F-Droid/src/org/fdroid/fdroid/data/Apk.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/data/Apk.java b/F-Droid/src/org/fdroid/fdroid/data/Apk.java
index 0c95ec063..76789f1f5 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/Apk.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/Apk.java
@@ -146,7 +146,7 @@ public class Apk extends ValueObject implements Comparable<Apk> {
 
     @Override
     public int compareTo(Apk apk) {
-        return Integer.valueOf(vercode).compareTo(apk.vercode);
+        return Integer.compare(vercode, apk.vercode);
     }
 
 }

From ea3c95832ea733bb4e928772772b13638d243032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 3 Jan 2016 19:08:52 +0100
Subject: [PATCH 2/2] Simplify some ifs

Sometimes joining them, removing unnecessary checks and removing
unnecessary levels of indentation.
---
 F-Droid/src/org/fdroid/fdroid/AppDetails.java | 21 +++++++------------
 F-Droid/src/org/fdroid/fdroid/AppFilter.java  |  7 +++----
 F-Droid/src/org/fdroid/fdroid/Utils.java      | 13 +++++++-----
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index ab9b4dc65..3453830e5 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -185,8 +185,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
                 return getString(R.string.app_not_installed);
             }
             // Definitely installed this version.
-            if (app.installedSig != null && apk.sig != null
-                    && apk.sig.equals(app.installedSig)) {
+            if (apk.sig != null && apk.sig.equals(app.installedSig)) {
                 return getString(R.string.app_installed);
             }
             // Installed the same version, but from someplace else.
@@ -561,11 +560,9 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
 
     @Override
     protected void onDestroy() {
-        if (downloadHandler != null) {
-            if (!inProcessOfChangingConfiguration) {
-                downloadHandler.cancel(false);
-                cleanUpFinishedDownload();
-            }
+        if (downloadHandler != null && !inProcessOfChangingConfiguration) {
+            downloadHandler.cancel(false);
+            cleanUpFinishedDownload();
         }
         inProcessOfChangingConfiguration = false;
         super.onDestroy();
@@ -1600,12 +1597,10 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
             public void onClick(View v) {
                 App app = getApp();
                 AppDetails activity = (AppDetails) getActivity();
-                if (updateWanted) {
-                    if (app.suggestedVercode > 0) {
-                        final Apk apkToInstall = ApkProvider.Helper.find(activity, app.packageName, app.suggestedVercode);
-                        activity.install(apkToInstall);
-                        return;
-                    }
+                if (updateWanted && app.suggestedVercode > 0) {
+                    Apk apkToInstall = ApkProvider.Helper.find(activity, app.packageName, app.suggestedVercode);
+                    activity.install(apkToInstall);
+                    return;
                 }
                 if (installed) {
                     // If installed
diff --git a/F-Droid/src/org/fdroid/fdroid/AppFilter.java b/F-Droid/src/org/fdroid/fdroid/AppFilter.java
index 2532a130d..e139ae808 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppFilter.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppFilter.java
@@ -29,10 +29,9 @@ public class AppFilter {
             return false;
         }
 
-        if (!Preferences.get().filterAppsRequiringRoot()) {
-            if (app.requirements.contains("root")) {
-                return true;
-            }
+        if (!Preferences.get().filterAppsRequiringRoot() &&
+                app.requirements.contains("root")) {
+            return true;
         }
 
         return false;
diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java
index a50657da1..e69630a5b 100644
--- a/F-Droid/src/org/fdroid/fdroid/Utils.java
+++ b/F-Droid/src/org/fdroid/fdroid/Utils.java
@@ -662,11 +662,14 @@ public final class Utils {
         }
 
         for (File f : files) {
-            if ((startsWith != null && f.getName().startsWith(startsWith))
-                    || (endsWith != null && f.getName().endsWith(endsWith))) {
-                if (!f.delete()) {
-                    Log.w(TAG, "Couldn't delete cache file " + f);
-                }
+            if (startsWith != null && f.getName().startsWith(startsWith)) {
+                continue;
+            }
+            if (endsWith != null && f.getName().endsWith(endsWith)) {
+                continue;
+            }
+            if (!f.delete()) {
+                Log.w(TAG, "Couldn't delete cache file " + f);
             }
         }
     }