Preferences crash fix

NightscoutFoundation · Sep 23, 2016 · 596a5ee · 596a5ee
1 parent ea80d2e
commit 596a5ee
Showing 1 changed file with 36 additions and 30 deletions.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
@@ -935,43 +935,49 @@ public void onClick(DialogInterface dialog, int which) {
                     }
             }
 
+            try {
 
-            if ((collectionType != DexCollectionType.WifiWixel)
-                    && (collectionType != DexCollectionType.WifiBlueToothWixel)
-                    && (collectionType != DexCollectionType.WifiDexBridgeWixel)) {
-                String receiversIpAddresses;
-                receiversIpAddresses = this.prefs.getString("wifi_recievers_addresses", "");
-                // only hide if non wifi wixel mode and value not previously set to cope with
-                // dynamic mode changes. jamorham
-                if (receiversIpAddresses == null || receiversIpAddresses.equals("")) {
-                    collectionCategory.removePreference(wifiRecievers);
+                if ((collectionType != DexCollectionType.WifiWixel)
+                        && (collectionType != DexCollectionType.WifiBlueToothWixel)
+                        && (collectionType != DexCollectionType.WifiDexBridgeWixel)) {
+                    String receiversIpAddresses;
+                    receiversIpAddresses = this.prefs.getString("wifi_recievers_addresses", "");
+                    // only hide if non wifi wixel mode and value not previously set to cope with
+                    // dynamic mode changes. jamorham
+                    if (receiversIpAddresses == null || receiversIpAddresses.equals("")) {
+                        collectionCategory.removePreference(wifiRecievers);
+                    }
                 }
-            }
 
-            if ((collectionType != DexCollectionType.DexbridgeWixel)
-                    && (collectionType != DexCollectionType.WifiDexBridgeWixel)) {
-                collectionCategory.removePreference(transmitterId);
-               // collectionCategory.removePreference(closeGatt);
-            }
+                if ((collectionType != DexCollectionType.DexbridgeWixel)
+                        && (collectionType != DexCollectionType.WifiDexBridgeWixel)) {
+                    collectionCategory.removePreference(transmitterId);
+                    // collectionCategory.removePreference(closeGatt);
+                }
 
 
-            if (collectionType == DexCollectionType.DexcomG5) {
-                collectionCategory.addPreference(transmitterId);
-                collectionCategory.addPreference(scanConstantly);
-                collectionCategory.addPreference(reAuth);
-                collectionCategory.addPreference(reBond);
-                collectionCategory.addPreference(runOnMain);
-            } else {
-               // collectionCategory.removePreference(transmitterId);
-                collectionCategory.removePreference(scanConstantly);
-                collectionCategory.removePreference(reAuth);
-                collectionCategory.removePreference(reBond);
-                collectionCategory.removePreference(runOnMain);
-            }
+                if (collectionType == DexCollectionType.DexcomG5) {
+                    collectionCategory.addPreference(transmitterId);
+                    collectionCategory.addPreference(scanConstantly);
+                    collectionCategory.addPreference(reAuth);
+                    collectionCategory.addPreference(reBond);
+                    collectionCategory.addPreference(runOnMain);
+                } else {
+                    // collectionCategory.removePreference(transmitterId);
+                    collectionCategory.removePreference(scanConstantly);
+                    collectionCategory.removePreference(reAuth);
+                    collectionCategory.removePreference(reBond);
+                    collectionCategory.removePreference(runOnMain);
+                }
+
+                if (!engineering_mode) {
+                    getPreferenceScreen().removePreference(motionScreen);
+                }
 
-            if (!engineering_mode) {
-                getPreferenceScreen().removePreference(motionScreen);
+            } catch (NullPointerException e) {
+                Log.wtf(TAG, "Got null pointer exception removing pref: " + e);
             }
+
             if (engineering_mode || this.prefs.getString("update_channel","").matches("alpha|nightly")) {
                 ListPreference update_channel = (ListPreference)findPreference("update_channel");
                 update_channel.setEntryValues(getResources().getStringArray(R.array.UpdateChannelE));