Fix #30. Well, delete the "Wi-Fi Hack" feature to fix in ;)

app/src/main/java/info/nightscout/android/dexcom/DexcomG4Service.java

@@ -196,45 +196,9 @@ public class DexcomG4Service extends Service {
             initialRead = false;
 
             nextUploadTimer = getNextUploadTimer(dexcomReader);
-
-            if (prefs.getBoolean("EnableWifiHack", false)) {
-                doWifiHack();
-            }
         }
     }
 
-    private void doWifiHack() {
-        Handler handler = new Handler();
-        handler.postDelayed(new Runnable() {
-            @Override
-            //Interesting case: location with lousy wifi
-            //toggle it off to use cellular
-            //toggle back on for next try
-            public void run() {
-                Status dataUp = uploader.getStatus();
-                if (dataUp == Status.RUNNING) {
-                    uploader.cancel(true);
-
-                    if (wifiManager.isWifiEnabled()) {
-                        wifiManager.setWifiEnabled(false);
-                        try {
-                            Thread.sleep(2500);
-                        } catch (InterruptedException e) {
-                            Log.e(TAG, "Sleep after setWifiEnabled(false) interrupted", e);
-                        }
-                        wifiManager.setWifiEnabled(true);
-                        try {
-                            Thread.sleep(2500);
-                        } catch (InterruptedException e) {
-                            Log.e(TAG, "Sleep after setWifiEnabled(true) interrupted", e);
-                        }
-                    }
-                }
-
-            }
-        }, 22500);
-    }
-
     private void USBOff() {
         if (mSerialDevice != null) {
             try {

app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java

@@ -200,7 +200,7 @@ public class GetHmacAndKeyActivity extends Activity implements LoaderCallbacks<C
             String longSerial = cursor.getString(cursor.getColumnIndex(CNLConfigContract.ConfigEntry.COLUMN_NAME_STICK_SERIAL));
             String key = cursor.getString(cursor.getColumnIndex(CNLConfigContract.ConfigEntry.COLUMN_NAME_KEY));
 
-            deviceTableHtml += String.format("<b>Serial Number:</b> %s<br/><b>Key:</b> %s<br/>", longSerial, key );
+            deviceTableHtml += String.format("<b>Serial Number:</b> %s %s<br/>", longSerial, key.equals("") ? "&#x2718;" : "&#x2714;" );
 
             cursor.moveToNext();
         }

app/src/main/java/info/nightscout/android/medtronic/MedtronicCGMService.java

@@ -1182,9 +1182,6 @@ public class MedtronicCGMService extends Service implements
 					params = null;
 	
 					listToUpload.clear();
-					if (prefs.getBoolean("EnableWifiHack", false)) {
-						doWifiHack();
-					}
 				} catch (Exception e) {
 					StringBuffer sb1 = new StringBuffer("");
 					sb1.append("EXCEPTION!!!!!! " + e.getMessage() + " "
@@ -1199,43 +1196,7 @@ public class MedtronicCGMService extends Service implements
 		}
 
 	};
-
-	private void doWifiHack() {
-		Handler handler = new Handler();
-		handler.postDelayed(new Runnable() {
-			@Override
-			// Interesting case: location with lousy wifi
-			// toggle it off to use cellular
-			// toggle back on for next try
-			public void run() {
-				Status dataUp = uploader.getStatus();
-				if (dataUp == Status.RUNNING) {
-					uploader.cancel(true);
-
-					if (wifiManager.isWifiEnabled()) {
-						wifiManager.setWifiEnabled(false);
-						try {
-							Thread.sleep(2500);
-						} catch (InterruptedException e) {
-							Log.e(TAG,
-									"Sleep after setWifiEnabled(false) interrupted",
-									e);
-						}
-						wifiManager.setWifiEnabled(true);
-						try {
-							Thread.sleep(2500);
-						} catch (InterruptedException e) {
-							Log.e(TAG,
-									"Sleep after setWifiEnabled(true) interrupted",
-									e);
-						}
-					}
-				}
-
-			}
-		}, 22500);
-	}
-
+	
 	private boolean isConnected() {
 		return mSerial.isOpened();
 	}

app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCNLService.java

@@ -144,7 +144,7 @@ public class MedtronicCNLService extends AbstractService {
                 Medtronic640gActivity.pumpStatusRecord.setDeviceName( deviceName );
 
                 if( hmac.equals( "" ) || key.equals("") ) {
-                    send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, "Before you can use the Contour Next Link, you need to register it with the app. Select 'Register USB Stick' from the menu."));
+                    send(Message.obtain(null, Medtronic640gActivity.DexcomG4ActivityHandler.MSG_ERROR, String.format( "Before you can use the Contour Next Link, you need to register it with the app. Select '%s' from the menu.", getString(R.string.register_contour_next_link))));
                     return;
                 }
 
@@ -197,44 +197,9 @@ public class MedtronicCNLService extends AbstractService {
             }
 
             mUploader.execute(pumpRecord);
-
-            if (prefs.getBoolean("EnableWifiHack", false)) {
-                doWifiHack();
-            }
         }
     }
 
-    private void doWifiHack() {
-        Handler handler = new Handler();
-        handler.postDelayed(new Runnable() {
-            @Override
-            //Interesting case: location with lousy wifi
-            //toggle it off to use cellular
-            //toggle back on for next try
-            public void run() {
-                Status dataUp = mUploader.getStatus();
-                if (dataUp == Status.RUNNING) {
-                    mUploader.cancel(true);
-
-                    if (mWifiManager.isWifiEnabled()) {
-                        mWifiManager.setWifiEnabled(false);
-                        try {
-                            Thread.sleep(2500);
-                        } catch (InterruptedException e) {
-                            Log.e(TAG, "Sleep after setWifiEnabled(false) interrupted", e);
-                        }
-                        mWifiManager.setWifiEnabled(true);
-                        try {
-                            Thread.sleep(2500);
-                        } catch (InterruptedException e) {
-                            Log.e(TAG, "Sleep after setWifiEnabled(true) interrupted", e);
-                        }
-                    }
-                }
-            }
-        }, 22500);
-    }
-
     private boolean isOnline() {
         ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo netInfo = cm.getActiveNetworkInfo();

app/src/main/res/menu/menu.xml

@@ -8,6 +8,6 @@
     <item
             android:id="@+id/registerCNL"
             android:orderInCategory="100"
-            android:title="Register Contour Next Link">
+            android:title="@string/register_contour_next_link">
     </item>
 </menu>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -13,7 +13,7 @@
     <string name="eula_title">Disclaimer</string>
     <string name="eula_accept">Accept</string>
     <string name="eula_refuse">Refuse</string>
-    <string name="version">0.1.0</string>
+    <string name="version">0.2.0</string>
     <style name="ButtonText">
     <item name="android:layout_width">fill_parent</item>
     <item name="android:layout_height">wrap_content</item>
@@ -117,4 +117,5 @@
     <string name="preference_api_secret">API SECRET</string>
     <string name="prompt_carelink_username_password">Please enter your CareLink details.\nThey will not be stored.</string>
     <string name="close">Close</string>
+    <string name="register_contour_next_link">Register Contour Next Link</string>
 </resources>

app/src/main/res/xml/preferences.xml

@@ -44,15 +44,6 @@
 		android:defaultValue="YOURAPISECRET"
 		android:dialogMessage="Your Nightscout API secret">
 	</EditTextPreference>
-    <info.nightscout.android.utils.CustomSwitchPreference
-            android:title="Wifi Hack"
-            android:key="EnableWifiHack"
-            android:disableDependentsState="false"
-            android:defaultValue="false"
-            android:summaryOn="Wifi will be disabled if there is a timeout (poor wifi signal/access point), this will allow mobile data to be used instead"
-            android:summaryOff="The uploader won't try to disable Wifi even if there is a timeout"
-            >
-    </info.nightscout.android.utils.CustomSwitchPreference>
     </PreferenceCategory>
      <PreferenceCategory android:title="Disclaimer">
 	    <info.nightscout.android.utils.CustomSwitchPreference