n/nextdns-mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed cannot start service NPE

Browse Source
This commit is contained in:
PeratX 2017-05-30 09:09:47 +08:00
parent 6e57c13cd1
commit 5346e21faa
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/org/itxtech/daedalus/Daedalus.java
View File

@ -136,21 +136,23 @@ public class Daedalus extends Application {
if (Daedalus.getPrefs().getBoolean("settings_local_rules_resolution", false)) { if (Daedalus.getPrefs().getBoolean("settings_local_rules_resolution", false)) {
ArrayList<String> pendingLoad = new ArrayList<>(); ArrayList<String> pendingLoad = new ArrayList<>();
ArrayList<Rule> usingRules = configurations.getUsingRules(); ArrayList<Rule> usingRules = configurations.getUsingRules();
for (Rule rule : usingRules) { if (usingRules != null && usingRules.size() > 0) {
if (rule.isUsing()) { for (Rule rule : usingRules) {
pendingLoad.add(rulesPath + rule.getFileName()); if (rule.isUsing()) {
pendingLoad.add(rulesPath + rule.getFileName());
}
} }
} if (pendingLoad.size() > 0) {
if (pendingLoad.size() > 0) { String[] arr = new String[pendingLoad.size()];
String[] arr = new String[pendingLoad.size()]; pendingLoad.toArray(arr);
pendingLoad.toArray(arr); switch (usingRules.get(0).getType()) {
switch (usingRules.get(0).getType()) { case Rule.TYPE_HOSTS:
case Rule.TYPE_HOSTS: RulesResolver.startLoadHosts(arr);
RulesResolver.startLoadHosts(arr); break;
break; case Rule.TYPE_DNAMASQ:
case Rule.TYPE_DNAMASQ: RulesResolver.startLoadDnsmasq(arr);
RulesResolver.startLoadDnsmasq(arr); break;
break; }
} }
} }
} }