From 1bf803a6b21c1547cb66d679b927e983f670e2a2 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Thu, 28 May 2015 11:41:36 +0200
Subject: [PATCH] Remove cancel, adjust strings

---
 .../antennapod/adapter/DefaultActionButtonCallback.java   | 7 +++----
 core/src/main/res/values/strings.xml                      | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

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..5150f9bd8 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 remember 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 remember 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>