Merge pull request #951 from TebbeUbben/dev

Compat for SR 1.6.0
This commit is contained in:
Milos Kozak 2018-05-01 20:06:16 +02:00 committed by GitHub
commit cc8d950ca6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

Binary file not shown.

View file

@ -62,7 +62,7 @@ public class Connector {
private int serviceReconnects = 0;
private StatusCallback statusCallback = new StatusCallback() {
@Override
public synchronized void onStatusChange(Status status) {
public synchronized void onStatusChange(Status status, long statusTime, long waitTime) {
if ((status != lastStatus) || (Helpers.msSince(lastStatusTime) > 2000)) {
log("Status change: " + status);
@ -94,7 +94,7 @@ public class Connector {
serviceConnector.connect();
} else {
log("PROTOCOL VERSION MISMATCH! local: " + COMPATIBILITY_VERSION + " remote: " + remoteVersion);
statusCallback.onStatusChange(Status.INCOMPATIBLE);
statusCallback.onStatusChange(Status.INCOMPATIBLE, 0, 0);
compatabilityMessage = gs(R.string.insight_incompatible_compantion_app_we_need_version) + " " + getLocalVersion();
serviceConnector.disconnectFromService();
@ -102,7 +102,7 @@ public class Connector {
} catch (NullPointerException e) {
log("ERROR: null pointer when trying to connect to pump");
}
statusCallback.onStatusChange(safeGetStatus());
statusCallback.onStatusChange(safeGetStatus(), 0, 0);
}
@Override