diff options
4 files changed, 15 insertions, 13 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java index 24b684752..5f76a20a8 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java @@ -120,7 +120,8 @@ public class FeedInfoActivity extends ActionBarActivity { }); txtvTitle.setText(feed.getTitle()); - txtvDescription.setText(feed.getDescription().trim()); + String description = feed.getDescription(); + txtvDescription.setText((description != null) ? description.trim() : ""); if (feed.getAuthor() != null) { txtvAuthor.setText(feed.getAuthor()); } 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 d62612c76..0645c4620 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -365,10 +365,12 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity return -1; } else { // last fragment was not a list, but a feed long feedId = Long.parseLong(lastFragment); - List<Feed> feeds = navDrawerData.feeds; - for (int i = 0; i < feeds.size(); i++) { - if (feeds.get(i).getId() == feedId) { - return i + navAdapter.getSubscriptionOffset(); + if (navDrawerData != null) { + List<Feed> feeds = navDrawerData.feeds; + for (int i = 0; i < feeds.size(); i++) { + if (feeds.get(i).getId() == feedId) { + return i + navAdapter.getSubscriptionOffset(); + } } } return -1; diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java index 3d233817b..223fe17f6 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java @@ -119,7 +119,7 @@ public class DefaultActionButtonCallback implements ActionButtonCallback { builder .setTitle(R.string.confirm_mobile_download_dialog_title) .setMessage(context.getText(R.string.confirm_mobile_download_dialog_message)) - .setPositiveButton(R.string.confirm_mobile_download_dialog_enable_temporarily, + .setPositiveButton(context.getText(R.string.confirm_mobile_download_dialog_enable_temporarily), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -135,7 +135,7 @@ public class DefaultActionButtonCallback implements ActionButtonCallback { }); LongList queueIds = DBReader.getQueueIDList(context); if(!queueIds.contains(item.getId())) { - builder.setNeutralButton(R.string.confirm_mobile_download_dialog_only_add_to_queue, + builder.setNeutralButton(context.getText(R.string.confirm_mobile_download_dialog_only_add_to_queue), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -148,8 +148,7 @@ public class DefaultActionButtonCallback implements ActionButtonCallback { } else { builder.setMessage(context.getText(R.string.confirm_mobile_download_dialog_message)); } - builder.setNegativeButton(R.string.cancel_label, null) - .create() + builder.create() .show(); } } diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index c6308fa7b..3cedfb8e5 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -161,10 +161,10 @@ <string name="authentication_notification_title">Authentication required</string> <string name="authentication_notification_msg">The resource you requested requires a username and a password</string> <string name="confirm_mobile_download_dialog_title">Confirm Mobile Download</string> - <string name="confirm_mobile_download_dialog_message_not_in_queue">Downloading over mobile data connection is disabled in the settings.\n\nEnable temporarily or just add to queue?\n\n<small>Your choice will be remember for 10 minutes.</small></string> - <string name="confirm_mobile_download_dialog_message">Downloading over mobile data connection is disabled in the settings.\n\nEnable temporarily?\n\n<small>Your choice will be remember for 10 minutes.</small></string> - <string name="confirm_mobile_download_dialog_only_add_to_queue">Only add to Queue</string> - <string name="confirm_mobile_download_dialog_enable_temporarily">Enable temporarily</string> + <string name="confirm_mobile_download_dialog_message_not_in_queue">Downloading over mobile data connection is disabled in the settings.\n\nYou can choose to either only add the episode to the queue or you can allow downloading temporarily.\n\n<small>Your choice will be remembered for 10 minutes.</small></string> + <string name="confirm_mobile_download_dialog_message">Downloading over mobile data connection is disabled in the settings.\n\nDo you want to allow downloading temporarily?\n\n<small>Your choice will be remembered for 10 minutes.</small></string> + <string name="confirm_mobile_download_dialog_only_add_to_queue">Enqueue</string> + <string name="confirm_mobile_download_dialog_enable_temporarily">Allow temporarily</string> <!-- Mediaplayer messages --> <string name="player_error_msg">Error!</string> |