summaryrefslogtreecommitdiff
path: root/core/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/main')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java7
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/download/NewEpisodesNotification.java2
-rw-r--r--core/src/main/res/values/strings.xml1
3 files changed, 9 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index dc90de901..9bfad9959 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -207,7 +207,7 @@ public class UserPreferences {
public static List<Integer> getCompactNotificationButtons() {
String[] buttons = TextUtils.split(
prefs.getString(PREF_COMPACT_NOTIFICATION_BUTTONS,
- String.valueOf(NOTIFICATION_BUTTON_SKIP)),
+ NOTIFICATION_BUTTON_REWIND + "," + NOTIFICATION_BUTTON_FAST_FORWARD),
",");
List<Integer> notificationButtons = new ArrayList<>();
for (String button : buttons) {
@@ -610,6 +610,11 @@ public class UserPreferences {
public static void setProxyConfig(ProxyConfig config) {
SharedPreferences.Editor editor = prefs.edit();
editor.putString(PREF_PROXY_TYPE, config.type.name());
+ Proxy.Type type = Proxy.Type.valueOf(config.type.name());
+ if (type == Proxy.Type.DIRECT) {
+ editor.apply();
+ return;
+ }
if(TextUtils.isEmpty(config.host)) {
editor.remove(PREF_PROXY_HOST);
} else {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/NewEpisodesNotification.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/NewEpisodesNotification.java
index 869205b64..63e005927 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/NewEpisodesNotification.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/NewEpisodesNotification.java
@@ -79,6 +79,7 @@ public class NewEpisodesNotification {
.setContentIntent(pendingIntent)
.setGroup(GROUP_KEY)
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
+ .setOnlyAlertOnce(true)
.setAutoCancel(true)
.build();
@@ -102,6 +103,7 @@ public class NewEpisodesNotification {
.setGroup(GROUP_KEY)
.setGroupSummary(true)
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
+ .setOnlyAlertOnce(true)
.setAutoCancel(true)
.build();
notificationManager.notify(NotificationUtils.CHANNEL_ID_EPISODE_NOTIFICATIONS, 0, notificationGroupSummary);
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 804bf7af8..390fe7d95 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -675,6 +675,7 @@
<string name="stop_preview">Stop preview</string>
<!-- Content descriptions for image buttons -->
+ <string name="toolbar_back_button_content_description">Back</string>
<string name="rewind_label">Rewind</string>
<string name="fast_forward_label">Fast forward</string>
<string name="increase_speed">Increase speed</string>