From 7152b0e0ebffc70ce5c7b4cc40ea52902add588e Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Sun, 1 Nov 2015 14:33:07 +0100 Subject: Unused parameter --- .../java/de/test/antennapod/ui/MainActivityTest.java | 10 +++++----- .../main/java/de/danoeh/antennapod/activity/MainActivity.java | 2 +- .../de/danoeh/antennapod/preferences/PreferenceController.java | 2 +- .../de/danoeh/antennapod/core/preferences/UserPreferences.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java index f6c3d0e7d..c09f40b17 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java @@ -91,7 +91,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2()); + UserPreferences.setHiddenDrawerItems(new ArrayList()); // queue openNavDrawer(); @@ -147,7 +147,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2()); + UserPreferences.setHiddenDrawerItems(new ArrayList()); openNavDrawer(); solo.clickLongOnText(solo.getString(R.string.queue_label)); solo.waitForDialogToOpen(); @@ -163,7 +163,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2 hidden = Arrays.asList(PlaybackHistoryFragment.TAG, DownloadsFragment.TAG); - UserPreferences.setHiddenDrawerItems(getInstrumentation().getTargetContext(), hidden); + UserPreferences.setHiddenDrawerItems(hidden); openNavDrawer(); solo.clickLongOnText(solo.getString(R.string.queue_label)); solo.waitForDialogToOpen(); @@ -178,7 +178,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2()); + UserPreferences.setHiddenDrawerItems(new ArrayList()); String[] titles = getInstrumentation().getTargetContext().getResources().getStringArray(R.array.nav_drawer_titles); openNavDrawer(); @@ -197,7 +197,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2()); + UserPreferences.setHiddenDrawerItems(new ArrayList()); openNavDrawer(); String downloads = solo.getString(R.string.downloads_label); diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java index e7e39d794..b03dde404 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -259,7 +259,7 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity builder.setPositiveButton(R.string.confirm_label, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - UserPreferences.setHiddenDrawerItems(MainActivity.this, hiddenDrawerItems); + UserPreferences.setHiddenDrawerItems(hiddenDrawerItems); } }); builder.setNegativeButton(R.string.cancel_label, null); diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java index a8838dafa..138246038 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -642,7 +642,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc builder.setPositiveButton(R.string.confirm_label, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - UserPreferences.setHiddenDrawerItems(context, hiddenDrawerItems); + UserPreferences.setHiddenDrawerItems(hiddenDrawerItems); } }); builder.setNegativeButton(R.string.cancel_label, null); diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index 006c48b26..5df345d62 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -420,7 +420,7 @@ public class UserPreferences { .apply(); } - public static void setHiddenDrawerItems(Context context, List items) { + public static void setHiddenDrawerItems(List items) { String str = StringUtils.join(items, ','); prefs.edit() .putString(PREF_HIDDEN_DRAWER_ITEMS, str) -- cgit v1.2.3 From 6c81a9fa913f83126659d1587f98a5f73b0bac61 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Sun, 1 Nov 2015 14:34:21 +0100 Subject: Don't use ugly callbacks when you have your own reference --- .../de/danoeh/antennapod/core/preferences/UserPreferences.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index 5df345d62..b9ce2db31 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -24,7 +24,6 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; -import de.danoeh.antennapod.core.ClientConfig; import de.danoeh.antennapod.core.R; import de.danoeh.antennapod.core.receiver.FeedUpdateReceiver; import de.danoeh.antennapod.core.storage.APCleanupAlgorithm; @@ -623,8 +622,8 @@ public class UserPreferences { public static void restartUpdateIntervalAlarm(long triggerAtMillis, long intervalMillis) { Log.d(TAG, "Restarting update alarm."); AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); - PendingIntent updateIntent = PendingIntent.getBroadcast(context, 0, - new Intent(ClientConfig.applicationCallbacks.getApplicationInstance(), FeedUpdateReceiver.class), 0); + Intent intent = new Intent(context, FeedUpdateReceiver.class); + PendingIntent updateIntent = PendingIntent.getBroadcast(context, 0, intent, 0); alarmManager.cancel(updateIntent); if (intervalMillis > 0) { alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, @@ -643,7 +642,7 @@ public class UserPreferences { Log.d(TAG, "Restarting update alarm."); AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); PendingIntent updateIntent = PendingIntent.getBroadcast(context, 0, - new Intent(ClientConfig.applicationCallbacks.getApplicationInstance(), FeedUpdateReceiver.class), 0); + new Intent(context, FeedUpdateReceiver.class), 0); alarmManager.cancel(updateIntent); Calendar now = Calendar.getInstance(); -- cgit v1.2.3 From d56af7e001f91ac17a320cd0c1b21887932dfb13 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Sun, 1 Nov 2015 14:34:44 +0100 Subject: Always use application context --- .../java/de/danoeh/antennapod/core/preferences/UserPreferences.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index b9ce2db31..77db541fa 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -123,7 +123,7 @@ public class UserPreferences { Log.d(TAG, "Creating new instance of UserPreferences"); Validate.notNull(context); - UserPreferences.context = context; + UserPreferences.context = context.getApplicationContext(); UserPreferences.prefs = PreferenceManager.getDefaultSharedPreferences(context); createImportDirectory(); -- cgit v1.2.3