diff --git a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java index c981a5786..bda833ffa 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java +++ b/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) { - return IS_EXTENSION_INSTALLED_YES; - } else { + if (!hasPermissions) { return IS_EXTENSION_INSTALLED_PERMISSIONS_PROBLEM; } + return IS_EXTENSION_INSTALLED_YES; } @Override diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java index 2d12a70fa..f411435a2 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java +++ b/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) { diff --git a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java index a377ca933..00f21e461 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java +++ b/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 - } else { - return c.getInt(c.getColumnIndex(DownloadManager.COLUMN_REASON)); + return 0; // Download is valid, celebrate } + return c.getInt(c.getColumnIndex(DownloadManager.COLUMN_REASON)); } } finally { c.close(); diff --git a/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java b/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java index a485592c3..320b2fc32 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java +++ b/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) { diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java index e147ec5f3..df6ab2d58 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java +++ b/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) { diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java index 366a981e3..69213fdb8 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java +++ b/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 respond(headers, uri + indexFile); + return createResponse(NanoHTTPD.Response.Status.FORBIDDEN, NanoHTTPD.MIME_PLAINTEXT, + "FORBIDDEN: No directory listing."); } + return respond(headers, uri + indexFile); } Response response = serveFile(uri, headers, f, getMimeTypeForFile(uri)); diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java b/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java index d40fe84fb..61c6bb2ff 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java +++ b/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()); } /** diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java index 6aaf780db..2caafc5a2 100644 --- a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java +++ b/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) { diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java index 67c402dda..18a69e306 100644 --- a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java +++ b/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; - try { - appInfo = pm.getApplicationInfo(packageName, 0); - //return appInfo.loadUnbadgedIcon(pm); - return appInfo.loadIcon(pm); - } catch (NameNotFoundException e) { - // ignore - } + } + ApplicationInfo appInfo; + try { + appInfo = pm.getApplicationInfo(packageName, 0); + // return appInfo.loadUnbadgedIcon(pm); + return appInfo.loadIcon(pm); + } catch (NameNotFoundException e) { + // ignore } return null; } diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java index 4147517e3..e348d564f 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java +++ b/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 (headerView == null) { - headerView = inflater.inflate(getHeaderLayout(), null, false); - } - return headerView; - } else { + if (getHeaderLayout() == 0) { return null; } + if (headerView == null) { + headerView = inflater.inflate(getHeaderLayout(), null, false); + } + return headerView; } private LayoutInflater getThemedInflater(Context context) {