From fddce692dbe2c25d5f5bf9b0e6a69b36818d589d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 31 Mar 2016 21:54:11 +0100 Subject: [PATCH] PMD: Get closer to obeying unnecessary Don't enable it just yet, it's way too pedantic with parenthesis. --- app/build.gradle | 1 + app/src/main/java/org/fdroid/fdroid/AppDetails.java | 2 +- .../main/java/org/fdroid/fdroid/compat/PRNGFixes.java | 10 ++++------ .../fdroid/fdroid/localrepo/peers/BonjourFinder.java | 4 ++-- .../privileged/views/InstallConfirmActivity.java | 5 ----- .../fdroid/views/fragments/AvailableAppsFragment.java | 2 +- .../org/fdroid/fdroid/views/swap/SwapAppsView.java | 2 +- .../fdroid/fdroid/views/swap/SwapWorkflowActivity.java | 2 +- 8 files changed, 11 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c7e841421..1280c28d3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -204,6 +204,7 @@ task pmd(type: Pmd, dependsOn: assembleDebug) { 'java-finalizers', 'java-imports', 'java-migrating', + //'java-unnecessary', // too nitpicky with parenthesis ] source 'src/main/java' include '**/org/fdroid/**/*.java' diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails.java b/app/src/main/java/org/fdroid/fdroid/AppDetails.java index aa96ab0a8..9786e0437 100644 --- a/app/src/main/java/org/fdroid/fdroid/AppDetails.java +++ b/app/src/main/java/org/fdroid/fdroid/AppDetails.java @@ -526,7 +526,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A private void onAppChanged() { if (!reset(app.packageName)) { - AppDetails.this.finish(); + this.finish(); return; } diff --git a/app/src/main/java/org/fdroid/fdroid/compat/PRNGFixes.java b/app/src/main/java/org/fdroid/fdroid/compat/PRNGFixes.java index b56989090..5721e6fe3 100644 --- a/app/src/main/java/org/fdroid/fdroid/compat/PRNGFixes.java +++ b/app/src/main/java/org/fdroid/fdroid/compat/PRNGFixes.java @@ -105,12 +105,10 @@ public final class PRNGFixes extends Compatibility { // Install a Linux PRNG-based SecureRandom implementation as the // default, if not yet installed. - Provider[] secureRandomProviders = - Security.getProviders("SecureRandom.SHA1PRNG"); - if ((secureRandomProviders == null) - || (secureRandomProviders.length < 1) - || (!LinuxPRNGSecureRandomProvider.class.equals( - secureRandomProviders[0].getClass()))) { + Provider[] secureRandomProviders = Security.getProviders("SecureRandom.SHA1PRNG"); + if (secureRandomProviders == null + || secureRandomProviders.length < 1 + || !LinuxPRNGSecureRandomProvider.class.equals(secureRandomProviders[0].getClass())) { Security.insertProviderAt(new LinuxPRNGSecureRandomProvider(), 1); } diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java index ba982f8c3..4a83dc512 100644 --- a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java +++ b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java @@ -79,8 +79,8 @@ class BonjourFinder extends PeerFinder implements ServiceListener { } Utils.debugLog(TAG, "Adding mDNS service listeners for " + HTTP_SERVICE_TYPE + " and " + HTTPS_SERVICE_TYPE); - jmdns.addServiceListener(HTTP_SERVICE_TYPE, BonjourFinder.this); - jmdns.addServiceListener(HTTPS_SERVICE_TYPE, BonjourFinder.this); + jmdns.addServiceListener(HTTP_SERVICE_TYPE, this); + jmdns.addServiceListener(HTTPS_SERVICE_TYPE, this); listServices(); } diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java index 73bd55830..a9af419b3 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java @@ -197,11 +197,6 @@ public class InstallConfirmActivity extends Activity implements OnCancelListener startInstallConfirm(); } - @Override - public void onBackPressed() { - super.onBackPressed(); - } - // Generic handling when pressing back key public void onCancel(DialogInterface dialog) { finish(); diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java index f75b6eafd..a0e5bf843 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java @@ -199,7 +199,7 @@ public class AvailableAppsFragment extends AppListFragment implements private void setCurrentCategory(String category) { currentCategory = category; Utils.debugLog(TAG, "Category '" + currentCategory + "' selected."); - getLoaderManager().restartLoader(0, null, AvailableAppsFragment.this); + getLoaderManager().restartLoader(0, null, this); } @Override diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java index b13f4f1e5..8672b7531 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java @@ -250,7 +250,7 @@ public class SwapAppsView extends ListView implements Apk apk = getApkToInstall(); String broadcastUrl = intent.getStringExtra(Downloader.EXTRA_ADDRESS); - if (apk != null && apk.repoAddress != null && (!TextUtils.equals(Utils.getApkUrl(apk.repoAddress, apk), broadcastUrl))) { + if (apk != null && apk.repoAddress != null && !TextUtils.equals(Utils.getApkUrl(apk.repoAddress, apk), broadcastUrl)) { return; } 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 711226362..7edf430c3 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 @@ -795,7 +795,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { private void handleDownloadComplete(File apkFile, String packageName) { try { - Installer.getActivityInstaller(SwapWorkflowActivity.this, new Installer.InstallerCallback() { + Installer.getActivityInstaller(this, new Installer.InstallerCallback() { @Override public void onSuccess(int operation) { // TODO: Don't reload the view weely-neely, but rather get the view to listen