OB1: improve persistence

Author: jamorham

app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java

@@ -381,7 +381,7 @@ private static void handleAuthenticationThrowable(final Throwable throwable, fin
             }
             if ((throwable instanceof BleDisconnectedException) || (throwable instanceof TimeoutException)) {
                 if ((parent.getState() == Ob1G5CollectionService.STATE.BOND) || (parent.getState() == Ob1G5CollectionService.STATE.CHECK_AUTH)) {
-
+                    parent.savePersist();
                     if (parent.getState() == Ob1G5CollectionService.STATE.BOND) {
                         UserError.Log.d(TAG, "SLEEPING BEFORE RECONNECT");
                         threadSleep(15000);

app/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java

@@ -995,12 +995,15 @@ public synchronized void savePersist() {
     }
 
     public static void clearPersistStore() {
-        PersistentStore.removeItem(KEKS_ONE + transmitterMAC);
+        PersistentStore.cleanupOld(KEKS_ONE);
+        PersistentStore.cleanupOld(OB1G5_MACSTORE);
     }
 
     public static void clearPersist() {
         clearPersistStore();
         expireFailures(true);
+        transmitterID = null;
+        transmitterMAC = null;
     }
 
     private void scheduleWakeUp(long future, final String info) {