diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java index df67a16f6..aed547b90 100644 --- a/app/src/main/java/org/fdroid/fdroid/Preferences.java +++ b/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; diff --git a/app/src/main/java/org/fdroid/fdroid/RepoUpdater.java b/app/src/main/java/org/fdroid/fdroid/RepoUpdater.java index 4dc986e05..5fd62034b 100644 --- a/app/src/main/java/org/fdroid/fdroid/RepoUpdater.java +++ b/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) { - if (!downloader.outputFile.delete()) { - Log.w(TAG, "Couldn't delete file: " + downloader.outputFile.getAbsolutePath()); - } - } + cleanupDownloader(downloader); 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.delete()) { - Log.w(TAG, "Couldn't delete file: " + downloadedFile.getAbsolutePath()); - } + if (downloadedFile != null && !downloadedFile.delete()) { + Log.w(TAG, "Couldn't delete file: " + downloadedFile.getAbsolutePath()); } } } diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java index 2455d5ff4..88a994bd1 100644 --- a/app/src/main/java/org/fdroid/fdroid/Utils.java +++ b/app/src/main/java/org/fdroid/fdroid/Utils.java @@ -673,11 +673,10 @@ 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)) + || (endsWith != null && f.getName().endsWith(endsWith))) + && !f.delete()) { + Log.w(TAG, "Couldn't delete cache file " + f); } } } diff --git a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java index bd85b71f0..3ead44b3c 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java @@ -178,10 +178,8 @@ public abstract class Installer { Map 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 (!TextUtils.equals(packageName, (String) attributes.get("packageName"))) { - throw new InstallFailedException(apkFile + " has packageName that clashes with " + packageName); - } + if (attributes.containsKey("packageName") && !TextUtils.equals(packageName, (String) attributes.get("packageName"))) { + throw new InstallFailedException(apkFile + " has packageName that clashes with " + packageName); } if (!attributes.containsKey("versionCode")) { diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java index 3ab5a2f67..dd358f00b 100644 --- a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java +++ b/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.mkdir()) { - Log.e(TAG, "Unable to create empty base: " + fdroidDir); - } + if (!fdroidDir.exists() && !fdroidDir.mkdir()) { + Log.e(TAG, "Unable to create empty base: " + fdroidDir); } - if (!repoDir.exists()) { - if (!repoDir.mkdir()) { - Log.e(TAG, "Unable to create empty repo: " + repoDir); - } + if (!repoDir.exists() && !repoDir.mkdir()) { + Log.e(TAG, "Unable to create empty repo: " + repoDir); } - if (!iconsDir.exists()) { - if (!iconsDir.mkdir()) { - Log.e(TAG, "Unable to create icons folder: " + iconsDir); - } + if (!iconsDir.exists() && !iconsDir.mkdir()) { + Log.e(TAG, "Unable to create icons folder: " + iconsDir); } } diff --git a/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java b/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java index 0a97ab8ee..23937b9ec 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java +++ b/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.startsWith("bytes=")) { - range = range.substring("bytes=".length()); - int minus = range.indexOf('-'); - try { - if (minus > 0) { - startFrom = Long.parseLong(range.substring(0, minus)); - endAt = Long.parseLong(range.substring(minus + 1)); - } - } catch (NumberFormatException ignored) { + if (range != null && range.startsWith("bytes=")) { + range = range.substring("bytes=".length()); + int minus = range.indexOf('-'); + try { + if (minus > 0) { + startFrom = Long.parseLong(range.substring(0, minus)); + endAt = Long.parseLong(range.substring(minus + 1)); } + } catch (NumberFormatException ignored) { } } diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java index 848192731..811508992 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java +++ b/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.startsWith("bytes=")) { - range = range.substring("bytes=".length()); - int minus = range.indexOf('-'); - try { - if (minus > 0) { - startFrom = Long.parseLong(range.substring(0, minus)); - endAt = Long.parseLong(range.substring(minus + 1)); - } - } catch (NumberFormatException ignored) { + if (range != null && range.startsWith("bytes=")) { + range = range.substring("bytes=".length()); + int minus = range.indexOf('-'); + try { + if (minus > 0) { + startFrom = Long.parseLong(range.substring(0, minus)); + endAt = Long.parseLong(range.substring(minus + 1)); } + } catch (NumberFormatException ignored) { } } diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionBootReceiver.java b/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionBootReceiver.java index f69d1d397..2074aac50 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionBootReceiver.java +++ b/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 (Preferences.get().isPostPrivilegedInstall()) { - Preferences.get().setPostPrivilegedInstall(false); + if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED) && Preferences.get().isPostPrivilegedInstall()) { + Preferences.get().setPostPrivilegedInstall(false); - Intent postInstall = new Intent(context.getApplicationContext(), InstallExtensionDialogActivity.class); - postInstall.setAction(InstallExtensionDialogActivity.ACTION_POST_INSTALL); - postInstall.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(postInstall); - } + Intent postInstall = new Intent(context.getApplicationContext(), InstallExtensionDialogActivity.class); + postInstall.setAction(InstallExtensionDialogActivity.ACTION_POST_INSTALL); + postInstall.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(postInstall); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java index f751080ed..e16a42efa 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java +++ b/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 ((flagsList[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0) { - continue; - } + if (installedPkgInfo != null && info == installedPkgInfo && (flagsList[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0) { + continue; } try { PermissionInfo tmpPermInfo = mPm.getPermissionInfo(permName, 0); diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index 5caf91554..0040019ae 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -290,11 +290,9 @@ public class SwapWorkflowActivity extends AppCompatActivity { return; } - if (!forceReload) { - if (container.getVisibility() == View.GONE || currentView != null && currentView.getStep() == service.getStep()) { - // Already showing the correct step, so don't bother changing anything. - return; - } + if (!forceReload && (container.getVisibility() == View.GONE || currentView != null && currentView.getStep() == service.getStep())) { + // Already showing the correct step, so don't bother changing anything. + return; } switch (service.getStep()) {