diff options
Diffstat (limited to 'app/src')
-rw-r--r-- | app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java | 5 | ||||
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java | 16 |
2 files changed, 11 insertions, 10 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 8d8d727bd..e29d77e8d 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java @@ -369,8 +369,6 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference int seconds = UserPreferences.getRewindSecs(); int deltas[] = res.getIntArray(R.array.seek_delta_values); - //Log.d("PreferencesTest", "Before rewind secs: " + UserPreferences.getRewindSecs()); - solo.clickOnText(solo.getString(R.string.pref_rewind)); solo.waitForDialogToOpen(); @@ -386,9 +384,6 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference solo.waitForDialogToClose(); assertTrue(solo.waitForCondition(() -> UserPreferences.getRewindSecs() == deltas[newIndex], Timeout.getLargeTimeout())); - - //Log.d("PreferencesTest", "After rewind secs: " + UserPreferences.getRewindSecs()); - } public void testFastForwardChange() { diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java index 5656a1afe..818864f79 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -183,10 +183,10 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements }; } - static protected TextView getTxtvFFFromActivity(MediaplayerActivity activity) { + protected static TextView getTxtvFFFromActivity(MediaplayerActivity activity) { return activity.txtvFF; } - static protected TextView getTxtvRevFromActivity(MediaplayerActivity activity) { + protected static TextView getTxtvRevFromActivity(MediaplayerActivity activity) { return activity.txtvRev; } @@ -666,8 +666,15 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements * Abstract directions to skip forward or back (rewind) and encapsulates behavior to get or set preference (including update of UI on the skip buttons). */ static public enum SkipDirection { - SKIP_FORWARD(UserPreferences::getFastForwardSecs, MediaplayerActivity::getTxtvFFFromActivity, UserPreferences::setFastForwardSecs, R.string.pref_fast_forward), - SKIP_REWIND(UserPreferences::getRewindSecs, MediaplayerActivity::getTxtvRevFromActivity, UserPreferences::setRewindSecs, R.string.pref_rewind); + SKIP_FORWARD( + UserPreferences::getFastForwardSecs, + MediaplayerActivity::getTxtvFFFromActivity, + UserPreferences::setFastForwardSecs, + R.string.pref_fast_forward), + SKIP_REWIND(UserPreferences::getRewindSecs, + MediaplayerActivity::getTxtvRevFromActivity, + UserPreferences::setRewindSecs, + R.string.pref_rewind); private final Supplier<Integer> getPrefSecsFn; private final Func1<MediaplayerActivity, TextView> getTextViewFn; @@ -704,7 +711,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements public void setPrefSkipSeconds(int seconds, @Nullable Activity activity) { setPrefSecsFn.call(seconds); - /// Optionlally, update display of skip value on ff/rewind buttons in mediaplayer if (activity != null && activity instanceof MediaplayerActivity) { TextView tv = getTextViewFn.call((MediaplayerActivity)activity); if (tv != null) tv.setText(String.valueOf(seconds)); |