Refactorings

3 files changed, 45 insertions, 31 deletions

diff --git a/core/src/main/java/com/aocate/media/AndroidMediaPlayer.java b/core/src/main/java/com/aocate/media/AndroidMediaPlayer.java
index 17ee74a13..7c2ea3d61 100644
--- a/core/src/main/java/com/aocate/media/AndroidMediaPlayer.java
+++ b/core/src/main/java/com/aocate/media/AndroidMediaPlayer.java
@@ -14,13 +14,13 @@
 
 package com.aocate.media;
 
-import java.io.IOException;
-
 import android.content.Context;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.util.Log;
 
+import java.io.IOException;
+
 public class AndroidMediaPlayer extends MediaPlayerImpl {
 	private final static String AMP_TAG = "AocateAndroidMediaPlayer";
 
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..69507eaef 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,18 @@ public class UserPreferences implements
         }
     }
 
+    public static void setPrefFastForwardSecs(int secs) {
+        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(instance.context).edit();
+        editor.putInt(PREF_FAST_FORWARD_SECS, secs);
+        editor.commit();
+    }
+
+    public static void setPrefRewindSecs(int 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 +545,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 +576,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 +588,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 +625,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 +640,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 +649,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/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.");
         }
     }