caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1634 from TebbeUbben/insight-dev

Browse source 
Timeout during handshake notification
This commit is contained in:
AdrianLxM 2019-02-17 14:32:53 +01:00 committed by GitHub
parent 65c5aebbda 361cc158e8
commit 166ec37f25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
View file

@ -73,6 +73,7 @@ public class Notification {
public static final int RILEYLINK_CONNECTION = 45;
public static final int PERMISSION_PHONESTATE = 46;
public static final int INSIGHT_DATE_TIME_UPDATED = 47;
public static final int INSIGHT_TIMEOUT_DURING_HANDSHAKE = 48;
public int id;

6
app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/LocalInsightPlugin.java
View file

@ -1557,4 +1557,10 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
public void onPumpPaired() {
ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("Pump paired", null);
}
@Override
public void onTimeoutDuringHandshake() {
Notification notification = new Notification(Notification.INSIGHT_TIMEOUT_DURING_HANDSHAKE, MainApp.gs(R.string.timeout_during_handshake), Notification.URGENT);
new Handler(Looper.getMainLooper()).post(() -> MainApp.bus().post(new EventNewNotification(notification)));
}
}

13
app/src/main/java/info/nightscout/androidaps/plugins/PumpInsightLocal/connection_service/InsightConnectionService.java
View file

@ -352,6 +352,11 @@ public class InsightConnectionService extends Service implements ConnectionEstab
}
log.info("Exception occurred: " + e.getClass().getSimpleName());
if (pairingDataStorage.isPaired()) {
if (e instanceof TimeoutException && (state == InsightState.SATL_SYN_REQUEST || state == InsightState.APP_CONNECT_MESSAGE)) {
for (StateCallback stateCallback : stateCallbacks) {
stateCallback.onTimeoutDuringHandshake();
}
}
setState(connectionRequests.size() != 0 ? InsightState.RECOVERING : InsightState.DISCONNECTED);
if (e instanceof ConnectionFailedException) {
cleanup(((ConnectionFailedException) e).getDurationOfConnectionAttempt() <= 1000);
@ -726,7 +731,8 @@ public class InsightConnectionService extends Service implements ConnectionEstab
private void processReadParameterBlockMessage(ReadParameterBlockMessage message) {
if (state == InsightState.APP_SYSTEM_IDENTIFICATION) {
if (!(message.getParameterBlock() instanceof SystemIdentificationBlock)) handleException(new TooChattyPumpException());
if (!(message.getParameterBlock() instanceof SystemIdentificationBlock))
handleException(new TooChattyPumpException());
else {
SystemIdentification systemIdentification = ((SystemIdentificationBlock) message.getParameterBlock()).getSystemIdentification();
pairingDataStorage.setSystemIdentification(systemIdentification);
@ -802,8 +808,11 @@ public class InsightConnectionService extends Service implements ConnectionEstab
public interface StateCallback {
void onStateChanged(InsightState state);
default void onPumpPaired() {
default void onPumpPaired() {
}
default void onTimeoutDuringHandshake() {
}
}

1
app/src/main/res/values/strings.xml
View file

@ -1295,6 +1295,7 @@
<string name="max_recovery_duration">Max. recovery duration [s]</string>
<string name="min_recovery_duration">Min. recovery duration [s]</string>
<string name="recovery_duration">Recovery duration</string>
<string name="timeout_during_handshake">Timeout during handshake - reset bluetooth</string>
<string name="profile_total">== ∑ %1$s U</string>
<string name="profile_ins_units_per_hout">U/h</string>