From 2ecf6bdb9ffa95c3c64afe38995449216f7d5ada Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 11 Jul 2018 12:21:10 +0300
Subject: simplify requests to update widget update widget on device boot

---
 org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java        | 5 +++++
 org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java        | 4 +---
 .../src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java         | 3 ++-
 .../src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java      | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 org.fox.ttrss/src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java

(limited to 'org.fox.ttrss/src/main/java')

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index 2a80466e..b21e6981 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -30,6 +30,7 @@ import android.support.customtabs.CustomTabsIntent;
 import android.support.customtabs.CustomTabsServiceConnection;
 import android.support.customtabs.CustomTabsSession;
 import android.support.design.widget.Snackbar;
+import android.support.v4.app.JobIntentService;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
@@ -43,6 +44,7 @@ import com.livefront.bridge.Bridge;
 
 import org.fox.ttrss.util.DatabaseHelper;
 import org.fox.ttrss.widget.SmallWidgetProvider;
+import org.fox.ttrss.widget.WidgetUpdateService;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
@@ -571,5 +573,8 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 		Glide.get(this).clearMemory();
 	}
 
+	public static void requestWidgetUpdate(Context context) {
+		JobIntentService.enqueueWork(context.getApplicationContext(), WidgetUpdateService.class, 0, new Intent());
+	}
 }
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
index 958e53ca..4c4b544c 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
@@ -12,7 +12,6 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.app.JobIntentService;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.Toolbar;
@@ -27,7 +26,6 @@ import org.fox.ttrss.types.Article;
 import org.fox.ttrss.types.ArticleList;
 import org.fox.ttrss.types.Feed;
 import org.fox.ttrss.types.FeedCategory;
-import org.fox.ttrss.widget.WidgetUpdateService;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -491,7 +489,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 		if (isFinishing() || date.getTime() - m_lastWidgetRefresh > 60*1000) {
 			m_lastWidgetRefresh = date.getTime();
 
-			JobIntentService.enqueueWork(getApplicationContext(), WidgetUpdateService.class, 0, new Intent());
+			CommonActivity.requestWidgetUpdate(MasterActivity.this);
 		}
 
     }
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java
old mode 100644
new mode 100755
index 1622e72d..953c7124
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java
@@ -9,7 +9,8 @@ import org.fox.ttrss.CommonActivity;
 public class DeviceBootReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (intent.getAction().equals("android.intent.action.BOOT_COMPLETED")) {
+        if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
+            CommonActivity.requestWidgetUpdate(context);
             CommonActivity.setupWidgetUpdates(context);
         }
     }
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java
index ddc602cd..b17a0db4 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java
@@ -8,11 +8,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v4.app.JobIntentService;
 import android.util.Log;
 import android.view.View;
 import android.widget.RemoteViews;
 
+import org.fox.ttrss.CommonActivity;
 import org.fox.ttrss.OnlineActivity;
 import org.fox.ttrss.R;
 
@@ -65,7 +65,7 @@ public class SmallWidgetProvider extends AppWidgetProvider {
 
 	        Log.d(TAG, "sheduling widget update...");
 
-            JobIntentService.enqueueWork(context.getApplicationContext(), WidgetUpdateService.class, 0, new Intent());
+            CommonActivity.requestWidgetUpdate(context);
         }
 	}
 
-- 
cgit v1.2.3