Fix crashes in all outlets window while switching and if more than one widget

Author: davidgraeff

.idea/workspace.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="oly.netpowerctrl"
-    android:versionCode="8"
-    android:versionName="1.5">
+    android:versionCode="10"
+    android:versionName="1.5b">
 
-    <!-- Api level 16: Android 4.1 27. Juni 2012 -->
+<!-- Api level 16: Android 4.1 27. Juni 2012 -->
     <uses-sdk
         android:minSdkVersion="16"
         android:targetSdkVersion="17" />

app/src/main/AndroidManifest.xml

@@ -24,7 +24,7 @@
 
 public class OutletSwitchListAdapter extends BaseAdapter implements ListAdapter, OnCheckedChangeListener, DevicesUpdate {
     private static class OutletInfoAdditional {
-        OutletInfo oi;
+        public OutletInfo oi;
         String displayText;
 
         OutletInfoAdditional(OutletInfo oi, boolean showDevice) {
@@ -54,18 +54,21 @@ public OutletSwitchListAdapter(Context context) {
         onDevicesUpdated();
     }
 
+    @Override
     public int getCount() {
         return all_outlets.size();
     }
 
-    public Object getItem(int position) {
-        return all_outlets.get(position);
+    public OutletInfo getItem(int position) {
+        return all_outlets.get(position).oi;
     }
 
+    @Override
     public long getItemId(int position) {
         return position;
     }
 
+    @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         if (convertView == null) {
             convertView = inflater.inflate(R.layout.outlet_list_switch, null);
@@ -106,7 +109,7 @@ public void onCheckedChanged(CompoundButton arg0, boolean new_state) {
         if (position == -1)
             return;
         arg0.setEnabled(false);
-        OutletInfo oi = (OutletInfo) getItem(position);
+        OutletInfo oi = getItem(position);
         oi.Disabled = false;
         ash.setData(position, new_state);
         ash.removeMessages();

app/src/main/java/oly/netpowerctrl/listadapter/OutletSwitchListAdapter.java

@@ -9,6 +9,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -41,7 +42,7 @@ public class NetpowerctrlApplication extends Application implements DeviceUpdate
     private ArrayList<DevicesUpdate> observersNew = new ArrayList<DevicesUpdate>();
     private ArrayList<ServiceReady> observersServiceReady = new ArrayList<ServiceReady>();
 
-    private ArrayList<DeviceQuery> updateDeviceStateList = new ArrayList<DeviceQuery>();
+    private List<DeviceQuery> updateDeviceStateList = Collections.synchronizedList(new ArrayList<DeviceQuery>());
 
     //! get a list of all send ports of all configured scenes plus the default send port
     public ArrayList<Integer> getAllSendPorts() {

app/src/main/java/oly/netpowerctrl/main/NetpowerctrlApplication.java

@@ -44,7 +44,7 @@ public void handleMessage(Message m) {
             return;
         }
 
-        OutletInfo oi = (OutletInfo) ola.getItem(list_position);
+        OutletInfo oi = ola.getItem(list_position);
         if (oi.State != state) {
             retries++;
             Log.w("DeviceControl", "Sending again, no response " + Integer.valueOf(list_position).toString());

app/src/main/java/oly/netpowerctrl/utils/AfterSentHandler.java

@@ -13,6 +13,8 @@ public void onDeleted(Context context, int[] appWidgetIds) {
         for (int appWidgetId : appWidgetIds) {
             SharedPrefs.DeleteWidgets(context, appWidgetId);
         }
+        Intent intent = new Intent(context.getApplicationContext(), WidgetUpdateService.class);
+        context.startService(intent);
     }
 
     @Override

app/src/main/java/oly/netpowerctrl/widget/DeviceWidgetProvider.java

@@ -9,7 +9,6 @@
 import android.content.SharedPreferences;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.util.Log;
 import android.util.SparseArray;
 import android.widget.RemoteViews;
 
@@ -72,7 +71,9 @@ public void onDestroy() {
 
     @Override
     public void onCreate() {
-        Log.w("WIDGET", "CREATE");
+        //noinspection ConstantConditions
+        appWidgetManager = AppWidgetManager.getInstance(getApplicationContext());
+
         /**
          * If the service is kept running, we will receive further device updates
          * and register on the listener service for this purpose.
@@ -97,14 +98,6 @@ public void onCreate() {
      */
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        if (intent == null) {
-            stopSelf();
-            return START_NOT_STICKY;
-        }
-
-        //noinspection ConstantConditions
-        appWidgetManager = AppWidgetManager.getInstance(getApplicationContext());
-
         // Extract widget ids from intent
         //int[] allWidgetIds = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
         //assert allWidgetIds != null;
@@ -121,7 +114,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         }
 
         boolean noFetch = false;
-        if (intent.getExtras() != null)
+        if (intent != null && intent.getExtras() != null)
             noFetch = intent.getExtras().containsKey("noFetch");
 
         // Keep a list of scenes to fetch state updates
@@ -287,6 +280,8 @@ public void onDeviceUpdated(DeviceInfo di) {
         if (widgetUpdateRequests.size() == 0) {
             ComponentName thisWidget = new ComponentName(getApplicationContext(),
                     DeviceWidgetProvider.class);
+            //noinspection ConstantConditions
+            appWidgetManager = AppWidgetManager.getInstance(getApplicationContext());
             int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
             for (int appWidgetId : allWidgetIds) {
                 DeviceInfoOutletNumber widget_di = allWidgets.get(appWidgetId);