From e5bc365b6413b6eb2fd40f9e7dab29a085c774b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 28 Apr 2016 17:17:17 +0100
Subject: [PATCH 1/3] PMD: Enable a bunch of strictexception rules

We already obey them.
---
 config/pmd/rules.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/config/pmd/rules.xml b/config/pmd/rules.xml
index 34775e15e..7e370f087 100644
--- a/config/pmd/rules.xml
+++ b/config/pmd/rules.xml
@@ -17,7 +17,18 @@
     </rule>
     <rule ref="rulesets/java/optimizations.xml/PrematureDeclaration"/>
     <rule ref="rulesets/java/optimizations.xml/AddEmptyString"/>
+    <rule ref="rulesets/java/optimizations.xml/UseArraysAsList"/>
+
     <rule ref="rulesets/java/controversial.xml/UnnecessaryConstructor"/>
+
+    <rule ref="rulesets/java/strictexception.xml/AvoidRethrowingException"/>
+    <rule ref="rulesets/java/strictexception.xml/AvoidCatchingThrowable"/>
+    <rule ref="rulesets/java/strictexception.xml/AvoidCatchingNPE"/>
+    <rule ref="rulesets/java/strictexception.xml/DoNotExtendJavaLangError"/>
+    <rule ref="rulesets/java/strictexception.xml/DoNotThrowExceptionInFinally"/>
+    <rule ref="rulesets/java/strictexception.xml/AvoidThrowingNewInstanceOfSameException"/>
+    <rule ref="rulesets/java/strictexception.xml/AvoidThrowingNullPointerException"/>
+
     <rule ref="rulesets/java/design.xml/FinalFieldCouldBeStatic"/>
     <rule ref="rulesets/java/design.xml/CloseResource"/>
     <rule ref="rulesets/java/design.xml/DefaultLabelNotLastInSwitchStmt"/>

From ac8d3ff60025f22a589c37360047ffae7f2fc4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 28 Apr 2016 17:58:00 +0100
Subject: [PATCH 2/3] PMD: Enable and obey UnnecessaryParentheses

This works on statements, not expressions, so it's a lot easier and
saner to obey than UselessParentheses.
---
 .../main/java/org/fdroid/fdroid/net/WifiStateChangeService.java | 2 +-
 config/pmd/rules.xml                                            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java
index 7b13d1683..160ca6197 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -219,7 +219,7 @@ public class WifiStateChangeService extends Service {
                             if (inetAddress.equals(address.getAddress()) && !TextUtils.isEmpty(FDroidApp.ipAddressString)) {
                                 String cidr = String.format(Locale.ENGLISH, "%s/%d",
                                         FDroidApp.ipAddressString, address.getNetworkPrefixLength());
-                                FDroidApp.subnetInfo = (new SubnetUtils(cidr)).getInfo();
+                                FDroidApp.subnetInfo = new SubnetUtils(cidr).getInfo();
                                 break;
                             }
                         }
diff --git a/config/pmd/rules.xml b/config/pmd/rules.xml
index 7e370f087..414454615 100644
--- a/config/pmd/rules.xml
+++ b/config/pmd/rules.xml
@@ -20,6 +20,7 @@
     <rule ref="rulesets/java/optimizations.xml/UseArraysAsList"/>
 
     <rule ref="rulesets/java/controversial.xml/UnnecessaryConstructor"/>
+    <rule ref="rulesets/java/controversial.xml/UnnecessaryParentheses"/>
 
     <rule ref="rulesets/java/strictexception.xml/AvoidRethrowingException"/>
     <rule ref="rulesets/java/strictexception.xml/AvoidCatchingThrowable"/>

From 023a6d01bd5d1a1ca8824874030f1125faa55a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 28 Apr 2016 18:16:05 +0100
Subject: [PATCH 3/3] PMD: Enable some extra boolean/logic rules

---
 app/src/main/java/org/fdroid/fdroid/AppFilter.java | 8 ++------
 config/pmd/rules.xml                               | 4 ++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/AppFilter.java b/app/src/main/java/org/fdroid/fdroid/AppFilter.java
index e139ae808..ee3397b02 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppFilter.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppFilter.java
@@ -29,12 +29,8 @@ public class AppFilter {
             return false;
         }
 
-        if (!Preferences.get().filterAppsRequiringRoot() &&
-                app.requirements.contains("root")) {
-            return true;
-        }
-
-        return false;
+        return !Preferences.get().filterAppsRequiringRoot()
+                && app.requirements.contains("root");
     }
 
 }
diff --git a/config/pmd/rules.xml b/config/pmd/rules.xml
index 414454615..242403a32 100644
--- a/config/pmd/rules.xml
+++ b/config/pmd/rules.xml
@@ -39,4 +39,8 @@
     <rule ref="rulesets/java/design.xml/IdempotentOperations"/>
     <rule ref="rulesets/java/design.xml/ImmutableField"/>
     <rule ref="rulesets/java/design.xml/SingularField"/>
+    <rule ref="rulesets/java/design.xml/SimplifyBooleanReturns"/>
+    <rule ref="rulesets/java/design.xml/SimplifyBooleanExpressions"/>
+    <rule ref="rulesets/java/design.xml/LogicInversion"/>
+
 </ruleset>