Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2924 from qkolj/backbut-npe

Browse Source 
Fix NPE when selecting Go to page for the first time
This commit is contained in:
H. Lehmann 2018-11-30 22:09:25 +01:00 committed by GitHub
commit d5ce405162
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
View File

@ -232,8 +232,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
if (newValue.equals("page")) { if (newValue.equals("page")) {
final Context context = ui.getActivity(); final Context context = ui.getActivity();
final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages); final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages);
final String[] navTags = new String[3]; final String[] navTags = context.getResources().getStringArray(R.array.back_button_go_to_pages_tags);
System.arraycopy(MainActivity.NAV_DRAWER_TAGS, 0, navTags, 0, 3);
final String choice[] = { UserPreferences.getBackButtonGoToPage() }; final String choice[] = { UserPreferences.getBackButtonGoToPage() };
AlertDialog.Builder builder = new AlertDialog.Builder(context); AlertDialog.Builder builder = new AlertDialog.Builder(context);
@ -243,11 +242,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
choice[0] = navTags[i]; choice[0] = navTags[i];
} }
}); });
builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> { builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> UserPreferences.setBackButtonGoToPage(choice[0]));
if (!choice[0].equals(UserPreferences.getBackButtonGoToPage())) {
UserPreferences.setBackButtonGoToPage(choice[0]);
}
});
builder.setNegativeButton(R.string.cancel_label, null); builder.setNegativeButton(R.string.cancel_label, null);
builder.create().show(); builder.create().show();
return true; return true;

6
core/src/main/res/values/arrays.xml
View File

@ -299,4 +299,10 @@
<item>@string/episodes_label</item> <item>@string/episodes_label</item>
<item>@string/subscriptions_label</item> <item>@string/subscriptions_label</item>
</string-array> </string-array>
<string-array name="back_button_go_to_pages_tags">
<item>QueueFragment</item>
<item>EpisodesFragment</item>
<item>SubscriptionFragment</item>
</string-array>
</resources> </resources>