Merge pull request #2853 from benceszasz/bszasz-connectfollow

CareLink Follower  Updates: Multi follow, correct device type, TZ correction

app/src/main/java/com/eveningoutpost/dexdrip/cgm/carelinkfollow/CareLinkDataProcessor.java

@@ -234,8 +234,8 @@ static synchronized void processData(final RecentData recentData, final boolean
             // Only Guardian Connect, NGP has all in notifications
             if (recentData.isGM() && recentData.lastAlarm != null) {
                 //Add notification from alarm
-                if (recentData.lastAlarm.datetime != null && recentData.lastAlarm.kind != null)
-                    addNotification(recentData.lastAlarm.datetime, recentData.getDeviceFamily(), recentData.lastAlarm);
+                if (recentData.lastAlarm.datetimeAsDate != null && recentData.lastAlarm.kind != null)
+                    addNotification(recentData.lastAlarm.datetimeAsDate, recentData.getDeviceFamily(), recentData.lastAlarm);
             }
         }
 

app/src/main/java/com/eveningoutpost/dexdrip/cgm/carelinkfollow/CareLinkFollowDownloader.java

@@ -25,6 +25,7 @@ public class CareLinkFollowDownloader {
     private String carelinkUsername;
     private String carelinkPassword;
     private String carelinkCountry;
+    private String carelinkPatient;
 
     private CareLinkClient careLinkClient;
 
@@ -40,10 +41,11 @@ public String getStatus() {
         return status;
     }
 
-    CareLinkFollowDownloader(String carelinkUsername, String carelinkPassword, String carelinkCountry) {
+    CareLinkFollowDownloader(String carelinkUsername, String carelinkPassword, String carelinkCountry, String carelinkPatient) {
         this.carelinkUsername = carelinkUsername;
         this.carelinkPassword = carelinkPassword;
         this.carelinkCountry = carelinkCountry;
+        this.carelinkPatient = carelinkPatient;
         loginDataLooksOkay = !emptyString(carelinkUsername) && !emptyString(carelinkPassword) && carelinkCountry != null && !emptyString(carelinkCountry);
     }
 
@@ -122,7 +124,10 @@ private void processConnectData() {
 
                 //Get data
                 try {
-                    recentData = getCareLinkClient().getRecentData();
+                    if (JoH.emptyString(this.carelinkPatient))
+                        recentData = getCareLinkClient().getRecentData();
+                    else
+                        recentData = getCareLinkClient().getRecentData(this.carelinkPatient);
                     lastResponseCode = carelinkClient.getLastResponseCode();
                 } catch (Exception e) {
                     UserError.Log.e(TAG, "Exception in CareLink data download: " + e);

app/src/main/java/com/eveningoutpost/dexdrip/cgm/carelinkfollow/CareLinkFollowService.java

@@ -171,7 +171,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                     downloader = new CareLinkFollowDownloader(
                             Pref.getString("clfollow_user", ""),
                             Pref.getString("clfollow_pass", ""),
-                            Pref.getString("clfollow_country", "").toLowerCase()
+                            Pref.getString("clfollow_country", "").toLowerCase(),
+                            Pref.getString("clfollow_patient", "")
                     );
                 }
 

app/src/main/java/com/eveningoutpost/dexdrip/cgm/carelinkfollow/client/CareLinkClient.java

@@ -3,12 +3,17 @@
 import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.ActiveNotification;
 import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.ClearedNotification;
 import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.CountrySettings;
+import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.DataUpload;
 import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.Marker;
 import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.MonitorData;
 import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.Profile;
+import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.Patient;
+import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.M2MEnabled;
 import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.RecentData;
+import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.RecentUploads;
 import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.SensorGlucose;
 import com.eveningoutpost.dexdrip.cgm.carelinkfollow.message.User;
+import com.eveningoutpost.dexdrip.models.JoH;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
@@ -106,6 +111,22 @@ public Profile getSessionProfile() {
     public CountrySettings getSessionCountrySettings() {
         return sessionCountrySettings;
     }
+    protected RecentUploads sessionRecentUploads;
+    public RecentUploads getSessionRecentUploads() {
+        return sessionRecentUploads;
+    }
+    protected Boolean sessionDeviceIsBle;
+    public Boolean getSessionDeviceIsBle() {
+        return sessionDeviceIsBle;
+    }
+    protected Boolean sessionM2MEnabled;
+    public boolean getSessionM2MEnabled(){
+        return sessionM2MEnabled;
+    }
+    protected Patient[] sessionPatients;
+    public Patient[] getSessionPatients(){
+        return sessionPatients;
+    }
 
     protected MonitorData sessionMonitorData;
 
@@ -146,18 +167,101 @@ protected String careLinkServer() {
     //Wrapper for common request of recent data (last 24 hours)
     public RecentData getRecentData() {
 
+        //Use default patient username if not provided
+        return this.getRecentData(this.getDefaultPatientUsername());
+
+    }
+
+    //Get recent data of patient
+    public RecentData getRecentData(String patientUsername) {
+
+        // Force login to get basic info
+        if (getAuthorizationToken() == null)
+            return null;
+
+        // 7xxG
+        if (this.isBleDevice(patientUsername))
+            return this.getConnectDisplayMessage(this.sessionProfile.username, this.sessionUser.getUserRole(), patientUsername,
+                    sessionCountrySettings.blePereodicDataEndpoint);
+            // Guardian + multi
+        else if (this.sessionM2MEnabled)
+            return this.getM2MPatientData(patientUsername);
+            // Guardian + single
+        else
+            return this.getLast24Hours();
+
+    }
+
+    //Determine default patient
+    public String getDefaultPatientUsername() {
+
         // Force login to get basic info
-        if (getAuthorizationToken() != null) {
-            //New BLE Endpoint (for all US calls and all BLE devices)
-            if (CountryUtils.isUS(carelinkCountry) || sessionMonitorData.isBle())
-                return this.getConnectDisplayMessage(this.sessionProfile.username, this.sessionUser.getUserRole(),
-                        sessionCountrySettings.blePereodicDataEndpoint);
-                //Old CareLink data source
+        if (getAuthorizationToken() == null)
+            return null;
+
+        // Care Partner + multi follow => first patient
+        if (this.sessionUser.isCarePartner() && this.sessionM2MEnabled)
+            if (this.sessionPatients != null && this.sessionPatients.length > 0)
+                return this.sessionPatients[0].username;
             else
-                return this.getLast24Hours();
-        } else {
+                return null;
+            // Not care partner or no multi follow => username from session profile
+        else if (this.sessionProfile.username != null)
+            return this.sessionProfile.username;
+        else
             return null;
+    }
+
+    public boolean isBleDevice(String patientUsername){
+
+        Boolean recentUploadBle;
+
+        // Session device already determined
+        if(sessionDeviceIsBle != null)
+            return sessionDeviceIsBle;
+
+        // Force login to get basic info
+        if(getAuthorizationToken() == null)
+            return  false;
+
+        // Patient: device from recent uploads if possible
+        if(!this.sessionUser.isCarePartner()){
+            recentUploadBle = this.isRecentUploadBle();
+            if(recentUploadBle != null){
+                this.sessionDeviceIsBle = recentUploadBle;
+                return sessionDeviceIsBle;
+            }
         }
+
+        // Care partner (+M2M): device from patient list
+        if(this.sessionM2MEnabled && this.sessionUser.isCarePartner())
+            if(patientUsername == null || this.sessionPatients == null)
+                return false;
+            else {
+                for (int i = 0; i < this.sessionPatients.length; i++) {
+                    if (sessionPatients[i].username.equals(patientUsername))
+                        return sessionPatients[i].isBle();
+                }
+                return false;
+            }
+        // Other: classic method (session monitor data)
+        else
+            return this.sessionMonitorData.isBle();
+
+    }
+
+    public Boolean isRecentUploadBle(){
+
+        if(this.sessionRecentUploads == null)
+            return null;
+
+        for(DataUpload upload : this.sessionRecentUploads.recentUploads){
+            if(upload.device.toUpperCase().contains("MINIMED"))
+                return  true;
+            else if(upload.device.toUpperCase().contains("GUARDIAN"))
+                return  false;
+        }
+        return null;
     }
 
     //Authentication methods
@@ -197,11 +301,24 @@ protected boolean executeLoginProcedure() {
             this.lastResponseCode = consentResponse.code();
             consentResponse.close();
 
-            // Get basic infos
+            // Get required sessions infos
+            // User
             this.sessionUser = this.getMyUser();
+            // Profile
             this.sessionProfile = this.getMyProfile();
+            // Country settings
             this.sessionCountrySettings = this.getMyCountrySettings();
-            this.sessionMonitorData = this.getMonitorData();
+            // Recent uploads (only for patients)
+            if(!this.sessionUser.isCarePartner())
+                this.sessionRecentUploads = this.getRecentUploads(30);
+            // Multi follow enabled on server
+            this.sessionM2MEnabled = this.getM2MEnabled().value;
+            // Multi follow + Care Partner => patients
+            if (this.sessionM2MEnabled && this.sessionUser.isCarePartner())
+                this.sessionPatients = this.getM2MPatients();
+                // Single follow and/or Patient => monitor data
+            else
+                this.sessionMonitorData = this.getMonitorData();
 
         } catch (Exception e) {
             lastErrorMessage = e.getClass().getSimpleName() + ":" + e.getMessage();
@@ -211,16 +328,28 @@ protected boolean executeLoginProcedure() {
         }
 
         // Set login success if everything was ok:
-        if (this.sessionUser != null && this.sessionProfile != null && this.sessionCountrySettings != null && this.sessionMonitorData != null)
+        if (this.sessionUser != null && this.sessionProfile != null && this.sessionCountrySettings != null && this.sessionM2MEnabled != null &&
+                (((!this.sessionM2MEnabled || !this.sessionUser.isCarePartner()) && this.sessionMonitorData != null) ||
+                        (this.sessionM2MEnabled && this.sessionUser.isCarePartner() && this.sessionPatients != null)))
             lastLoginSuccess = true;
             //Clear cookies if error occured during logon
         else
-            ((SimpleOkHttpCookieJar) this.httpClient.cookieJar()).deleteAllCookies();
+            this.clearSessionInfos();
 
         return lastLoginSuccess;
 
     }
 
+    protected void clearSessionInfos()
+    {
+        ((SimpleOkHttpCookieJar) this.httpClient.cookieJar()).deleteAllCookies();
+        this.sessionUser = null;
+        this.sessionProfile = null;
+        this.sessionCountrySettings = null;
+        this.sessionMonitorData = null;
+        this.sessionPatients = null;
+    }
+
     protected Response getLoginSession() throws IOException {
 
         HttpUrl url = null;
@@ -363,6 +492,17 @@ public Profile getMyProfile() {
         return this.getData(this.careLinkServer(), "patient/users/me/profile", null, null, Profile.class);
     }
 
+    // Recent uploads
+    public RecentUploads getRecentUploads(int numOfUploads) {
+
+        Map<String, String> queryParams = null;
+
+        queryParams = new HashMap<String, String>();
+        queryParams.put("numUploads", String.valueOf(numOfUploads));
+
+        return this.getData(this.careLinkServer(), "patient/dataUpload/recentUploads", queryParams, null, RecentUploads.class);
+    }
+
     // Monitoring data
     public MonitorData getMonitorData() {
         return this.getData(this.careLinkServer(), "patient/monitor/data", null, null, MonitorData.class);
@@ -382,6 +522,17 @@ public CountrySettings getMyCountrySettings() {
 
     }
 
+    // M2M Enabled
+    public M2MEnabled getM2MEnabled() {
+        return this.getData(this.careLinkServer(), "patient/configuration/system/personal.cp.m2m.enabled", null, null, M2MEnabled.class);
+    }
+
+    // M2M Patients
+    public Patient[] getM2MPatients() {
+        return this.getData(this.careLinkServer(), "patient/m2m/links/patients", null, null, Patient[].class);
+    }
+
+    // Classic last24hours webapp data
     public RecentData getLast24Hours() {
 
         Map<String, String> queryParams = null;
@@ -405,7 +556,7 @@ public RecentData getLast24Hours() {
     }
 
     // Periodic data from CareLink Cloud
-    public RecentData getConnectDisplayMessage(String username, String role, String endpointUrl) {
+    public RecentData getConnectDisplayMessage(String username, String role, String patientUsername, String endpointUrl) {
 
         RequestBody requestBody = null;
         Gson gson = null;
@@ -416,6 +567,8 @@ public RecentData getConnectDisplayMessage(String username, String role, String
         userJson = new JsonObject();
         userJson.addProperty("username", username);
         userJson.addProperty("role", role);
+        if(!JoH.emptyString(patientUsername))
+            userJson.addProperty("patientId", patientUsername);
 
         gson = new GsonBuilder().create();
 
@@ -432,6 +585,27 @@ public RecentData getConnectDisplayMessage(String username, String role, String
 
     }
 
+    // New M2M last24hours webapp data
+    public RecentData getM2MPatientData(String patientUsername) {
+
+        Map<String, String> queryParams = null;
+
+        //Patient username is mandantory!
+        if(patientUsername == null || patientUsername.isEmpty())
+            return null;
+
+        queryParams = new HashMap<String, String>();
+        queryParams.put("cpSerialNumber", "NONE");
+        queryParams.put("msgType", "last24hours");
+        queryParams.put("requestTime", String.valueOf(System.currentTimeMillis()));
+
+        RecentData recentData = this.getData(this.careLinkServer(), "/patient/m2m/connect/data/gc/patients/" + patientUsername, queryParams, null, RecentData.class);
+        if (recentData != null)
+            correctTimeInRecentData(recentData);
+        return recentData;
+
+    }
+
     // General data request for API calls
     protected <T> T getData(HttpUrl url, RequestBody requestBody, Class<T> dataClass) {
 
@@ -515,8 +689,8 @@ protected void addHttpHeaders(Request.Builder requestBuilder, RequestType type)
         //Add common browser headers
         requestBuilder
                 .addHeader("Accept-Language", "en;q=0.9, *;q=0.8")
-                .addHeader("sec-ch-ua", "\"Google Chrome\";v=\"87\", \" Not;A Brand\";v=\"99\", \"Chromium\";v=\"87\"")
-                .addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36");
+                .addHeader("sec-ch-ua", "\"Chromium\";v=\"112\", \"Google Chrome\";v=\"112\", \"Not:A-Brand\";v=\"99\"")
+                .addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36");
 
         //Set media type based on request type
         switch (type) {
@@ -546,9 +720,15 @@ protected void correctTimeInRecentData(RecentData recentData) {
 
                 timezoneMissing = true;
 
-                //offset = this.getZonedDate(recentData.lastSG.datetime).getOffset();
-                offsetString = this.getZoneOffset(recentData.lastSG.datetime);
+                //Try get TZ offset string: lastSG or lastAlarm
+                if(recentData.lastSG != null && recentData.lastSG.datetime != null)
+                    offsetString = this.getZoneOffset(recentData.lastSG.datetime);
+                else
+                    offsetString = this.getZoneOffset(recentData.lastAlarm.datetime);
 
+                //Set last alarm datetimeAsDate
+                if(recentData.lastAlarm != null && recentData.lastAlarm.datetime != null)
+                    recentData.lastAlarm.datetimeAsDate = parseDateString(recentData.lastAlarm.datetime);
                 //Build correct dates with timezone
                 recentData.sMedicalDeviceTime = recentData.sMedicalDeviceTime + offsetString;
                 recentData.medicalDeviceTimeAsString = recentData.medicalDeviceTimeAsString + offsetString;

app/src/main/java/com/eveningoutpost/dexdrip/cgm/carelinkfollow/message/Alarm.java

@@ -12,7 +12,8 @@ public String getMessageAlarmCode() {
     }
 
     public int code;
-    public Date datetime;
+    public String datetime;
+    public Date datetimeAsDate;
     public String type;
     public boolean flash;
     public String kind;

app/src/main/java/com/eveningoutpost/dexdrip/cgm/carelinkfollow/message/DataUpload.java

@@ -4,6 +4,7 @@ public class DataUpload {
 
     public long date;
     public boolean mobileUploaded;
+    public String status;
     public String device;
     public String serialNumber;
 

app/src/main/java/com/eveningoutpost/dexdrip/cgm/carelinkfollow/message/M2MEnabled.java

@@ -0,0 +1,7 @@
+package com.eveningoutpost.dexdrip.cgm.carelinkfollow.message;
+
+public class M2MEnabled {
+
+    public boolean value;
+
+}