From df90cb00ebb12193e10e6817b3633857aaca9d0e Mon Sep 17 00:00:00 2001 From: Petar Kukolj Date: Fri, 30 Nov 2018 13:28:39 +0100 Subject: [PATCH 1/2] Fix NPE when selecting Go to page for the first time --- .../antennapod/preferences/PreferenceController.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 587b533a2..7e724c74b 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -232,8 +232,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc if (newValue.equals("page")) { final Context context = ui.getActivity(); final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages); - final String[] navTags = new String[3]; - System.arraycopy(MainActivity.NAV_DRAWER_TAGS, 0, navTags, 0, 3); + final String[] navTags = { MainActivity.NAV_DRAWER_TAGS[0], MainActivity.NAV_DRAWER_TAGS[1], MainActivity.NAV_DRAWER_TAGS[2] }; final String choice[] = { UserPreferences.getBackButtonGoToPage() }; AlertDialog.Builder builder = new AlertDialog.Builder(context); @@ -243,11 +242,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc choice[0] = navTags[i]; } }); - builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> { - if (!choice[0].equals(UserPreferences.getBackButtonGoToPage())) { - UserPreferences.setBackButtonGoToPage(choice[0]); - } - }); + builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> UserPreferences.setBackButtonGoToPage(choice[0])); builder.setNegativeButton(R.string.cancel_label, null); builder.create().show(); return true; From 53957c9aa1aacf7629ded6562e163d77f0fe08e4 Mon Sep 17 00:00:00 2001 From: Petar Kukolj Date: Fri, 30 Nov 2018 17:59:29 +0100 Subject: [PATCH 2/2] Use a resoruce array for fragments tags --- .../danoeh/antennapod/preferences/PreferenceController.java | 2 +- core/src/main/res/values/arrays.xml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 7e724c74b..a9a82d749 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -232,7 +232,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc if (newValue.equals("page")) { final Context context = ui.getActivity(); final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages); - final String[] navTags = { MainActivity.NAV_DRAWER_TAGS[0], MainActivity.NAV_DRAWER_TAGS[1], MainActivity.NAV_DRAWER_TAGS[2] }; + final String[] navTags = context.getResources().getStringArray(R.array.back_button_go_to_pages_tags); final String choice[] = { UserPreferences.getBackButtonGoToPage() }; AlertDialog.Builder builder = new AlertDialog.Builder(context); diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml index 3a618b8c2..12961504c 100644 --- a/core/src/main/res/values/arrays.xml +++ b/core/src/main/res/values/arrays.xml @@ -299,4 +299,10 @@ @string/episodes_label @string/subscriptions_label + + + QueueFragment + EpisodesFragment + SubscriptionFragment +