Updates to system status to make things more "usable"

skirby99 · Mar 31, 2016 · e62b7ee · e62b7ee
1 parent 458991d
commit e62b7ee
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 1 deletion.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Services/G5CollectionService.java b/app/src/main/java/com/eveningoutpost/dexdrip/Services/G5CollectionService.java
@@ -521,7 +521,6 @@ public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteris
                     android.util.Log.i("timestamp", Long.toString(txData.timestamp));
 
                     processNewTransmitterData(txData, txData.timestamp);
-
                     if (pendingIntent != null)
                         alarm.cancel(pendingIntent);
                     keepAlive();
@@ -565,6 +564,8 @@ private void processNewTransmitterData(TransmitterData transmitterData, long tim
         android.util.Log.i("timestamp create", Long.toString(transmitterData.timestamp));
 
         BgReading.create(transmitterData.raw_data, transmitterData.filtered_data, this, transmitterData.timestamp);
+        transmitterData.save();
+
     }
 
     // Sends the disconnect tx message to our bt device.

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/SystemStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/SystemStatus.java
@@ -18,6 +18,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.eveningoutpost.dexdrip.G5Model.Extensions;
+import com.eveningoutpost.dexdrip.G5Model.Transmitter;
 import com.eveningoutpost.dexdrip.ImportedLibraries.dexcom.Constants;
 import com.eveningoutpost.dexdrip.Models.ActiveBluetoothDevice;
 import com.eveningoutpost.dexdrip.Models.BgReading;
@@ -33,6 +35,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 
 public class SystemStatus extends ActivityWithMenu {
@@ -51,6 +54,7 @@ public class SystemStatus extends ActivityWithMenu {
     private ImageButton refresh;
     private SharedPreferences prefs;
     private BluetoothManager mBluetoothManager;
+    private BluetoothAdapter mBluetoothAdapter;
     private ActiveBluetoothDevice activeBluetoothDevice;
 
     @Override
@@ -187,6 +191,28 @@ public void setCurrentDevice() {
         } else {
             current_device.setText("None Set");
         }
+
+        String collection_method = prefs.getString("dex_collection_method", "BluetoothWixel");
+        if(collection_method.compareTo("DexcomG5") == 0) {
+            Transmitter defaultTransmitter = new Transmitter(prefs.getString("dex_txid", "ABCDEF"));
+            mBluetoothAdapter = mBluetoothManager.getAdapter();
+
+            Set<BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();
+            if (pairedDevices.size() > 0) {
+                for (BluetoothDevice device : pairedDevices) {
+                    if (device.getName() != null) {
+
+                        String transmitterIdLastTwo = Extensions.lastTwoCharactersOfString(defaultTransmitter.transmitterId);
+                        String deviceNameLastTwo = Extensions.lastTwoCharactersOfString(device.getName());
+
+                        if (transmitterIdLastTwo.equals(deviceNameLastTwo)) {
+                            current_device.setText(defaultTransmitter.transmitterId);
+                        }
+
+                    }
+                }
+            }
+        }
     }
 
     private void setConnectionStatus() {
@@ -203,6 +229,28 @@ private void setConnectionStatus() {
         } else {
             connection_status.setText("Not Connected");
         }
+
+        String collection_method = prefs.getString("dex_collection_method", "BluetoothWixel");
+        if(collection_method.compareTo("DexcomG5") == 0) {
+            Transmitter defaultTransmitter = new Transmitter(prefs.getString("dex_txid", "ABCDEF"));
+            mBluetoothAdapter = mBluetoothManager.getAdapter();
+
+            Set<BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();
+            if (pairedDevices.size() > 0) {
+                for (BluetoothDevice device : pairedDevices) {
+                    if (device.getName() != null) {
+
+                        String transmitterIdLastTwo = Extensions.lastTwoCharactersOfString(defaultTransmitter.transmitterId);
+                        String deviceNameLastTwo = Extensions.lastTwoCharactersOfString(device.getName());
+
+                        if (transmitterIdLastTwo.equals(deviceNameLastTwo)) {
+                            connection_status.setText(device.getName() + "\nAuthenticated");
+                        }
+
+                    }
+                }
+            }
+        }
     }
 
     private void setNotes() {
@@ -293,6 +341,32 @@ public void run() {
                         }, 1000);
                     }
                 }
+
+                String collection_method = prefs.getString("dex_collection_method", "BluetoothWixel");
+                if(collection_method.compareTo("DexcomG5") == 0) {
+                    Transmitter defaultTransmitter = new Transmitter(prefs.getString("dex_txid", "ABCDEF"));
+                    mBluetoothAdapter = mBluetoothManager.getAdapter();
+
+                    Set<BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();
+                    if (pairedDevices.size() > 0) {
+                        for (BluetoothDevice device : pairedDevices) {
+                            if (device.getName() != null) {
+
+                                String transmitterIdLastTwo = Extensions.lastTwoCharactersOfString(defaultTransmitter.transmitterId);
+                                String deviceNameLastTwo = Extensions.lastTwoCharactersOfString(device.getName());
+
+                                if (transmitterIdLastTwo.equals(deviceNameLastTwo)) {
+                                    try {
+                                        Method m = device.getClass().getMethod("removeBond", (Class[]) null);
+                                        m.invoke(device, (Object[]) null);
+                                        notes.append("\nG5 Transmitter unbonded, switch device mode to prevent re-pairing to G5.");
+                                    } catch (Exception e) { Log.e("SystemStatus", e.getMessage(), e); }
+                                }
+
+                            }
+                        }
+                    }
+                }
             }
         });
     }