From 0506160f7bede2b342af196ab41feaa3b9d695a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 1 Apr 2015 16:57:16 +0200
Subject: [PATCH] Make use of List.contains(o) since it already does .equals()

---
 F-Droid/src/org/fdroid/fdroid/AppFilter.java     | 10 +++-------
 .../org/fdroid/fdroid/CompatibilityChecker.java  |  8 +++++---
 F-Droid/src/org/fdroid/fdroid/UpdateService.java | 16 ++++------------
 F-Droid/src/org/fdroid/fdroid/Utils.java         |  9 ---------
 4 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/AppFilter.java b/F-Droid/src/org/fdroid/fdroid/AppFilter.java
index a314150c4..2532a130d 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppFilter.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppFilter.java
@@ -25,21 +25,17 @@ public class AppFilter {
     // Return true if the given app should be filtered out based on user
     // preferences, and false otherwise.
     public boolean filter(App app) {
-
-        final boolean dontFilterRequiringRoot = Preferences.get().filterAppsRequiringRoot();
-
-        if (app.requirements == null || dontFilterRequiringRoot) {
+        if (app.requirements == null) {
             return false;
         }
 
-        for (final String r : app.requirements) {
-            if (r.equals("root")) {
+        if (!Preferences.get().filterAppsRequiringRoot()) {
+            if (app.requirements.contains("root")) {
                 return true;
             }
         }
 
         return false;
-
     }
 
 }
diff --git a/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java b/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java
index 3dfbdefad..202dd1bfe 100644
--- a/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java
+++ b/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java
@@ -62,9 +62,11 @@ public class CompatibilityChecker extends Compatibility {
     }
 
     private boolean compatibleApi(Utils.CommaSeparatedList nativecode) {
-        if (nativecode == null) return true;
-        for (final String abi : nativecode) {
-            if (Utils.arrayContains(cpuAbis, abi)) {
+        if (nativecode == null) {
+            return true;
+        }
+        for (final String cpuAbi : cpuAbis) {
+            if (nativecode.contains(cpuAbi)) {
                 return true;
             }
         }
diff --git a/F-Droid/src/org/fdroid/fdroid/UpdateService.java b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
index dff8765e7..b0d52123d 100644
--- a/F-Droid/src/org/fdroid/fdroid/UpdateService.java
+++ b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
@@ -617,19 +617,11 @@ public class UpdateService extends IntentService implements ProgressListener {
 
         List<ContentProviderOperation> operations = new ArrayList<>();
         List<String> knownAppIds = getKnownAppIds(appsToUpdate);
-        for (final App a : appsToUpdate) {
-            boolean known = false;
-            for (final String knownId : knownAppIds) {
-                if (knownId.equals(a.id)) {
-                    known = true;
-                    break;
-                }
-            }
-
-            if (known) {
-                operations.add(updateExistingApp(a));
+        for (final App app : appsToUpdate) {
+            if (knownAppIds.contains(app.id)) {
+                operations.add(updateExistingApp(app));
             } else {
-                operations.add(insertNewApp(a));
+                operations.add(insertNewApp(app));
             }
         }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java
index aeb72a0ac..9903ff3ce 100644
--- a/F-Droid/src/org/fdroid/fdroid/Utils.java
+++ b/F-Droid/src/org/fdroid/fdroid/Utils.java
@@ -506,15 +506,6 @@ public final class Utils {
         }
     }
 
-    public static <T> boolean arrayContains(final T[] array, final T v) {
-        for (final T e : array) {
-            if (e == v || v != null && v.equals(e)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * Remove all files from the {@parm directory} either beginning with {@param startsWith}
      * or ending with {@param endsWith}. Note that if the SD card is not ready, then the