Merge pull request #129 from norkator/issue/104

Issue/104 - widget not loading or rendering

Author: norkator

app/src/main/java/com/nitramite/apcupsdmonitor/Widget.java

@@ -1,5 +1,6 @@
 package com.nitramite.apcupsdmonitor;
 
+import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
@@ -24,10 +25,8 @@
 
 public class Widget extends AppWidgetProvider {
 
-    //  Logging
     private static final String TAG = Widget.class.getSimpleName();
 
-
     @Override
     public void onReceive(Context context, Intent intent) {
         super.onReceive(context, intent);
@@ -39,32 +38,31 @@ public void onReceive(Context context, Intent intent) {
         onUpdate(context, appWidgetManager, appWidgetIds);
     }
 
-    // onUpdate
+    @SuppressLint("UnspecifiedImmutableFlag")
+    @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds);
         //noinspection ForLoopReplaceableByForEach
         for (int i = 0; i < appWidgetIds.length; i++) {
             try {
-                Intent intent = new Intent(context, MainMenu.class);
-                PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+                Log.i(TAG, "Widget on update event");
                 DatabaseHelper databaseHelper = new DatabaseHelper(context);
                 ArrayList<UPS> upsArrayList = getUpsData(databaseHelper);
-
                 RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.widget);
                 setBitmap(rv, R.id.upsStatusImage, createUpsViewBitmap(context, upsArrayList));
 
 
-                // On click refresh trigger method
-                Log.i(TAG, "Widget on update event");
-                Intent updateIntent = new Intent(context, Widget.class);
-                updateIntent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-                PendingIntent pendingUpdate = PendingIntent.getBroadcast(context, 0, updateIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-                rv.setOnClickPendingIntent(R.id.upsStatusImage, pendingUpdate);
+                // intent to open app on widget click
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                    Intent intentSync = new Intent(context, MainMenu.class);
+                    intentSync.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+                    PendingIntent pendingSync = PendingIntent.getActivity(
+                            context, 0, intentSync, PendingIntent.FLAG_IMMUTABLE
+                    );
+                    rv.setOnClickPendingIntent(R.id.upsStatusImage, pendingSync);
+                }
 
-                // Finish
-                rv.setOnClickPendingIntent(R.id.upsStatusImage, pendingIntent);
-                appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
 
+                appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
                 AppWidgetManager.getInstance(context).updateAppWidget(appWidgetIds[i], rv);
             } catch (Exception e) {
                 Log.e(TAG, e.toString());
@@ -132,6 +130,16 @@ private Bitmap createUpsViewBitmap(Context context, ArrayList<UPS> upsArrayList)
         return getBitmapFromView(mainLinearLayout);
     }
 
+    @Override
+    public void onEnabled(Context context) {
+        // Enter relevant functionality for when the first widget is created
+    }
+
+    @Override
+    public void onDisabled(Context context) {
+        // Enter relevant functionality for when the last widget is disabled
+    }
+
 
     private static Bitmap getBitmapFromView(View view) {
         try {
@@ -161,4 +169,5 @@ private void setBitmap(RemoteViews views, int resId, Bitmap bitmap) throws Runti
         views.setImageViewBitmap(resId, proxy);
     }
 
-} // End of class
+
+}

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

@@ -204,4 +204,7 @@
     <string name="donate_description">Пожертвования помогают поддерживать это приложение в актуальном состоянии и помогают в разработке новых функций.</string>
     <string name="nut_fqdn_error">Адрес Nut-сервера не в формате FQDN. Должно быть что-то вроде \"name@192.168.1.1\". </string>
 
+    <!-- Widget -->
+    <string name="widget_description">Виджет статуса</string>
+
 </resources>

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

@@ -204,4 +204,7 @@
     <string name="donate_description">Donations helps to keep this app up to date and helps with developing new features.</string>
     <string name="nut_fqdn_error">Nut server address not in FQDN format. Must be something like \"name@192.168.1.1\". </string>
 
+    <!-- Widget -->
+    <string name="widget_description">Status widget</string>
+
 </resources>

app/src/main/res/xml/widget_info.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:description="@string/widget_description"
     android:initialKeyguardLayout="@layout/widget"
     android:initialLayout="@layout/widget"
-    android:minHeight="30dp"
     android:minWidth="50dp"
+    android:minHeight="30dp"
     android:previewImage="@drawable/widget_preview"
     android:resizeMode="horizontal|vertical"
+    android:targetCellWidth="2"
+    android:targetCellHeight="1"
     android:updatePeriodMillis="3600000"
     android:widgetCategory="home_screen" />
 
-<!-- android:minHeight="60dp" -->
+    <!-- android:minHeight="60dp" -->