store enabledness in preferences, be sure to tell the main fragment what we want

This commit is contained in:
Tom Hennen 2015-11-29 13:49:27 -05:00
parent 27e3a9ed2b
commit 926f99478b
2 changed files with 19 additions and 8 deletions

View File

@ -4,6 +4,7 @@ import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProvider; import android.appwidget.AppWidgetProvider;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.util.Log; import android.util.Log;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -14,17 +15,15 @@ import de.danoeh.antennapod.service.PlayerWidgetService;
public class PlayerWidget extends AppWidgetProvider { public class PlayerWidget extends AppWidgetProvider {
private static final String TAG = "PlayerWidget"; private static final String TAG = "PlayerWidget";
private static final String PREFS_NAME = "PlayerWidgetPrefs";
// static because there should only ever be one widget... private static final String KEY_ENABLED = "WidgetEnabled";
// and otherwise it just keeps getting reset when it gets messages
private static boolean enabled = false;
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
Log.d(TAG, "onReceive"); Log.d(TAG, "onReceive");
super.onReceive(context, intent); super.onReceive(context, intent);
if (!enabled) { // don't do anything if we're not enabled
// do nothing if (!isEnabled(context)) {
return; return;
} }
@ -40,7 +39,7 @@ public class PlayerWidget extends AppWidgetProvider {
public void onEnabled(Context context) { public void onEnabled(Context context) {
super.onEnabled(context); super.onEnabled(context);
Log.d(TAG, "Widget enabled"); Log.d(TAG, "Widget enabled");
enabled = true; setEnabled(context, true);
startUpdate(context); startUpdate(context);
} }
@ -55,7 +54,7 @@ public class PlayerWidget extends AppWidgetProvider {
public void onDisabled(Context context) { public void onDisabled(Context context) {
super.onDisabled(context); super.onDisabled(context);
Log.d(TAG, "Widet disabled"); Log.d(TAG, "Widet disabled");
enabled = false; setEnabled(context, false);
stopUpdate(context); stopUpdate(context);
} }
@ -68,4 +67,14 @@ public class PlayerWidget extends AppWidgetProvider {
Log.d(TAG, "stopUpdate() called with: " + "context = [" + context + "]"); Log.d(TAG, "stopUpdate() called with: " + "context = [" + context + "]");
context.stopService(new Intent(context, PlayerWidgetService.class)); context.stopService(new Intent(context, PlayerWidgetService.class));
} }
private boolean isEnabled(Context context) {
SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
return prefs.getBoolean(KEY_ENABLED, false);
}
private void setEnabled(Context context, boolean enabled) {
SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
prefs.edit().putBoolean(KEY_ENABLED, enabled);
}
} }

View File

@ -23,6 +23,7 @@ import de.danoeh.antennapod.core.service.playback.PlayerStatus;
import de.danoeh.antennapod.core.storage.DBWriter; import de.danoeh.antennapod.core.storage.DBWriter;
import de.danoeh.antennapod.core.util.Converter; import de.danoeh.antennapod.core.util.Converter;
import de.danoeh.antennapod.core.util.playback.Playable; import de.danoeh.antennapod.core.util.playback.Playable;
import de.danoeh.antennapod.fragment.QueueFragment;
import de.danoeh.antennapod.receiver.PlayerWidget; import de.danoeh.antennapod.receiver.PlayerWidget;
/** /**
@ -115,6 +116,7 @@ public class PlayerWidgetService extends Service {
Intent startApp = new Intent(getBaseContext(), MainActivity.class); Intent startApp = new Intent(getBaseContext(), MainActivity.class);
startApp.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startApp.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startApp.putExtra(MainActivity.EXTRA_FRAGMENT_TAG, QueueFragment.TAG);
PendingIntent startAppPending = PendingIntent.getActivity(getBaseContext(), 0, startApp, PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent startAppPending = PendingIntent.getActivity(getBaseContext(), 0, startApp, PendingIntent.FLAG_UPDATE_CURRENT);
boolean nothingPlaying = false; boolean nothingPlaying = false;