caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fix Boolean thingy

Browse source
This commit is contained in:
Markus M. May 2018-05-01 22:15:22 +02:00
parent 02e9ce105c
commit 306d45bb3e
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NsClientReceiverDelegate.java
View file

@ -121,10 +121,16 @@ class NsClientReceiverDelegate {
boolean newAllowedState = true; boolean newAllowedState = true;
if (!ev.wifiConnected && wifiOnly) newAllowedState = false; if (ev.wifiConnected) {
if (ev.wifiConnected && !allowedSSIDs.trim().isEmpty() && !allowedSSIDs.contains(ev.ssid)) if (!allowedSSIDs.trim().isEmpty() && !allowedSSIDs.contains(ev.ssid)) {
newAllowedState = false; newAllowedState = false;
if (!ev.wifiConnected && !allowRoaming && ev.roaming) newAllowedState = false; }
} else {
if ((!allowRoaming && ev.roaming) || wifiOnly) {
newAllowedState = false;
}
}
return newAllowedState; return newAllowedState;
} }

8
app/src/test/java/info/nightscout/androidaps/plugins/NSClientInternal/NsClientReceiverDelegateTest.java
View file

@ -111,5 +111,13 @@ public class NsClientReceiverDelegateTest {
ev.wifiConnected = true; ev.wifiConnected = true;
ev.roaming = true; ev.roaming = true;
assertTrue(sut.calculateStatus(ev)); assertTrue(sut.calculateStatus(ev));
// wifiOnly = false
// allowRoaming = false
when(SP.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(false);
when(SP.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(false);
ev.wifiConnected = true;
ev.roaming = true;
assertTrue(sut.calculateStatus(ev));
} }
} }