-Added crude exception handling for malformed MQTT endpoints

-Updated topics to support old json style download as well as new protobuf style
lr-fivethirds · Sep 23, 2014 · b0d7a0c · b0d7a0c
1 parent fcb5f2b
commit b0d7a0c
Show file tree

Hide file tree

Showing 13 changed files with 118 additions and 8 deletions.
diff --git a/.idea/libraries/acra_4_5_0.xml b/.idea/libraries/acra_4_5_0.xml
diff --git a/.idea/libraries/gson_2_3.xml b/.idea/libraries/gson_2_3.xml
diff --git a/.idea/libraries/guava_14_0_1.xml b/.idea/libraries/guava_14_0_1.xml
diff --git a/.idea/libraries/mongo_java_driver_2_12_3.xml b/.idea/libraries/mongo_java_driver_2_12_3.xml
diff --git a/.idea/libraries/org_eclipse_paho_client_mqttv3_1_0_0.xml b/.idea/libraries/org_eclipse_paho_client_mqttv3_1_0_0.xml
diff --git a/.idea/libraries/play_services_wearable_5_0_77.xml b/.idea/libraries/play_services_wearable_5_0_77.xml
diff --git a/.idea/libraries/protobuf_java_2_5_0.xml b/.idea/libraries/protobuf_java_2_5_0.xml
diff --git a/.idea/libraries/support_annotations_20_0_0.xml b/.idea/libraries/support_annotations_20_0_0.xml
diff --git a/.idea/libraries/support_v13_20_0_0.xml b/.idea/libraries/support_v13_20_0_0.xml
diff --git a/.idea/libraries/support_v4_20_0_0.xml b/.idea/libraries/support_v4_20_0_0.xml
diff --git a/.idea/libraries/wearable_1_0_0.xml b/.idea/libraries/wearable_1_0_0.xml
diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/RemoteMQTTDevice.java b/mobile/src/main/java/com/ktind/cgm/bgscout/RemoteMQTTDevice.java
@@ -85,7 +85,7 @@ public void run() {
                 mqttMgr.initConnect(url);
                 Log.d(TAG, "Subscribe start");
 //        mqttMgr.subscribe("/entries/sgv", "/uploader");
-                mqttMgr.subscribe("/entries/sgv","/protobuf/test2");
+                mqttMgr.subscribe("/entries/sgv","/downloads/protobuf");
                 Log.d(TAG,"Connect ended");
             }
         }).start();
@@ -127,7 +127,7 @@ public void onMessage(String topic, MqttMessage msg) {
             setLastDownloadObject(ddo);
             onDownload(ddo);
         }
-        if (topic.equals("/protobuf/test2")){
+        if (topic.equals("/downloads/protobuf")){
             try {
                 SGV.ProposedCookieMonsterG4Download protoBufDownload=SGV.ProposedCookieMonsterG4Download.parseFrom(msg.getPayload());
                 Log.d("XXX", "SGV Download status: "+protoBufDownload.getDownloadStatus().name());
@@ -149,6 +149,8 @@ public void onMessage(String topic, MqttMessage msg) {
                         .setEgvRecords(egvRecords)
                         .setRemoteDevice(false)
                         .setDeviceName("dexcom")
+                        .setDeviceBattery(protoBufDownload.getReceiverBattery())
+                        .setUploaderBattery(protoBufDownload.getUploaderBattery())
                         .setUnit(GlucoseUnit.values()[protoBufDownload.getUnits().getNumber()])
                         .setDeviceID("device_1")
                         .setLastReadingDate(egvRecords.get(egvRecords.size()-1).getDate())

diff --git a/mobile/src/main/java/com/ktind/cgm/bgscout/mqtt/MQTTMgr.java b/mobile/src/main/java/com/ktind/cgm/bgscout/mqtt/MQTTMgr.java
@@ -137,8 +137,6 @@ public void connect(String url, String lwt) {
             Log.e(TAG, "User and/or password is null. Please verify arguments to the constructor");
             return;
         }
-//        setupNetworkNotifications();
-//        mClient=null;
         stats.addConnect();
         setupOpts(lwt);
         // Save the URL for later re-connections
@@ -149,12 +147,13 @@ public void connect(String url, String lwt) {
             mClient = new MqttClient(url, mDeviceId, mDataStore);
             mClient.connect(mOpts);
             StaticAlertMessages.removeMessage(MQTTDISCONNECT);
-//            NotifHelper.clearMessage(context,"Disconnected from MQTT");
-//            connected=true;
             setNextKeepAlive();
             state=State.CONNECTED;
         } catch (MqttException e) {
             Log.e(TAG, "Error while connecting: ", e);
+        } catch (IllegalArgumentException e) {
+            // TODO: here to catch malformed endpoints. Need to add more robust handling later
+            Log.e(TAG, "Error while connecting: ", e);
         }
     }
 
@@ -305,8 +304,6 @@ public void connectionLost(Throwable throwable) {
             PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
             PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "RemoteCGM "+deviceIDStr);
             wl.acquire();
-//            connected=false;
-//            if (isOnline())
             reconnectDelayed();
             wl.release();
         } else {