diff options
| author | ByteHamster <ByteHamster@users.noreply.github.com> | 2020-10-25 18:56:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-25 18:56:40 +0100 |
| commit | 2ae11e1d18a8d4d2765743bfec3485d72663c4af (patch) | |
| tree | f0d625306dfe7e43c893cae83c7022749ba7d685 | |
| parent | 3e4e6381bd39a40b210e5b6ab054e3adee371330 (diff) | |
| parent | aeabc7c4ef8220066b5f513dac7635a87a9cfa7d (diff) | |
| download | AntennaPod-2ae11e1d18a8d4d2765743bfec3485d72663c4af.zip | |
Merge pull request #4589 from Niffler/resolve-issue-4320
Edit streaming confirmation dialog labels
3 files changed, 4 insertions, 3 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/StreamingConfirmationDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/StreamingConfirmationDialog.java index 46095604c..8e5ceece2 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/StreamingConfirmationDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/StreamingConfirmationDialog.java @@ -20,7 +20,7 @@ public class StreamingConfirmationDialog { new AlertDialog.Builder(context) .setTitle(R.string.stream_label) .setMessage(R.string.confirm_mobile_streaming_notification_message) - .setPositiveButton(R.string.stream_label, (dialog, which) -> stream()) + .setPositiveButton(R.string.confirm_mobile_streaming_button_once, (dialog, which) -> stream()) .setNegativeButton(R.string.confirm_mobile_streaming_button_always, (dialog, which) -> { UserPreferences.setAllowMobileStreaming(true); stream(); diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index 8677ea030..92f395d0d 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -580,7 +580,7 @@ public class PlaybackService extends MediaBrowserServiceCompat { .setPriority(NotificationCompat.PRIORITY_DEFAULT) .setContentIntent(pendingIntentAllowThisTime) .addAction(R.drawable.ic_stream_white, - getString(R.string.stream_label), + getString(R.string.confirm_mobile_streaming_button_once), pendingIntentAllowThisTime) .addAction(R.drawable.ic_stream_white, getString(R.string.confirm_mobile_streaming_button_always), diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 7f3c40e75..15f114c42 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -268,7 +268,8 @@ <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_streaming_notification_title">Confirm Mobile streaming</string> <string name="confirm_mobile_streaming_notification_message">Streaming over mobile data connection is disabled in the settings. Tap to stream anyway.</string> - <string name="confirm_mobile_streaming_button_always">Always allow</string> + <string name="confirm_mobile_streaming_button_always">Always</string> + <string name="confirm_mobile_streaming_button_once">Once</string> <string name="confirm_mobile_download_dialog_only_add_to_queue">Enqueue</string> <string name="confirm_mobile_download_dialog_enable_temporarily">Allow temporarily</string> |