Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove cancel, adjust strings

This commit is contained in:
Martin Fietz 2015-05-28 11:41:36 +02:00
parent c228eade97
commit 1bf803a6b2
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
View File

@ -119,7 +119,7 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
builder builder
.setTitle(R.string.confirm_mobile_download_dialog_title) .setTitle(R.string.confirm_mobile_download_dialog_title)
.setMessage(context.getText(R.string.confirm_mobile_download_dialog_message)) .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() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
@ -135,7 +135,7 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
}); });
LongList queueIds = DBReader.getQueueIDList(context); LongList queueIds = DBReader.getQueueIDList(context);
if(!queueIds.contains(item.getId())) { 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() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
@ -148,8 +148,7 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
} else { } else {
builder.setMessage(context.getText(R.string.confirm_mobile_download_dialog_message)); builder.setMessage(context.getText(R.string.confirm_mobile_download_dialog_message));
} }
builder.setNegativeButton(R.string.cancel_label, null) builder.create()
.create()
.show(); .show();
} }
} }

8
core/src/main/res/values/strings.xml
View File

@ -161,10 +161,10 @@
<string name="authentication_notification_title">Authentication required</string> <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="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_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_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\nEnable 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">Only add to Queue</string> <string name="confirm_mobile_download_dialog_only_add_to_queue">Enqueue</string>
<string name="confirm_mobile_download_dialog_enable_temporarily">Enable temporarily</string> <string name="confirm_mobile_download_dialog_enable_temporarily">Allow temporarily</string>
<!-- Mediaplayer messages --> <!-- Mediaplayer messages -->
<string name="player_error_msg">Error!</string> <string name="player_error_msg">Error!</string>