Merge branch 'random-improvements' into 'master'

Random improvements



See merge request !262

CONTRIBUTING.md

@@ -65,7 +65,7 @@ In order to run the F-Droid test suite, you will need to have either a real devi
 connected via `adb`, or an emulator running. Then, execute the following from the
 command line:
 
-    ./gradlew connectedCheck
+    ./gradlew check
 
 Note that the CI already runs the tests on an emulator, so you don't
 necessarily have to do this yourself if you open a merge request as the tests

app/build.gradle

@@ -210,7 +210,7 @@ pmd {
 task pmd(type: Pmd, dependsOn: assembleDebug) {
     ruleSets = [
         //'java-basic',
-        //'java-unusedcode',
+        'java-unusedcode',
         'java-android',
         'java-clone',
         'java-finalizers',
@@ -218,7 +218,7 @@ task pmd(type: Pmd, dependsOn: assembleDebug) {
         'java-migrating',
         //'java-unnecessary', // too nitpicky with parenthesis
     ]
-    source 'src/main/java'
+    source 'src/main/java', 'src/test/java', 'src/androidTest/java'
     include '**/*.java'
 }
 

app/src/androidTest/java/android/test/ProviderTestCase2MockContext.java

@@ -27,6 +27,9 @@ import android.os.Build;
 import android.test.mock.MockContentResolver;
 import android.test.mock.MockContext;
 
+import org.junit.After;
+import org.junit.Before;
+
 import java.io.File;
 
 /**
@@ -132,6 +135,7 @@ public abstract class ProviderTestCase2MockContext<T extends ContentProvider> ex
      * @throws Exception
      */
     @Override
+    @Before
     protected void setUp() throws Exception {
         super.setUp();
 
@@ -165,6 +169,7 @@ public abstract class ProviderTestCase2MockContext<T extends ContentProvider> ex
      * {@link android.content.ContentProvider} represented by mProvider.
      */
     @Override
+    @After
     protected void tearDown() throws Exception {
         shutdownProvider();
         super.tearDown();

app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java

@@ -18,7 +18,6 @@ import static org.junit.Assert.fail;
 
 @RunWith(AndroidJUnit4.class)
 public class RepoUpdaterTest {
-    private static final String TAG = "RepoUpdaterTest";
 
     private Context context;
     private RepoUpdater repoUpdater;

app/src/main/java/org/fdroid/fdroid/AndroidXMLDecompress.java

@@ -91,7 +91,6 @@ public class AndroidXMLDecompress {
 
         while (offset < binaryXml.length) {
             int tag0 = littleEndianWord(binaryXml, offset);
-            int nameStringIndex = littleEndianWord(binaryXml, offset + 5 * 4);
 
             if (tag0 == startTag) {
                 int numbAttrs = littleEndianWord(binaryXml, offset + 7 * 4);
@@ -114,10 +113,9 @@ public class AndroidXMLDecompress {
                     attributes.put(attributeName, attributeValue);
                 }
                 return attributes;
-            } else {
-                // we only need the first <manifest> start tag
-                break;
             }
+            // we only need the first <manifest> start tag
+            break;
         }
         return new HashMap<String, Object>(0);
     }

app/src/main/java/org/fdroid/fdroid/Preferences.java

@@ -79,6 +79,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
     private static final boolean DEFAULT_EXPERT = false;
     private static final boolean DEFAULT_ENABLE_PROXY = false;
     public static final String DEFAULT_THEME = "light";
+    @SuppressWarnings("PMD.AvoidUsingHardCodedIP")
     public static final String DEFAULT_PROXY_HOST = "127.0.0.1";
     public static final int DEFAULT_PROXY_PORT = 8118;
     private static final boolean DEFAULT_SHOW_NFC_DURING_SWAP = true;

app/src/main/java/org/fdroid/fdroid/RepoUpdater.java

@@ -92,6 +92,15 @@ public class RepoUpdater {
         return hasChanged;
     }
 
+    private static void cleanupDownloader(Downloader d) {
+        if (d == null || d.outputFile == null) {
+            return;
+        }
+        if (!d.outputFile.delete()) {
+            Log.w(TAG, "Couldn't delete file: " + d.outputFile.getAbsolutePath());
+        }
+    }
+
     private Downloader downloadIndex() throws UpdateException {
         Downloader downloader = null;
         try {
@@ -106,11 +115,7 @@ public class RepoUpdater {
             }
 
         } catch (IOException e) {
-            if (downloader != null && downloader.outputFile != null) {
+            cleanupDownloader(downloader);
-                if (!downloader.outputFile.delete()) {
-                    Log.w(TAG, "Couldn't delete file: " + downloader.outputFile.getAbsolutePath());
-                }
-            }
 
             throw new UpdateException(repo, "Error getting index file", e);
         } catch (InterruptedException e) {
@@ -197,10 +202,8 @@ public class RepoUpdater {
         } finally {
             FDroidApp.enableSpongyCastleOnLollipop();
             Utils.closeQuietly(indexInputStream);
-            if (downloadedFile != null) {
+            if (downloadedFile != null && !downloadedFile.delete()) {
-                if (!downloadedFile.delete()) {
+                Log.w(TAG, "Couldn't delete file: " + downloadedFile.getAbsolutePath());
-                    Log.w(TAG, "Couldn't delete file: " + downloadedFile.getAbsolutePath());
-                }
             }
         }
     }
@@ -359,7 +362,7 @@ public class RepoUpdater {
         if (repo.signingCertificate.equals(certFromJar)
                 && repo.signingCertificate.equals(certFromIndexXml)
                 && certFromIndexXml.equals(certFromJar)) {
-            return;  // we have a match!
+            return; // we have a match!
         }
         throw new SigningException(repo, "Signing certificate does not match!");
     }

app/src/main/java/org/fdroid/fdroid/Utils.java

@@ -275,7 +275,7 @@ public final class Utils {
     // return a fingerprint formatted for display
     public static String formatFingerprint(Context context, String fingerprint) {
         if (TextUtils.isEmpty(fingerprint)
-                || fingerprint.length() != 64  // SHA-256 is 64 hex chars
+                || fingerprint.length() != 64 // SHA-256 is 64 hex chars
                 || fingerprint.matches(".*[^0-9a-fA-F].*")) { // its a hex string
             return context.getString(R.string.bad_fingerprint);
         }
@@ -673,11 +673,10 @@ public final class Utils {
         }
 
         for (File f : files) {
-            if ((startsWith != null && f.getName().startsWith(startsWith))
+            if (((startsWith != null && f.getName().startsWith(startsWith))
-                    || (endsWith != null && f.getName().endsWith(endsWith))) {
+                        || (endsWith != null && f.getName().endsWith(endsWith)))
-                if (!f.delete()) {
+                    && !f.delete()) {
-                    Log.w(TAG, "Couldn't delete cache file " + f);
+                Log.w(TAG, "Couldn't delete cache file " + f);
-                }
             }
         }
     }

app/src/main/java/org/fdroid/fdroid/installer/Installer.java

@@ -178,10 +178,8 @@ public abstract class Installer {
             Map<String, Object> attributes = AndroidXMLDecompress.getManifestHeaderAttributes(apkFile.getAbsolutePath());
 
             /* This isn't really needed, but might as well since we have the data already */
-            if (attributes.containsKey("packageName")) {
+            if (attributes.containsKey("packageName") && !TextUtils.equals(packageName, (String) attributes.get("packageName"))) {
-                if (!TextUtils.equals(packageName, (String) attributes.get("packageName"))) {
+                throw new InstallFailedException(apkFile + " has packageName that clashes with " + packageName);
-                    throw new InstallFailedException(apkFile + " has packageName that clashes with " + packageName);
-                }
             }
 
             if (!attributes.containsKey("versionCode")) {

app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java

@@ -119,22 +119,16 @@ public final class LocalRepoManager {
         xmlIndexJar = new SanitizedFile(repoDir, "index.jar");
         xmlIndexJarUnsigned = new SanitizedFile(repoDir, "index.unsigned.jar");
 
-        if (!fdroidDir.exists()) {
+        if (!fdroidDir.exists() && !fdroidDir.mkdir()) {
-            if (!fdroidDir.mkdir()) {
+            Log.e(TAG, "Unable to create empty base: " + fdroidDir);
-                Log.e(TAG, "Unable to create empty base: " + fdroidDir);
-            }
         }
 
-        if (!repoDir.exists()) {
+        if (!repoDir.exists() && !repoDir.mkdir()) {
-            if (!repoDir.mkdir()) {
+            Log.e(TAG, "Unable to create empty repo: " + repoDir);
-                Log.e(TAG, "Unable to create empty repo: " + repoDir);
-            }
         }
 
-        if (!iconsDir.exists()) {
+        if (!iconsDir.exists() && !iconsDir.mkdir()) {
-            if (!iconsDir.mkdir()) {
+            Log.e(TAG, "Unable to create icons folder: " + iconsDir);
-                Log.e(TAG, "Unable to create icons folder: " + iconsDir);
-            }
         }
     }
 

app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java

@@ -228,17 +228,15 @@ public class LocalHTTPD extends NanoHTTPD {
             long startFrom = 0;
             long endAt = -1;
             String range = header.get("range");
-            if (range != null) {
+            if (range != null && range.startsWith("bytes=")) {
-                if (range.startsWith("bytes=")) {
+                range = range.substring("bytes=".length());
-                    range = range.substring("bytes=".length());
+                int minus = range.indexOf('-');
-                    int minus = range.indexOf('-');
+                try {
-                    try {
+                    if (minus > 0) {
-                        if (minus > 0) {
+                        startFrom = Long.parseLong(range.substring(0, minus));
-                            startFrom = Long.parseLong(range.substring(0, minus));
+                        endAt = Long.parseLong(range.substring(minus + 1));
-                            endAt = Long.parseLong(range.substring(minus + 1));
-                        }
-                    } catch (NumberFormatException ignored) {
                     }
+                } catch (NumberFormatException ignored) {
                 }
             }
 

app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java

@@ -55,7 +55,7 @@ public class WifiStateChangeService extends Service {
                NetworkInfo is only passed via WifiStateChangeReceiver */
             Utils.debugLog(TAG, "ni == " + ni + "  wifiState == " + printWifiState(wifiState));
             if (wifiState == WifiManager.WIFI_STATE_ENABLED
-                    || wifiState == WifiManager.WIFI_STATE_DISABLING   // might be switching to hotspot
+                    || wifiState == WifiManager.WIFI_STATE_DISABLING  // might be switching to hotspot
                     || wifiState == WifiManager.WIFI_STATE_DISABLED   // might be hotspot
                     || wifiState == WifiManager.WIFI_STATE_UNKNOWN) { // might be hotspot
                 if (asyncTask != null) {
@@ -100,7 +100,7 @@ public class WifiStateChangeService extends Service {
                         if (FDroidApp.ipAddressString == null) {
                             return null;
                         }
-                    } else {  // a hotspot can be active during WIFI_STATE_UNKNOWN
+                    } else { // a hotspot can be active during WIFI_STATE_UNKNOWN
                         setIpInfoFromNetworkInterface();
                     }
 

app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java

@@ -266,17 +266,15 @@ public class BluetoothServer extends Thread {
                 long startFrom = 0;
                 long endAt = -1;
                 String range = header.get("range");
-                if (range != null) {
+                if (range != null && range.startsWith("bytes=")) {
-                    if (range.startsWith("bytes=")) {
+                    range = range.substring("bytes=".length());
-                        range = range.substring("bytes=".length());
+                    int minus = range.indexOf('-');
-                        int minus = range.indexOf('-');
+                    try {
-                        try {
+                        if (minus > 0) {
-                            if (minus > 0) {
+                            startFrom = Long.parseLong(range.substring(0, minus));
-                                startFrom = Long.parseLong(range.substring(0, minus));
+                            endAt = Long.parseLong(range.substring(minus + 1));
-                                endAt = Long.parseLong(range.substring(minus + 1));
-                            }
-                        } catch (NumberFormatException ignored) {
                         }
+                    } catch (NumberFormatException ignored) {
                     }
                 }
 

app/src/main/java/org/fdroid/fdroid/net/bluetooth/UnexpectedResponseException.java

@@ -1,12 +0,0 @@
-package org.fdroid.fdroid.net.bluetooth;
-
-class UnexpectedResponseException extends Exception {
-
-    UnexpectedResponseException(String message) {
-        super(message);
-    }
-
-    UnexpectedResponseException(String message, Throwable cause) {
-        super("Unexpected response from Bluetooth server: '" + message + "'", cause);
-    }
-}

app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionBootReceiver.java

@@ -29,15 +29,13 @@ public class InstallExtensionBootReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
+        if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED) && Preferences.get().isPostPrivilegedInstall()) {
-            if (Preferences.get().isPostPrivilegedInstall()) {
+            Preferences.get().setPostPrivilegedInstall(false);
-                Preferences.get().setPostPrivilegedInstall(false);
 
-                Intent postInstall = new Intent(context.getApplicationContext(), InstallExtensionDialogActivity.class);
+            Intent postInstall = new Intent(context.getApplicationContext(), InstallExtensionDialogActivity.class);
-                postInstall.setAction(InstallExtensionDialogActivity.ACTION_POST_INSTALL);
+            postInstall.setAction(InstallExtensionDialogActivity.ACTION_POST_INSTALL);
-                postInstall.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            postInstall.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(postInstall);
+            context.startActivity(postInstall);
-            }
         }
     }
 }

app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java

@@ -269,10 +269,8 @@ public class AppSecurityPermissions {
             String permName = strList[i];
             // If we are only looking at an existing app, then we only
             // care about permissions that have actually been granted to it.
-            if (installedPkgInfo != null && info == installedPkgInfo) {
+            if (installedPkgInfo != null && info == installedPkgInfo && (flagsList[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0) {
-                if ((flagsList[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0) {
+                continue;
-                    continue;
-                }
             }
             try {
                 PermissionInfo tmpPermInfo = mPm.getPermissionInfo(permName, 0);

app/src/main/java/org/fdroid/fdroid/views/AvailableAppListAdapter.java

@@ -6,12 +6,11 @@ import android.os.Build;
 
 public class AvailableAppListAdapter extends AppListAdapter {
 
-    public static AvailableAppListAdapter create(Context context, Cursor cursor, int flags)   {
+    public static AvailableAppListAdapter create(Context context, Cursor cursor, int flags) {
         if (Build.VERSION.SDK_INT >= 11) {
             return new AvailableAppListAdapter(context, cursor, flags);
-        } else {
-            return new AvailableAppListAdapter(context, cursor);
         }
+        return new AvailableAppListAdapter(context, cursor);
     }
 
     private AvailableAppListAdapter(Context context, Cursor c) {

app/src/main/java/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java

@@ -9,9 +9,8 @@ public class CanUpdateAppListAdapter extends AppListAdapter {
     public static CanUpdateAppListAdapter create(Context context, Cursor cursor, int flags) {
         if (Build.VERSION.SDK_INT >= 11) {
             return new CanUpdateAppListAdapter(context, cursor, flags);
-        } else {
-            return new CanUpdateAppListAdapter(context, cursor);
         }
+        return new CanUpdateAppListAdapter(context, cursor);
     }
 
     private CanUpdateAppListAdapter(Context context, Cursor c) {

app/src/main/java/org/fdroid/fdroid/views/InstalledAppListAdapter.java

@@ -6,12 +6,11 @@ import android.os.Build;
 
 public class InstalledAppListAdapter extends AppListAdapter {
 
-    public static InstalledAppListAdapter create(Context context, Cursor cursor, int flags)  {
+    public static InstalledAppListAdapter create(Context context, Cursor cursor, int flags) {
         if (Build.VERSION.SDK_INT >= 11) {
             return new InstalledAppListAdapter(context, cursor, flags);
-        } else {
-            return new InstalledAppListAdapter(context, cursor);
         }
+        return new InstalledAppListAdapter(context, cursor);
     }
 
     private InstalledAppListAdapter(Context context, Cursor c) {

app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java

@@ -23,12 +23,11 @@ public class RepoAdapter extends CursorAdapter {
 
     private EnabledListener enabledListener;
 
-    public static RepoAdapter create(Context context, Cursor cursor, int flags)   {
+    public static RepoAdapter create(Context context, Cursor cursor, int flags) {
         if (Build.VERSION.SDK_INT >= 11) {
             return new RepoAdapter(context, cursor, flags);
-        } else {
-            return new RepoAdapter(context, cursor);
         }
+        return new RepoAdapter(context, cursor);
     }
 
     private RepoAdapter(Context context, Cursor c, int flags) {

app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java

@@ -290,11 +290,9 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             return;
         }
 
-        if (!forceReload) {
+        if (!forceReload && (container.getVisibility() == View.GONE || currentView != null && currentView.getStep() == service.getStep())) {
-            if (container.getVisibility() == View.GONE || currentView != null && currentView.getStep() == service.getStep()) {
+            // Already showing the correct step, so don't bother changing anything.
-                // Already showing the correct step, so don't bother changing anything.
+            return;
-                return;
-            }
         }
 
         switch (service.getStep()) {

build.gradle

@@ -7,7 +7,3 @@ buildscript {
         classpath files('libs/gradle-witness.jar')
     }
 }
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.11'
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
-#Mon Feb 15 16:30:29 GMT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
-distributionSha256Sum=8d7437082356c9fd6309a4479c8db307673965546daea445c6c72759cd6b1ed6
+distributionSha256Sum=e77064981906cd0476ff1e0de3e6fef747bd18e140960f1915cca8ff6c33ab5c