Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pmd' into 'master'

Browse Source 
Enable some more PMD rules



See merge request !270
This commit is contained in:
Daniel Martí 2016-04-29 23:20:17 +00:00
commit 10904aa9a3
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/fdroid/fdroid/AppFilter.java
View File

@ -29,12 +29,8 @@ public class AppFilter {
return false; return false;
} }
if (!Preferences.get().filterAppsRequiringRoot() && return !Preferences.get().filterAppsRequiringRoot()
app.requirements.contains("root")) { && app.requirements.contains("root");
return true;
}
return false;
} }
} }

2
app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java
View File

@ -219,7 +219,7 @@ public class WifiStateChangeService extends Service {
if (inetAddress.equals(address.getAddress()) && !TextUtils.isEmpty(FDroidApp.ipAddressString)) { if (inetAddress.equals(address.getAddress()) && !TextUtils.isEmpty(FDroidApp.ipAddressString)) {
String cidr = String.format(Locale.ENGLISH, "%s/%d", String cidr = String.format(Locale.ENGLISH, "%s/%d",
FDroidApp.ipAddressString, address.getNetworkPrefixLength()); FDroidApp.ipAddressString, address.getNetworkPrefixLength());
FDroidApp.subnetInfo = (new SubnetUtils(cidr)).getInfo(); FDroidApp.subnetInfo = new SubnetUtils(cidr).getInfo();
break; break;
} }
} }

16
config/pmd/rules.xml
View File

@ -17,7 +17,19 @@
</rule> </rule>
<rule ref="rulesets/java/optimizations.xml/PrematureDeclaration"/> <rule ref="rulesets/java/optimizations.xml/PrematureDeclaration"/>
<rule ref="rulesets/java/optimizations.xml/AddEmptyString"/> <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/controversial.xml/UnnecessaryConstructor"/>
<rule ref="rulesets/java/controversial.xml/UnnecessaryParentheses"/>
<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/FinalFieldCouldBeStatic"/>
<rule ref="rulesets/java/design.xml/CloseResource"/> <rule ref="rulesets/java/design.xml/CloseResource"/>
<rule ref="rulesets/java/design.xml/DefaultLabelNotLastInSwitchStmt"/> <rule ref="rulesets/java/design.xml/DefaultLabelNotLastInSwitchStmt"/>
@ -27,4 +39,8 @@
<rule ref="rulesets/java/design.xml/IdempotentOperations"/> <rule ref="rulesets/java/design.xml/IdempotentOperations"/>
<rule ref="rulesets/java/design.xml/ImmutableField"/> <rule ref="rulesets/java/design.xml/ImmutableField"/>
<rule ref="rulesets/java/design.xml/SingularField"/> <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> </ruleset>