Fixed monitor not unregistering

Author: ArdaXi

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="nl.techinc.notify"
 
-    android:versionCode="8"
-    android:versionName="2.2.2" >
+    android:versionCode="9"
+    android:versionName="2.3" >
 
     <permission android:name="nl.techinc.notify.permission.C2D_MESSAGE" android:protectionLevel="signature" />
 

bin/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="nl.techinc.notify"
 
-    android:versionCode="8"
-    android:versionName="2.2.2" >
+    android:versionCode="9"
+    android:versionName="2.3" >
 
     <permission android:name="nl.techinc.notify.permission.C2D_MESSAGE" android:protectionLevel="signature" />
 

bin/Techinc-Notify.apk

@@ -81,8 +81,14 @@ public void run()
 
 	public void setMonitor()
 	{
+		if(!sharedPreferences.getBoolean("gcm_supported", true))
+			return;
 		if(!sharedPreferences.getBoolean("gcm_enabled", true))
+		{
+			if(GCMRegistrar.isRegistered(this))
+				GCMRegistrar.unregister(this);
 			return;
+		}
 		TextView label = (TextView) findViewById(R.id.monitoring);
 		try
 		{
@@ -97,10 +103,8 @@ public void setMonitor()
 		final String regId = GCMRegistrar.getRegistrationId(this);
 		if (regId.equals("")) {
 			GCMRegistrar.register(this, SENDER_ID);
-			label.setText(R.string.updating);
-		} else {
-			label.setText(R.string.monitoring_enabled);
 		}
+		label.setText(R.string.monitoring_enabled);
 	}
 
 	@Override