Fixed widget

Author: ArdaXi

AndroidManifest.xml

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

README.md

@@ -8,5 +8,5 @@ The application can be found on [Google Play](https://github.com/techinc/Techinc
 
 To-do:
 
-- Make widget clickable
+- Retry if failed instead of soft-fail
 - Look into deprecating GCM

bin/AndroidManifest.xml

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

bin/Techinc-Notify.apk

@@ -18,8 +18,8 @@
     <string name="closed">Closed</string>
     <string name="unknown">Unknown</string>
     <string name="button_refresh">Refresh</string>
-    <string name="monitoring_enabled">Monitoring enabled.</string>
-    <string name="monitoring_disabled">Monitoring disabled.</string>
+    <string name="monitoring_enabled">Monitoring enabled</string>
+    <string name="monitoring_disabled">Monitoring disabled</string>
     <string name="disable">Disable</string>
     <string name="enable">Enable</string>
     <string name="updating">Updating…</string>

bin/classes.dex

@@ -36,9 +36,9 @@ protected void onMessage(Context context, Intent intent) {
 		{
 			if(!sharedPref.getBoolean("debug", false))
 				return;
-			stateStr = stateStr.substring(3);
+			stateStr = new String(stateStr.substring(3));
 		}
-		if(!stateStr.equals("closed") || !stateStr.equals("open"))
+		if(!stateStr.equals("closed") && !stateStr.equals("open"))
 			return;
 		boolean state = !(stateStr.equals("closed"));
 		SpaceState.broadcastState(context, state);

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

@@ -1,28 +1,18 @@
 package nl.techinc.notify;
 
-import java.io.IOException;
-
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.widget.RemoteViews;
 
 public class NotifyAppWidgetProvider extends AppWidgetProvider {
-	
+
 	public void onUpdate(final Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds)
 	{
-		new Thread(new Runnable() {
-			public void run()
-			{
-				try {
-					SpaceState.updateState(context);
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}).start();
+		update(context, SpaceState.state);
 		for(int appWidgetId : appWidgetIds)
 		{
 			RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.notify_appwidget);
@@ -33,9 +23,27 @@ public void run()
 		}
 	}
 
-	public static void update(Context context, boolean state)
+	public void onReceive(Context context, Intent intent)
 	{
+		super.onReceive(context, intent);
+		if(!intent.hasExtra("state"))
+			return;
+		boolean state = intent.getBooleanExtra("state", false);
 		RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.notify_appwidget);
 		views.setImageViewResource(R.id.stateImage, state ? R.drawable.open : R.drawable.closed);
+		AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+		ComponentName componentName = new ComponentName(context, NotifyAppWidgetProvider.class);
+		appWidgetManager.updateAppWidget(componentName, views);
+	}
+	
+	public static void update(Context context, boolean state)
+	{
+		RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.notify_appwidget);
+		int resource;
+		if(state)
+			resource = R.drawable.open;
+		else
+			resource = R.drawable.closed;
+		views.setImageViewResource(R.id.stateImage, resource);
 	}
 }

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

@@ -33,11 +33,19 @@ public static void updateState(Context context) throws IOException
 	}
 
 	public static void broadcastState(Context context, boolean state)
+	{
+		SpaceState.state = state;
+		broadcastState(context);
+	}
+	
+	public static void broadcastState(Context context)
 	{
 		Intent intent = new Intent();
 		intent.setAction(ACTION_STATE);
 		intent.putExtra(PARAM_STATE, state);
 		context.sendBroadcast(intent);
-		NotifyAppWidgetProvider.update(context, state);
+		intent = new Intent(context, NotifyAppWidgetProvider.class);
+		intent.putExtra(PARAM_STATE, state);
+		context.sendBroadcast(intent);
 	}
 }