5 files changed, 12 insertions, 2 deletions
diff --git a/playback/base/build.gradle b/playback/base/build.gradle
index df49b2fb6..9c1e9ae4c 100644
--- a/playback/base/build.gradle
+++ b/playback/base/build.gradle
@@ -3,6 +3,10 @@ plugins {
 }
 apply from: "../../common.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.playback.base"
+}
+
 dependencies {
     implementation project(':model')
 
diff --git a/playback/base/src/main/AndroidManifest.xml b/playback/base/src/main/AndroidManifest.xml
deleted file mode 100644
index c6a44a212..000000000
--- a/playback/base/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.playback.base" />
diff --git a/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java b/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java
index ef15cef1d..73b38c00c 100644
--- a/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java
+++ b/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java
@@ -215,6 +215,10 @@ public abstract class PlaybackServiceMediaPlayer {
     public abstract int getSelectedAudioTrack();
 
     public void skip() {
+        if (getPosition() < 1000) {
+            Log.d(TAG, "Ignoring skip, is in first second of playback");
+            return;
+        }
         endPlayback(false, true, true, true);
     }
 
diff --git a/playback/cast/build.gradle b/playback/cast/build.gradle
index b2aefddf2..3025a369c 100644
--- a/playback/cast/build.gradle
+++ b/playback/cast/build.gradle
@@ -4,6 +4,10 @@ plugins {
 apply from: "../../common.gradle"
 apply from: "../../playFlavor.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.playback.cast"
+}
+
 dependencies {
     implementation project(':event')
     implementation project(':model')
diff --git a/playback/cast/src/main/AndroidManifest.xml b/playback/cast/src/main/AndroidManifest.xml
deleted file mode 100644
index 58c2b9396..000000000
--- a/playback/cast/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.playback.cast" />