Merge pull request #706 from mfietz/feature/gpodder_episode_actions

Sync episode actions with gpodder, smart mark as played.

1 files changed, 7 insertions, 14 deletions

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 099e96be9..8edd4185c 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -12,13 +12,11 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.Window;
 import android.widget.ImageButton;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 
-import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
@@ -167,8 +165,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
         chooseTheme();
         super.onCreate(savedInstanceState);
 
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Creating Activity");
+        Log.d(TAG, "onCreate()");
         StorageUtils.checkStorageAvailability(this);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
@@ -224,8 +221,8 @@ public abstract class MediaplayerActivity extends ActionBarActivity
     @Override
     protected void onStop() {
         super.onStop();
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Activity stopped");
+        Log.d(TAG, "onStop()");
+
         if (controller != null) {
             controller.release();
         }
@@ -234,8 +231,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Activity destroyed");
+        Log.d(TAG, "onDestroy()");
     }
 
     @Override
@@ -358,8 +354,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
     @Override
     protected void onResume() {
         super.onResume();
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Resuming Activity");
+        Log.d(TAG, "onResume()");
         StorageUtils.checkStorageAvailability(this);
         controller.init();
     }
@@ -393,8 +388,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
     }
 
     private void updateProgressbarPosition(int position, int duration) {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Updating progressbar info");
+        Log.d(TAG, "updateProgressbarPosition(" + position + ", " + duration +")");
         float progress = ((float) position) / duration;
         sbPosition.setProgress((int) (progress * sbPosition.getMax()));
     }
@@ -406,8 +400,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
      * FeedMedia object.
      */
     protected boolean loadMediaInfo() {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Loading media info");
+        Log.d(TAG, "loadMediaInfo()");
         Playable media = controller.getMedia();
         if (media != null) {
             txtvPosition.setText(Converter.getDurationStringLong((media