Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed commented out debugging code and superfluous comments.

Browse Source 
Change order of protected static keywords.
This commit is contained in:
eraymond 2016-10-02 12:53:10 -07:00
parent a788f61a6a
commit db4f9bc978
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
View File

@ -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() {

16
app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
View File

@ -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));