Added monitoring support

API support.
Refresh in menu

Author: ArdaXi

bin/Techinc-Notify.apk

@@ -13,18 +13,20 @@ public static final class attr {
     public static final class drawable {
         public static final int closed=0x7f020000;
         public static final int ic_launcher=0x7f020001;
-        public static final int open=0x7f020002;
-        public static final int techinclogo=0x7f020003;
-        public static final int techinclogo_mono=0x7f020004;
-        public static final int techinclogo_white=0x7f020005;
+        public static final int ic_menu_refresh=0x7f020002;
+        public static final int ic_menu_settings=0x7f020003;
+        public static final int open=0x7f020004;
+        public static final int techinclogo=0x7f020005;
+        public static final int techinclogo_mono=0x7f020006;
+        public static final int techinclogo_white=0x7f020007;
     }
     public static final class id {
         public static final int label_text=0x7f070000;
+        public static final int menu_refresh=0x7f070006;
         public static final int menu_settings=0x7f070007;
-        public static final int monitoring=0x7f070004;
-        public static final int refresh=0x7f070003;
-        public static final int stateImage=0x7f070006;
-        public static final int stateWidget=0x7f070005;
+        public static final int monitoring=0x7f070003;
+        public static final int stateImage=0x7f070005;
+        public static final int stateWidget=0x7f070004;
         public static final int status=0x7f070002;
         public static final int status_label=0x7f070001;
     }
@@ -39,34 +41,38 @@ public static final class string {
         public static final int app_name=0x7f050000;
         public static final int button_refresh=0x7f05000a;
         public static final int closed=0x7f050008;
-        public static final int debug_label=0x7f05001a;
-        public static final int debug_summary=0x7f05001b;
-        public static final int disable=0x7f05000d;
-        public static final int enable=0x7f05000e;
+        public static final int debug_label=0x7f05001b;
+        public static final int debug_summary=0x7f05001c;
+        public static final int dialog_message=0x7f050022;
+        public static final int disable=0x7f05000e;
+        public static final int enable=0x7f05000f;
         public static final int main_text=0x7f050005;
-        public static final int menu_settings=0x7f050010;
-        public static final int monitor_label=0x7f050018;
-        public static final int monitor_summary=0x7f050019;
+        public static final int menu_settings=0x7f050011;
+        public static final int monitor_label=0x7f050019;
+        public static final int monitor_summary=0x7f05001a;
         public static final int monitoring_disabled=0x7f05000c;
         public static final int monitoring_enabled=0x7f05000b;
+        public static final int monitoring_unsupported=0x7f05000d;
+        public static final int no=0x7f050021;
         public static final int notify_closed=0x7f050002;
         public static final int notify_open=0x7f050001;
         public static final int open=0x7f050007;
-        public static final int ringtone_label=0x7f050016;
-        public static final int ringtone_summary=0x7f050017;
+        public static final int ringtone_label=0x7f050017;
+        public static final int ringtone_summary=0x7f050018;
         public static final int status=0x7f050006;
-        public static final int suppress_label=0x7f050012;
-        public static final int suppress_summary=0x7f050013;
+        public static final int suppress_label=0x7f050013;
+        public static final int suppress_summary=0x7f050014;
         public static final int ticker_closed=0x7f050004;
         public static final int ticker_open=0x7f050003;
         public static final int unknown=0x7f050009;
-        public static final int updating=0x7f05000f;
-        public static final int url_desc=0x7f05001e;
-        public static final int url_label=0x7f05001c;
-        public static final int url_summary=0x7f05001d;
-        public static final int vibrate_label=0x7f050014;
-        public static final int vibrate_summary=0x7f050015;
-        public static final int warning=0x7f050011;
+        public static final int updating=0x7f050010;
+        public static final int url_desc=0x7f05001f;
+        public static final int url_label=0x7f05001d;
+        public static final int url_summary=0x7f05001e;
+        public static final int vibrate_label=0x7f050015;
+        public static final int vibrate_summary=0x7f050016;
+        public static final int warning=0x7f050012;
+        public static final int yes=0x7f050020;
     }
     public static final class xml {
         public static final int notify_appwidget_info=0x7f040000;

bin/classes.dex

@@ -23,25 +23,17 @@
     <TextView
     	android:id="@+id/status"
     	android:layout_width="wrap_content"
-        android:layout_height="wrap_content" 
-        android:layout_alignBaseline="@+id/refresh"
-        android:textSize="20sp"
-        android:text="@string/unknown" />
-    
-    <Button
-        android:id="@+id/refresh"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/status_label"
-        android:layout_alignParentRight="true"
-        android:onClick="refresh"
-        android:text="@string/button_refresh" />
+        android:textSize="20sp"
+        android:text="@string/unknown" />
 
     <TextView
     	android:id="@+id/monitoring"
     	android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/refresh"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
         android:textSize="20sp"
         android:text="@string/monitoring_disabled" />
 

bin/classes/nl/techinc/notify/BootClass.class

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/menu_refresh"
+		android:title="@string/button_refresh"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_menu_refresh" />
     <item android:id="@+id/menu_settings"
 		android:title="@string/menu_settings"
-        android:showAsAction="ifRoom"
-        android:icon="@android:drawable/ic_menu_preferences" />
+        android:showAsAction="never"
+        android:icon="@drawable/ic_menu_settings" />
 </menu>

bin/classes/nl/techinc/notify/GCMIntentService$1.class

@@ -20,6 +20,7 @@
     <string name="button_refresh">Refresh</string>
     <string name="monitoring_enabled">Monitoring enabled</string>
     <string name="monitoring_disabled">Monitoring disabled</string>
+    <string name="monitoring_unsupported">Monitoring unsupported</string>
     <string name="disable">Disable</string>
     <string name="enable">Enable</string>
     <string name="updating">Updating…</string>
@@ -33,4 +34,7 @@
     <string name="debug_label">Debug mode</string><string name="debug_summary">Enable debug mode.</string>
     <string name="url_label">Server URL</string><string name="url_summary">Change the server that the device registers with</string>
     <string name="url_desc">For debugging purposes only.\nDo not touch unless you know what you are doing.</string>
+    
+    <string name="yes">Yes</string><string name="no">No</string>
+    <string name="dialog_message">In order to apply this setting, the application has to be restarted.\nShutdown now?</string>
 </resources>

bin/classes/nl/techinc/notify/GCMIntentService$2.class

@@ -2,10 +2,5 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
     <CheckBoxPreference android:title="@string/suppress_label" android:summary="@string/suppress_summary" android:key="suppress"/><CheckBoxPreference android:title="@string/vibrate_label" android:summary="@string/vibrate_summary" android:key="vibrate"/>
     <RingtonePreference android:ringtoneType="notification" android:title="@string/ringtone_label" android:showDefault="true" android:summary="@string/ringtone_summary" android:showSilent="true" android:key="ringtone"/>
-    <CheckBoxPreference android:key="monitor" android:title="@string/monitor_label" android:summary="@string/monitor_summary" android:enabled="false"/><CheckBoxPreference android:summary="@string/debug_summary" android:key="debug" android:title="@string/debug_label" /><EditTextPreference android:summary="@string/url_summary" android:title="@string/url_label" android:defaultValue="http://techinc.notefaction.jit.su" android:key="url" android:dialogMessage="@string/url_desc" android:dialogTitle="@string/warning" android:dependency="debug"/>
-    
-    
-    
-    
-
+    <CheckBoxPreference android:key="gcm_enabled" android:title="@string/monitor_label" android:summary="@string/monitor_summary" android:enabled="true" android:defaultValue="true"/><CheckBoxPreference android:summary="@string/debug_summary" android:key="debug" android:title="@string/debug_label" /><EditTextPreference android:summary="@string/url_summary" android:title="@string/url_label" android:defaultValue="http://techinc.notefaction.jit.su" android:key="url" android:dialogMessage="@string/url_desc" android:dialogTitle="@string/warning" android:dependency="debug"/>
 </PreferenceScreen>

bin/classes/nl/techinc/notify/GCMIntentService.class

@@ -16,10 +16,8 @@ public class BootClass extends BroadcastReceiver {
 	@Override
 	public void onReceive(Context context, Intent intent) {
 		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-		if(sharedPreferences.getBoolean("monitor", false))
+		if(sharedPreferences.getBoolean("gcm_enabled", false))
 		{
-			GCMRegistrar.checkDevice(context);
-			GCMRegistrar.checkManifest(context);
 			final String regId = GCMRegistrar.getRegistrationId(context);
 			if (regId.equals("")) {
 				GCMRegistrar.register(context, SENDER_ID);

bin/classes/nl/techinc/notify/NotifyActivity$1.class

@@ -105,8 +105,9 @@ private void register(final Context context, final String url, final int delayMi
 		try
 		{
 			URLConnection connect = new URL(url).openConnection();
-			connect.connect();
 			HttpURLConnection httpConnection = (HttpURLConnection) connect;
+			httpConnection.addRequestProperty("accept-version", "1.0.x");
+			connect.connect();
 			BufferedReader in = new BufferedReader(new InputStreamReader(httpConnection.getInputStream()));
 			String input = in.readLine();
 			in.close();
@@ -161,8 +162,9 @@ private void unregister(final Context context, final String url, final int delay
 		try
 		{
 			URLConnection connect = new URL(url).openConnection();
-			connect.connect();
 			HttpURLConnection httpConnection = (HttpURLConnection) connect;
+			httpConnection.addRequestProperty("accept-version", "1.0.x");
+			connect.connect();
 			int response = httpConnection.getResponseCode();
 			if(!(response == 200))
 				throw new IOException("Response: "+Integer.toString(response));

bin/classes/nl/techinc/notify/NotifyActivity$StateReceiver.class

@@ -12,7 +12,6 @@
 import android.preference.PreferenceManager;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.TextView;
 
 public class NotifyActivity extends Activity {
@@ -30,15 +29,13 @@ public void onReceive(Context context, Intent intent) {
 			if(action.equals(SpaceState.ACTION_STATE))
 			{
 				final TextView statusLabel = (TextView) findViewById(R.id.status);
+				if(intent.getBooleanExtra("error", false))
+				{
+					statusLabel.setText(R.string.unknown);
+				}
 				boolean state = intent.getBooleanExtra("state", false);
 				statusLabel.setText(state ? R.string.open : R.string.closed);
 			}
-			else if(action.equals(GCMIntentService.ACTION_REGISTER))
-			{
-				boolean enabled = intent.getBooleanExtra("enabled", true);
-				TextView label = (TextView) findViewById(R.id.monitoring);
-				label.setText(enabled ? R.string.monitoring_enabled : R.string.monitoring_disabled);
-			}
 		}
 	}
 
@@ -48,7 +45,7 @@ public void onCreate(Bundle savedInstanceState)
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.main);
 		sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-		enableMonitor();
+		setMonitor();
 	}
 
 	@Override
@@ -57,7 +54,6 @@ public void onResume()
 		super.onResume();
 		receiver = new StateReceiver();
 		registerReceiver(receiver, new IntentFilter(SpaceState.ACTION_STATE));
-		registerReceiver(receiver, new IntentFilter(GCMIntentService.ACTION_REGISTER));
 		refresh();
 	}
 
@@ -70,11 +66,6 @@ protected void onPause()
 		receiver = null;
 	}
 
-	public void refresh(View view)
-	{
-		refresh();
-	}
-	
 	public void refresh()
 	{
 		final TextView statusLabel = (TextView) findViewById(R.id.status);
@@ -88,18 +79,21 @@ public void run()
 		}).start();
 	}
 
-	public void toggleMonitor(View view)
-	{
-		boolean oldState = sharedPreferences.getBoolean("monitor", true);
-		sharedPreferences.edit().putBoolean("monitor", !oldState).commit();
-		applyMonitor();
-	}
-	
-	public void enableMonitor()
+	public void setMonitor()
 	{
+		if(!sharedPreferences.getBoolean("gcm_enabled", true))
+			return;
 		TextView label = (TextView) findViewById(R.id.monitoring);
-		GCMRegistrar.checkDevice(this);
-		GCMRegistrar.checkManifest(this);
+		try
+		{
+			GCMRegistrar.checkDevice(this);
+			sharedPreferences.edit().putBoolean("gcm_supported", true).commit();
+		}
+		catch (UnsupportedOperationException e)
+		{
+			sharedPreferences.edit().putBoolean("gcm_supported", false).putBoolean("gcm_enabled", false).commit();
+			label.setText(R.string.monitoring_unsupported);
+		}
 		final String regId = GCMRegistrar.getRegistrationId(this);
 		if (regId.equals("")) {
 			GCMRegistrar.register(this, SENDER_ID);
@@ -109,30 +103,6 @@ public void enableMonitor()
 		}
 	}
 
-	public void disableMonitor()
-	{
-		TextView label = (TextView) findViewById(R.id.monitoring);
-		if(!GCMRegistrar.isRegistered(this))
-		{
-			label.setText(R.string.monitoring_disabled);
-			return;
-		}
-		GCMRegistrar.unregister(this);
-		label.setText(R.string.updating);
-	}
-	
-	public void applyMonitor()
-	{
-		if(sharedPreferences.getBoolean("monitor", true))
-		{
-			enableMonitor();
-		}
-		else
-		{
-			disableMonitor();
-		}
-	}
-	
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu)
 	{
@@ -143,6 +113,9 @@ public boolean onCreateOptionsMenu(Menu menu)
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
+		case R.id.menu_refresh:
+			refresh();
+			return true;
 		case R.id.menu_settings:
 			startActivity(new Intent(this, SettingsActivity.class));
 			return true;