Refactoring and Fix #349

3 files changed, 20 insertions, 17 deletions

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java
index 406388c5..7f29b1b4 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java
@@ -47,6 +47,7 @@ import de.luhmer.owncloudnewsreader.services.PodcastDownloadService;
 import de.luhmer.owncloudnewsreader.services.PodcastPlaybackService;
 import de.luhmer.owncloudnewsreader.view.PodcastSlidingUpPanelLayout;
 import de.luhmer.owncloudnewsreader.view.ZoomableRelativeLayout;
+import de.luhmer.owncloudnewsreader.widget.WidgetProvider;
 
 public class PodcastFragmentActivity extends AppCompatActivity implements IPlayPausePodcastClicked {
 
@@ -149,6 +150,7 @@ public class PodcastFragmentActivity extends AppCompatActivity implements IPlayP
         eventBus.post(new RegisterVideoOutput(null, null));
 
         TeslaUnreadManager.PublishUnreadCount(this);
+        WidgetProvider.UpdateWidget(this);
 
         super.onPause();
     }
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java
index b09977d8..9e053431 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java
@@ -23,7 +23,6 @@ package de.luhmer.owncloudnewsreader.services;
 
 import android.app.ActivityManager;
 import android.app.Service;
-import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -148,20 +147,7 @@ public class OwnCloudSyncService extends Service {
 		}
 	};
 
-    private void UpdateWidget()
-    {
-        Intent intent = new Intent(this, WidgetProvider.class);
-        intent.setAction("android.appwidget.action.APPWIDGET_UPDATE");
-        // Use an array and EXTRA_APPWIDGET_IDS instead of AppWidgetManager.EXTRA_APPWIDGET_ID,
-        // since it seems the onUpdate() is only fired on that:
-
-        int ids[] = AppWidgetManager.getInstance(getApplication()).getAppWidgetIds(new ComponentName(getApplication(), WidgetProvider.class));
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,ids);
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,ids);
-        sendBroadcast(intent);
-    }
-
-	private void ThrowException(Exception ex) {
+    private void ThrowException(Exception ex) {
 		List<IOwnCloudSyncServiceCallback> callbackList = getCallBackItemsAndBeginBroadcast();
 		for (IOwnCloudSyncServiceCallback icb : callbackList) {
 			try {
@@ -191,6 +177,7 @@ public class OwnCloudSyncService extends Service {
 	
 	private void finishedSync() {
 		TeslaUnreadManager.PublishUnreadCount(this);
+		WidgetProvider.UpdateWidget(this);
 
 		syncRunning = false;
 		syncStopWatch.stop();
@@ -212,7 +199,6 @@ public class OwnCloudSyncService extends Service {
 				if(mPrefs.getBoolean(SettingsActivity.CB_SHOW_NOTIFICATION_NEW_ARTICLES_STRING, true))//Default is true
 					NotificationManagerNewsReader.getInstance(OwnCloudSyncService.this).ShowMessage(title, tickerText, contentText);
 			}
-			UpdateWidget();
 		}
 
 		List<IOwnCloudSyncServiceCallback> callbackList = getCallBackItemsAndBeginBroadcast();
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetProvider.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetProvider.java
index 7debbe33..abe6e3e7 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetProvider.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/widget/WidgetProvider.java
@@ -24,6 +24,7 @@ package de.luhmer.owncloudnewsreader.widget;
 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.content.SharedPreferences;
@@ -53,7 +54,21 @@ public class WidgetProvider extends AppWidgetProvider {
     
     public static final String EXTRA_ITEM = null;
 	private static final String TAG = "WidgetProvider";
-	    
+
+
+    public static void UpdateWidget(Context context)
+    {
+        Intent intent = new Intent(context, WidgetProvider.class);
+        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+        // Use an array and EXTRA_APPWIDGET_IDS instead of AppWidgetManager.EXTRA_APPWIDGET_ID,
+        // since it seems the onUpdate() is only fired on that:
+
+        int ids[] = AppWidgetManager.getInstance(context).getAppWidgetIds(new ComponentName(context, WidgetProvider.class));
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS,ids);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,ids);
+        context.sendBroadcast(intent);
+    }
+
     @Override
     public void onReceive(Context context, Intent intent) {
     	final int appWidgetId[];