From a93085a58d59b010c5c694f3cc808d3444000189 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 14 Oct 2021 21:02:54 +0200
Subject: [PATCH] Use ff/rew as default notification buttons
---
.../java/de/test/antennapod/ui/PreferencesTest.java | 5 +++--
.../danoeh/antennapod/core/preferences/UserPreferences.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
index d51ae63ba..eba53bb9e 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
@@ -126,8 +126,9 @@ public class PreferencesTest {
clickPreference(R.string.user_interface_label);
String[] buttons = res.getStringArray(R.array.compact_notification_buttons_options);
clickPreference(R.string.pref_compact_notification_buttons_title);
- // First uncheck checkbox
- onView(withText(buttons[2])).perform(click());
+ // First uncheck checkboxes
+ onView(withText(buttons[0])).perform(click());
+ onView(withText(buttons[1])).perform(click());
// Now try to check all checkboxes
onView(withText(buttons[0])).perform(click());
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 c20666aaa..bda8e3926 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) {