Merge pull request #718 from mfietz/feature/forward-backward

Separate fast forward and rewind times

5 files changed, 69 insertions, 85 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 022c03ca7..8e4ab1a49 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
@@ -58,7 +58,8 @@ public class UserPreferences implements
     private static final String PREF_PLAYBACK_SPEED = "prefPlaybackSpeed";
     private static final String PREF_PLAYBACK_SPEED_ARRAY = "prefPlaybackSpeedArray";
     public static final String PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS = "prefPauseForFocusLoss";
-    private static final String PREF_SEEK_DELTA_SECS = "prefSeekDeltaSecs";
+    private static final String PREF_FAST_FORWARD_SECS = "prefFastForwardSecs";
+    private static final String PREF_REWIND_SECS = "prefRewindSecs";
     private static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
     private static final String PREF_PERSISTENT_NOTIFICATION = "prefPersistNotify";
     public static final String PREF_QUEUE_ADD_TO_FRONT = "prefQueueAddToFront";
@@ -93,7 +94,8 @@ public class UserPreferences implements
     private String playbackSpeed;
     private String[] playbackSpeedArray;
     private boolean pauseForFocusLoss;
-    private int seekDeltaSecs;
+    private int fastForwardSecs;
+    private int rewindSecs;
     private boolean isFreshInstall;
     private int notifyPriority;
     private boolean persistNotify;
@@ -109,8 +111,7 @@ public class UserPreferences implements
      * @throws IllegalArgumentException if context is null
      */
     public static void createInstance(Context context) {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Creating new instance of UserPreferences");
+        Log.d(TAG, "Creating new instance of UserPreferences");
         Validate.notNull(context);
 
         instance = new UserPreferences(context);
@@ -157,7 +158,8 @@ public class UserPreferences implements
         playbackSpeedArray = readPlaybackSpeedArray(sp.getString(
                 PREF_PLAYBACK_SPEED_ARRAY, null));
         pauseForFocusLoss = sp.getBoolean(PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS, false);
-        seekDeltaSecs = Integer.valueOf(sp.getString(PREF_SEEK_DELTA_SECS, "30"));
+        fastForwardSecs = sp.getInt(PREF_FAST_FORWARD_SECS, 30);
+        rewindSecs = sp.getInt(PREF_REWIND_SECS, 30);
         if (sp.getBoolean(PREF_EXPANDED_NOTIFICATION, false)) {
           notifyPriority = NotificationCompat.PRIORITY_MAX;
         }
@@ -343,9 +345,14 @@ public class UserPreferences implements
         return instance.playbackSpeedArray;
     }
 
-    public static int getSeekDeltaMs() {
+    public static int getFastFowardSecs() {
         instanceAvailable();
-        return 1000 * instance.seekDeltaSecs;
+        return instance.fastForwardSecs;
+    }
+
+    public static int getRewindSecs() {
+        instanceAvailable();
+        return instance.rewindSecs;
     }
 
     /**
@@ -429,8 +436,10 @@ public class UserPreferences implements
                     PREF_PLAYBACK_SPEED_ARRAY, null));
         } else if (key.equals(PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS)) {
             pauseForFocusLoss = sp.getBoolean(PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS, false);
-        } else if (key.equals(PREF_SEEK_DELTA_SECS)) {
-            seekDeltaSecs = Integer.valueOf(sp.getString(PREF_SEEK_DELTA_SECS, "30"));
+        } else if (key.equals(PREF_FAST_FORWARD_SECS)) {
+            fastForwardSecs = sp.getInt(PREF_FAST_FORWARD_SECS, 30);
+        } else if (key.equals(PREF_REWIND_SECS)) {
+            rewindSecs = sp.getInt(PREF_REWIND_SECS, 30);
         } else if (key.equals(PREF_PAUSE_ON_HEADSET_DISCONNECT)) {
             pauseOnHeadsetDisconnect = sp.getBoolean(PREF_PAUSE_ON_HEADSET_DISCONNECT, true);
         } else if (key.equals(PREF_UNPAUSE_ON_HEADSET_RECONNECT)) {
@@ -450,6 +459,20 @@ public class UserPreferences implements
         }
     }
 
+    public static void setPrefFastForwardSecs(int secs) {
+        Log.d(TAG, "setPrefFastForwardSecs(" + secs +")");
+        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(instance.context).edit();
+        editor.putInt(PREF_FAST_FORWARD_SECS, secs);
+        editor.commit();
+    }
+
+    public static void setPrefRewindSecs(int secs) {
+        Log.d(TAG, "setPrefRewindSecs(" + secs +")");
+        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(instance.context).edit();
+        editor.putInt(PREF_REWIND_SECS, secs);
+        editor.commit();
+    }
+
     public static void setPlaybackSpeed(String speed) {
         PreferenceManager.getDefaultSharedPreferences(instance.context).edit()
                 .putString(PREF_PLAYBACK_SPEED, speed).apply();
@@ -524,8 +547,7 @@ public class UserPreferences implements
                 .getDefaultSharedPreferences(context.getApplicationContext());
         String strDir = prefs.getString(PREF_DATA_FOLDER, null);
         if (strDir == null) {
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Using default data folder");
+            Log.d(TAG, "Using default data folder");
             return context.getExternalFilesDir(type);
         } else {
             File dataDir = new File(strDir);
@@ -556,8 +578,7 @@ public class UserPreferences implements
                 if (!typeDir.exists()) {
                     if (dataDir.canWrite()) {
                         if (!typeDir.mkdir()) {
-                            Log.e(TAG, "Could not create data folder named "
-                                    + type);
+                            Log.e(TAG, "Could not create data folder named " + type);
                             return null;
                         }
                     }
@@ -569,8 +590,7 @@ public class UserPreferences implements
     }
 
     public static void setDataFolder(String dir) {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Result from DirectoryChooser: " + dir);
+        Log.d(TAG, "Result from DirectoryChooser: " + dir);
         instanceAvailable();
         SharedPreferences prefs = PreferenceManager
                 .getDefaultSharedPreferences(instance.context);
@@ -607,16 +627,13 @@ public class UserPreferences implements
                 IMPORT_DIR);
         if (importDir != null) {
             if (importDir.exists()) {
-                if (BuildConfig.DEBUG)
-                    Log.d(TAG, "Import directory already exists");
+                Log.d(TAG, "Import directory already exists");
             } else {
-                if (BuildConfig.DEBUG)
-                    Log.d(TAG, "Creating import directory");
+                Log.d(TAG, "Creating import directory");
                 importDir.mkdir();
             }
         } else {
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Could not access external storage.");
+            Log.d(TAG, "Could not access external storage.");
         }
     }
 
@@ -625,8 +642,7 @@ public class UserPreferences implements
      */
     public static void restartUpdateAlarm(long triggerAtMillis, long intervalMillis) {
         instanceAvailable();
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Restarting update alarm.");
+        Log.d(TAG, "Restarting update alarm.");
         AlarmManager alarmManager = (AlarmManager) instance.context
                 .getSystemService(Context.ALARM_SERVICE);
         PendingIntent updateIntent = PendingIntent.getBroadcast(
@@ -635,11 +651,9 @@ public class UserPreferences implements
         if (intervalMillis != 0) {
             alarmManager.setRepeating(AlarmManager.RTC_WAKEUP, triggerAtMillis, intervalMillis,
                     updateIntent);
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Changed alarm to new interval");
+            Log.d(TAG, "Changed alarm to new interval");
         } else {
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Automatic update was deactivated");
+            Log.d(TAG, "Automatic update was deactivated");
         }
     }
 
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 43c345fec..cab63891b 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
@@ -344,11 +344,11 @@ public class PlaybackService extends Service {
                 break;
             case KeyEvent.KEYCODE_MEDIA_NEXT:
             case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:
-                mediaPlayer.seekDelta(UserPreferences.getSeekDeltaMs());
+                mediaPlayer.seekDelta(UserPreferences.getFastFowardSecs() * 1000);
                 break;
             case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
             case KeyEvent.KEYCODE_MEDIA_REWIND:
-                mediaPlayer.seekDelta(-UserPreferences.getSeekDeltaMs());
+                mediaPlayer.seekDelta(-UserPreferences.getRewindSecs() * 1000);
                 break;
             case KeyEvent.KEYCODE_MEDIA_STOP:
                 if (status == PlayerStatus.PLAYING) {
@@ -481,9 +481,8 @@ public class PlaybackService extends Service {
             }
 
             Intent statusUpdate = new Intent(ACTION_PLAYER_STATUS_CHANGED);
-            statusUpdate.putExtra(EXTRA_NEW_PLAYER_STATUS, newInfo.playerStatus.ordinal());
+            // statusUpdate.putExtra(EXTRA_NEW_PLAYER_STATUS, newInfo.playerStatus.ordinal());
             sendBroadcast(statusUpdate);
-            sendBroadcast(new Intent(ACTION_PLAYER_STATUS_CHANGED));
             updateWidget();
             refreshRemoteControlClientState(newInfo);
             bluetoothNotifyChange(newInfo, AVRCP_ACTION_PLAYER_STATUS_CHANGED);
@@ -626,7 +625,6 @@ public class PlaybackService extends Service {
             prepareImmediately = startWhenPrepared = true;
         } else {
             Log.d(TAG, "No more episodes available to play");
-
             prepareImmediately = startWhenPrepared = false;
             stopForeground(true);
             stopWidgetUpdater();
@@ -933,7 +931,6 @@ public class PlaybackService extends Service {
                 // Auto flattr
                 if (isAutoFlattrable(media) &&
                         (media.getPlayedDuration() > UserPreferences.getAutoFlattrPlayedDurationThreshold() * duration)) {
-
                     Log.d(TAG, "saveCurrentPosition: performing auto flattr since played duration " + Integer.toString(media.getPlayedDuration())
                                 + " is " + UserPreferences.getAutoFlattrPlayedDurationThreshold() * 100 + "% of file duration " + Integer.toString(duration));
                     DBTasks.flattrItemIfLoggedIn(this, item);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
index f0acc3531..448ab05b9 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
@@ -449,15 +449,15 @@ public class PlaybackServiceMediaPlayer {
         if (playerStatus == PlayerStatus.PLAYING
                 || playerStatus == PlayerStatus.PAUSED
                 || playerStatus == PlayerStatus.PREPARED) {
-            if (stream) {
-                //    statusBeforeSeeking = playerStatus;
-                //    setPlayerStatus(PlayerStatus.SEEKING, media);
+            if (!stream) {
+                statusBeforeSeeking = playerStatus;
+                setPlayerStatus(PlayerStatus.SEEKING, media);
             }
             mediaPlayer.seekTo(t);
 
         } else if (playerStatus == PlayerStatus.INITIALIZED) {
             media.setPosition(t);
-            startWhenPrepared.set(true);
+            startWhenPrepared.set(false);
             prepare();
         }
         playerLock.unlock();
@@ -534,20 +534,20 @@ public class PlaybackServiceMediaPlayer {
      * Returns the position of the current media object or INVALID_TIME if the position could not be retrieved.
      */
     public int getPosition() {
-        if (!playerLock.tryLock()) {
-            return INVALID_TIME;
-        }
+        playerLock.lock();
 
         int retVal = INVALID_TIME;
         if (playerStatus == PlayerStatus.PLAYING
                 || playerStatus == PlayerStatus.PAUSED
-                || playerStatus == PlayerStatus.PREPARED) {
+                || playerStatus == PlayerStatus.PREPARED
+                || playerStatus == PlayerStatus.SEEKING) {
             retVal = mediaPlayer.getCurrentPosition();
         } else if (media != null && media.getPosition() > 0) {
             retVal = media.getPosition();
         }
 
         playerLock.unlock();
+        Log.d(TAG, "getPosition() -> " + retVal);
         return retVal;
     }
 
@@ -735,6 +735,7 @@ public class PlaybackServiceMediaPlayer {
 
         int state;
         if (playerStatus != null) {
+            Log.d(TAG, "playerStatus: " + playerStatus.toString());
             switch (playerStatus) {
                 case PLAYING:
                     state = PlaybackStateCompat.STATE_PLAYING;
@@ -1095,13 +1096,13 @@ public class PlaybackServiceMediaPlayer {
         @Override
         public void onFastForward() {
             super.onFastForward();
-            seekDelta(UserPreferences.getSeekDeltaMs());
+            seekDelta(UserPreferences.getFastFowardSecs() * 1000);
         }
 
         @Override
         public void onRewind() {
             super.onRewind();
-            seekDelta(-UserPreferences.getSeekDeltaMs());
+            seekDelta(-UserPreferences.getRewindSecs() * 1000);
         }
 
         @Override
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java
index cde03adea..fc73c9446 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java
@@ -19,8 +19,10 @@ import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.QueueEvent;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.playback.Playable;
+
 import de.greenrobot.event.EventBus;
 
+
 /**
  * Manages the background tasks of PlaybackSerivce, i.e.
  * the sleep timer, the position saver, the widget updater and
@@ -147,9 +149,9 @@ public class PlaybackServiceTaskManager {
             positionSaverFuture = schedExecutor.scheduleWithFixedDelay(positionSaver, POSITION_SAVER_WAITING_INTERVAL,
                     POSITION_SAVER_WAITING_INTERVAL, TimeUnit.MILLISECONDS);
 
-            if (BuildConfig.DEBUG) Log.d(TAG, "Started PositionSaver");
+            Log.d(TAG, "Started PositionSaver");
         } else {
-            if (BuildConfig.DEBUG) Log.d(TAG, "Call to startPositionSaver was ignored.");
+            Log.d(TAG, "Call to startPositionSaver was ignored.");
         }
     }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index 17c752bb6..a0d12d3e7 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -32,13 +32,11 @@ import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.feed.Chapter;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.service.playback.PlaybackServiceMediaPlayer;
 import de.danoeh.antennapod.core.service.playback.PlayerStatus;
@@ -174,8 +172,7 @@ public abstract class PlaybackController {
      * as the arguments of the launch intent.
      */
     private void bindToService() {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Trying to connect to service");
+        Log.d(TAG, "Trying to connect to service");
         AsyncTask<Void, Void, Intent> intentLoader = new AsyncTask<Void, Void, Intent>() {
             @Override
             protected Intent doInBackground(Void... voids) {
@@ -211,8 +208,7 @@ public abstract class PlaybackController {
      * played media or null if no last played media could be found.
      */
     private Intent getPlayLastPlayedMediaIntent() {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Trying to restore last played media");
+        Log.d(TAG, "Trying to restore last played media");
         SharedPreferences prefs = PreferenceManager
                 .getDefaultSharedPreferences(activity.getApplicationContext());
         long currentlyPlayingMedia = PlaybackPreferences
@@ -240,8 +236,7 @@ public abstract class PlaybackController {
                 return serviceIntent;
             }
         }
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "No last played media found");
+        Log.d(TAG, "No last played media found");
         return null;
     }
 
@@ -253,8 +248,7 @@ public abstract class PlaybackController {
                 || (positionObserverFuture != null && positionObserverFuture
                 .isDone()) || positionObserverFuture == null) {
 
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Setting up position observer");
+            Log.d(TAG, "Setting up position observer");
             positionObserver = new MediaPositionObserver();
             positionObserverFuture = schedExecutor.scheduleWithFixedDelay(
                     positionObserver, MediaPositionObserver.WAITING_INTERVALL,
@@ -266,8 +260,7 @@ public abstract class PlaybackController {
     private void cancelPositionObserver() {
         if (positionObserverFuture != null) {
             boolean result = positionObserverFuture.cancel(true);
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "PositionObserver cancelled. Result: " + result);
+            Log.d(TAG, "PositionObserver cancelled. Result: " + result);
         }
     }
 
@@ -295,8 +288,7 @@ public abstract class PlaybackController {
     protected BroadcastReceiver statusUpdate = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Received statusUpdate Intent.");
+            Log.d(TAG, "Received statusUpdate Intent.");
             if (isConnectedToPlaybackService()) {
                 PlaybackServiceMediaPlayer.PSMPInfo info = playbackService.getPSMPInfo();
                 status = info.playerStatus;
@@ -353,8 +345,7 @@ public abstract class PlaybackController {
                     }
 
                 } else {
-                    if (BuildConfig.DEBUG)
-                        Log.d(TAG, "Bad arguments. Won't handle intent");
+                    Log.d(TAG, "Bad arguments. Won't handle intent");
                 }
             } else {
                 bindToService();
@@ -425,6 +416,7 @@ public abstract class PlaybackController {
             pauseResource = R.drawable.ic_av_pause_circle_outline_80dp;
         }
 
+        Log.d(TAG, "status: " + status.toString());
         switch (status) {
 
             case ERROR:
@@ -470,6 +462,7 @@ public abstract class PlaybackController {
                 updatePlayButtonAppearance(playResource, playText);
                 break;
             case SEEKING:
+                onPositionObserverUpdate();
                 postStatusMsg(R.string.player_seeking_msg);
                 break;
             case INITIALIZED:
@@ -505,8 +498,7 @@ public abstract class PlaybackController {
      * information has to be refreshed
      */
     void queryService() {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Querying service info");
+        Log.d(TAG, "Querying service info");
         if (playbackService != null) {
             status = playbackService.getStatus();
             media = playbackService.getPlayable();
@@ -614,28 +606,6 @@ public abstract class PlaybackController {
         };
     }
 
-    public OnClickListener newOnRevButtonClickListener() {
-        return new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (status == PlayerStatus.PLAYING) {
-                    playbackService.seekDelta(-UserPreferences.getSeekDeltaMs());
-                }
-            }
-        };
-    }
-
-    public OnClickListener newOnFFButtonClickListener() {
-        return new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (status == PlayerStatus.PLAYING) {
-                    playbackService.seekDelta(UserPreferences.getSeekDeltaMs());
-                }
-            }
-        };
-    }
-
     public boolean serviceAvailable() {
         return playbackService != null;
     }