Simplify a few elses

Mostly just dropping them after returns.

F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java

@@ -150,11 +150,10 @@ public class PrivilegedInstaller extends Installer {
         }
 
         boolean hasPermissions = returnBundle.getBoolean("has_permissions", false);
-        if (hasPermissions) {
+        if (!hasPermissions) {
-            return IS_EXTENSION_INSTALLED_YES;
-        } else {
             return IS_EXTENSION_INSTALLED_PERMISSIONS_PROBLEM;
         }
+        return IS_EXTENSION_INSTALLED_YES;
     }
 
     @Override

F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java

@@ -34,12 +34,11 @@ public final class BluetoothSwap extends SwapType {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         if (adapter == null) {
             return new NoBluetoothType(context);
-        } else {
-            if (mInstance == null)
-                mInstance = new BluetoothSwap(context, adapter);
-
-            return mInstance;
         }
+        if (mInstance == null)
+            mInstance = new BluetoothSwap(context, adapter);
+
+        return mInstance;
     }
 
     private BluetoothSwap(@NonNull Context context, @NonNull BluetoothAdapter adapter) {

F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java

@@ -344,10 +344,9 @@ public class AsyncDownloaderFromAndroid implements AsyncDownloader {
                 int status = c.getInt(c.getColumnIndex(DownloadManager.COLUMN_STATUS));
 
                 if (status == DownloadManager.STATUS_SUCCESSFUL) {
-                    return 0; //Download is valid, celebrate
+                    return 0; // Download is valid, celebrate
-                } else {
-                    return c.getInt(c.getColumnIndex(DownloadManager.COLUMN_REASON));
                 }
+                return c.getInt(c.getColumnIndex(DownloadManager.COLUMN_REASON));
             }
         } finally {
             c.close();

F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java

@@ -41,11 +41,11 @@ public class DownloaderFactory {
         if (isBluetoothAddress(url)) {
             String macAddress = url.getHost().replace("-", ":");
             return new BluetoothDownloader(context, macAddress, url, destFile);
-        } else if (isOnionAddress(url)) {
-            return new TorHttpDownloader(context, url, destFile);
-        } else {
-            return new HttpDownloader(context, url, destFile);
         }
+        if (isOnionAddress(url)) {
+            return new TorHttpDownloader(context, url, destFile);
+        }
+        return new HttpDownloader(context, url, destFile);
     }
 
     private static boolean isBluetoothAddress(URL url) {
@@ -60,9 +60,8 @@ public class DownloaderFactory {
             throws IOException {
         if (canUseDownloadManager(url)) {
             return new AsyncDownloaderFromAndroid(context, listener, title, id, url.toString(), destFile);
-        } else {
-            return new AsyncDownloadWrapper(create(context, url, destFile), listener);
         }
+        return new AsyncDownloadWrapper(create(context, url, destFile), listener);
     }
 
     static boolean isOnionAddress(URL url) {

F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java

@@ -221,13 +221,12 @@ public class WifiStateChangeService extends Service {
     private String formatIpAddress(int ipAddress) {
         if (ipAddress == 0) {
             return null;
-        } else {
-            return String.format(Locale.ENGLISH, "%d.%d.%d.%d",
-                    ipAddress & 0xff,
-                    ipAddress >> 8 & 0xff,
-                    ipAddress >> 16 & 0xff,
-                    ipAddress >> 24 & 0xff);
         }
+        return String.format(Locale.ENGLISH, "%d.%d.%d.%d",
+                ipAddress & 0xff,
+                ipAddress >> 8 & 0xff,
+                ipAddress >> 16 & 0xff,
+                ipAddress >> 24 & 0xff);
     }
 
     private String printWifiState(int wifiState) {

F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java

@@ -234,13 +234,11 @@ public class BluetoothServer extends Thread {
                     if (f.canRead()) {
                         // No index file, list the directory if it is readable
                         return createResponse(NanoHTTPD.Response.Status.NOT_FOUND, NanoHTTPD.MIME_HTML, "");
-                    } else {
-                        return createResponse(NanoHTTPD.Response.Status.FORBIDDEN, NanoHTTPD.MIME_PLAINTEXT,
-                                "FORBIDDEN: No directory listing.");
                     }
-                } else {
+                    return createResponse(NanoHTTPD.Response.Status.FORBIDDEN, NanoHTTPD.MIME_PLAINTEXT,
-                    return respond(headers, uri + indexFile);
+                            "FORBIDDEN: No directory listing.");
                 }
+                return respond(headers, uri + indexFile);
             }
 
             Response response = serveFile(uri, headers, f, getMimeTypeForFile(uri));

F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java

@@ -75,11 +75,9 @@ public final class Request {
         if (method.equals(Methods.HEAD)) {
             Utils.debugLog(TAG, "Request was a " + Methods.HEAD + " request, not including anything other than headers and status...");
             return new Response(responseCode, headers);
-        } else {
-            Utils.debugLog(TAG, "Request was a " + Methods.GET + " request, so including content stream in response...");
-            return new Response(responseCode, headers, connection.getInputStream());
         }
-
+        Utils.debugLog(TAG, "Request was a " + Methods.GET + " request, so including content stream in response...");
+        return new Response(responseCode, headers, connection.getInputStream());
     }
 
     /**

F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java

@@ -49,11 +49,11 @@ abstract class InstallExtension {
     public static InstallExtension create(final Context context) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             return new LollipopImpl(context);
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            return new KitKatToLollipopImpl(context);
-        } else {
-            return new PreKitKatImpl(context);
         }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            return new KitKatToLollipopImpl(context);
+        }
+        return new PreKitKatImpl(context);
     }
 
     final void runInstall(String apkPath) {

F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java

@@ -99,17 +99,16 @@ public class AppSecurityPermissions {
 
         public Drawable loadGroupIcon(PackageManager pm) {
             if (icon != 0) {
-                //return loadUnbadgedIcon(pm);
+                // return loadUnbadgedIcon(pm);
                 return loadIcon(pm);
-            } else {
+            }
-                ApplicationInfo appInfo;
+            ApplicationInfo appInfo;
-                try {
+            try {
-                    appInfo = pm.getApplicationInfo(packageName, 0);
+                appInfo = pm.getApplicationInfo(packageName, 0);
-                    //return appInfo.loadUnbadgedIcon(pm);
+                // return appInfo.loadUnbadgedIcon(pm);
-                    return appInfo.loadIcon(pm);
+                return appInfo.loadIcon(pm);
-                } catch (NameNotFoundException e) {
+            } catch (NameNotFoundException e) {
-                    // ignore
+                // ignore
-                }
             }
             return null;
         }

F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java

@@ -28,14 +28,13 @@ public abstract class ThemeableListFragment extends ListFragment {
     private View headerView;
 
     private View getHeaderView(LayoutInflater inflater, ViewGroup container) {
-        if (getHeaderLayout() > 0) {
+        if (getHeaderLayout() == 0) {
-            if (headerView == null) {
-                headerView = inflater.inflate(getHeaderLayout(), null, false);
-            }
-            return headerView;
-        } else {
             return null;
         }
+        if (headerView == null) {
+            headerView = inflater.inflate(getHeaderLayout(), null, false);
+        }
+        return headerView;
     }
 
     private LayoutInflater getThemedInflater(Context context) {