Move (most) events to their own module

30 files changed, 33 insertions, 492 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/DiscoveryDefaultUpdateEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/DiscoveryDefaultUpdateEvent.java
deleted file mode 100644
index f7757935a..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/DiscoveryDefaultUpdateEvent.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package de.danoeh.antennapod.core.event;
-
-public class DiscoveryDefaultUpdateEvent {
-    public DiscoveryDefaultUpdateEvent() {
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/FavoritesEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/FavoritesEvent.java
deleted file mode 100644
index cbfcc37e6..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/FavoritesEvent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package de.danoeh.antennapod.core.event;
-
-import androidx.annotation.NonNull;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import de.danoeh.antennapod.model.feed.FeedItem;
-
-public class FavoritesEvent {
-
-    public enum Action {
-        ADDED, REMOVED
-    }
-
-    private final Action action;
-    private final FeedItem item;
-
-    private FavoritesEvent(Action action, FeedItem item) {
-        this.action = action;
-        this.item = item;
-    }
-
-    public static FavoritesEvent added(FeedItem item) {
-        return new FavoritesEvent(Action.ADDED, item);
-    }
-
-    public static FavoritesEvent removed(FeedItem item) {
-        return new FavoritesEvent(Action.REMOVED, item);
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
-                .append("action", action)
-                .append("item", item)
-                .toString();
-    }
-
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/FeedItemEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/FeedItemEvent.java
deleted file mode 100644
index 99cb01714..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/FeedItemEvent.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package de.danoeh.antennapod.core.event;
-
-
-import androidx.annotation.NonNull;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.Arrays;
-import java.util.List;
-
-import de.danoeh.antennapod.model.feed.FeedItem;
-
-public class FeedItemEvent {
-
-    public enum Action {
-        UPDATE, DELETE_MEDIA
-    }
-
-    @NonNull
-    private final Action action;
-    @NonNull public final List<FeedItem> items;
-
-    private FeedItemEvent(@NonNull Action action, @NonNull List<FeedItem> items) {
-        this.action = action;
-        this.items = items;
-    }
-
-    public static FeedItemEvent deletedMedia(List<FeedItem> items) {
-        return new FeedItemEvent(Action.DELETE_MEDIA, items);
-    }
-
-    public static FeedItemEvent deletedMedia(FeedItem... items) {
-        return deletedMedia(Arrays.asList(items));
-    }
-
-    public static FeedItemEvent updated(List<FeedItem> items) {
-        return new FeedItemEvent(Action.UPDATE, items);
-    }
-
-    public static FeedItemEvent updated(FeedItem... items) {
-        return updated(Arrays.asList(items));
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
-            .append("action", action)
-            .append("items", items)
-            .toString();
-    }
-
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/FeedListUpdateEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/FeedListUpdateEvent.java
deleted file mode 100644
index 4ed8e33ec..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/FeedListUpdateEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package de.danoeh.antennapod.core.event;
-
-import de.danoeh.antennapod.model.feed.Feed;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FeedListUpdateEvent {
-    private final List<Long> feeds = new ArrayList<>();
-
-    public FeedListUpdateEvent(List<Feed> feeds) {
-        for (Feed feed : feeds) {
-            this.feeds.add(feed.getId());
-        }
-    }
-
-    public FeedListUpdateEvent(Feed feed) {
-        feeds.add(feed.getId());
-    }
-
-    public FeedListUpdateEvent(long feedId) {
-        feeds.add(feedId);
-    }
-
-    public boolean contains(Feed feed) {
-        return feeds.contains(feed.getId());
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/MessageEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/MessageEvent.java
deleted file mode 100644
index 9fb22b8ea..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/MessageEvent.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.danoeh.antennapod.core.event;
-
-import androidx.annotation.Nullable;
-
-public class MessageEvent {
-
-    public final String message;
-
-    @Nullable
-    public final Runnable action;
-
-    public MessageEvent(String message) {
-        this(message, null);
-    }
-
-    public MessageEvent(String message, Runnable action) {
-        this.message = message;
-        this.action = action;
-    }
-
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/PlayerErrorEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/PlayerErrorEvent.java
deleted file mode 100644
index 2fb27e958..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/PlayerErrorEvent.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package de.danoeh.antennapod.core.event;
-
-public class PlayerErrorEvent {
-    private final String message;
-
-    public PlayerErrorEvent(String message) {
-        this.message = message;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/PlayerStatusEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/PlayerStatusEvent.java
deleted file mode 100644
index fe7f17968..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/PlayerStatusEvent.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package de.danoeh.antennapod.core.event;
-
-public class PlayerStatusEvent {
-    public PlayerStatusEvent() {
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/QueueEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/QueueEvent.java
deleted file mode 100644
index c866939bd..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/QueueEvent.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package de.danoeh.antennapod.core.event;
-
-import androidx.annotation.Nullable;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.List;
-
-import de.danoeh.antennapod.model.feed.FeedItem;
-
-public class QueueEvent {
-
-    public enum Action {
-        ADDED, ADDED_ITEMS, SET_QUEUE, REMOVED, IRREVERSIBLE_REMOVED, CLEARED, DELETED_MEDIA, SORTED, MOVED
-    }
-
-    public final Action action;
-    public final FeedItem item;
-    public final int position;
-    public final List<FeedItem> items;
-
-
-    private QueueEvent(Action action,
-                       @Nullable FeedItem item,
-                       @Nullable List<FeedItem> items,
-                       int position) {
-        this.action = action;
-        this.item = item;
-        this.items = items;
-        this.position = position;
-    }
-
-    public static QueueEvent added(FeedItem item, int position) {
-        return new QueueEvent(Action.ADDED, item, null, position);
-    }
-
-    public static QueueEvent setQueue(List<FeedItem> queue) {
-        return new QueueEvent(Action.SET_QUEUE, null, queue, -1);
-    }
-
-    public static QueueEvent removed(FeedItem item) {
-        return new QueueEvent(Action.REMOVED, item, null, -1);
-    }
-
-    public static QueueEvent irreversibleRemoved(FeedItem item) {
-        return new QueueEvent(Action.IRREVERSIBLE_REMOVED, item, null, -1);
-    }
-
-    public static QueueEvent cleared() {
-        return new QueueEvent(Action.CLEARED, null, null, -1);
-    }
-
-    public static QueueEvent sorted(List<FeedItem> sortedQueue) {
-        return new QueueEvent(Action.SORTED, null, sortedQueue, -1);
-    }
-
-    public static QueueEvent moved(FeedItem item, int newPosition) {
-        return new QueueEvent(Action.MOVED, item, null, newPosition);
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
-                .append("action", action)
-                .append("item", item)
-                .append("items", items)
-                .append("position", position)
-                .toString();
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/SyncServiceEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/SyncServiceEvent.java
deleted file mode 100644
index 7aa5f6bf1..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/SyncServiceEvent.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package de.danoeh.antennapod.core.event;
-
-public class SyncServiceEvent {
-    private final int messageResId;
-
-    public SyncServiceEvent(int messageResId) {
-        this.messageResId = messageResId;
-    }
-
-    public int getMessageResId() {
-        return messageResId;
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/UnreadItemsUpdateEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/UnreadItemsUpdateEvent.java
deleted file mode 100644
index c3efbfe8b..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/UnreadItemsUpdateEvent.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package de.danoeh.antennapod.core.event;
-
-public class UnreadItemsUpdateEvent {
-    public UnreadItemsUpdateEvent() {
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/BufferUpdateEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/playback/BufferUpdateEvent.java
deleted file mode 100644
index 87369c360..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/BufferUpdateEvent.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package de.danoeh.antennapod.core.event.playback;
-
-public class BufferUpdateEvent {
-    private static final float PROGRESS_STARTED = -1;
-    private static final float PROGRESS_ENDED = -2;
-    final float progress;
-
-    private BufferUpdateEvent(float progress) {
-        this.progress = progress;
-    }
-
-    public static BufferUpdateEvent started() {
-        return new BufferUpdateEvent(PROGRESS_STARTED);
-    }
-
-    public static BufferUpdateEvent ended() {
-        return new BufferUpdateEvent(PROGRESS_ENDED);
-    }
-
-    public static BufferUpdateEvent progressUpdate(float progress) {
-        return new BufferUpdateEvent(progress);
-    }
-
-    public float getProgress() {
-        return progress;
-    }
-
-    public boolean hasStarted() {
-        return progress == PROGRESS_STARTED;
-    }
-
-    public boolean hasEnded() {
-        return progress == PROGRESS_ENDED;
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackHistoryEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackHistoryEvent.java
deleted file mode 100644
index 6e5b66b90..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackHistoryEvent.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package de.danoeh.antennapod.core.event.playback;
-
-public class PlaybackHistoryEvent {
-
-    private PlaybackHistoryEvent() {
-    }
-
-    public static PlaybackHistoryEvent listUpdated() {
-        return new PlaybackHistoryEvent();
-    }
-
-    @Override
-    public String toString() {
-        return "PlaybackHistoryEvent";
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackPositionEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackPositionEvent.java
deleted file mode 100644
index 6f3d505d6..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackPositionEvent.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.danoeh.antennapod.core.event.playback;
-
-public class PlaybackPositionEvent {
-    private final int position;
-    private final int duration;
-
-    public PlaybackPositionEvent(int position, int duration) {
-        this.position = position;
-        this.duration = duration;
-    }
-
-    public int getPosition() {
-        return position;
-    }
-
-    public int getDuration() {
-        return duration;
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackServiceEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackServiceEvent.java
deleted file mode 100644
index af524ad6c..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackServiceEvent.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package de.danoeh.antennapod.core.event.playback;
-
-public class PlaybackServiceEvent {
-    public enum Action {
-        SERVICE_STARTED,
-        SERVICE_SHUT_DOWN
-    }
-
-    public final Action action;
-
-    public PlaybackServiceEvent(Action action) {
-        this.action = action;
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/SleepTimerUpdatedEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/playback/SleepTimerUpdatedEvent.java
deleted file mode 100644
index 37a073799..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/SleepTimerUpdatedEvent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package de.danoeh.antennapod.core.event.playback;
-
-public class SleepTimerUpdatedEvent {
-    private static final long CANCELLED = Long.MAX_VALUE;
-    private final long timeLeft;
-
-    private SleepTimerUpdatedEvent(long timeLeft) {
-        this.timeLeft = timeLeft;
-    }
-
-    public static SleepTimerUpdatedEvent justEnabled(long timeLeft) {
-        return new SleepTimerUpdatedEvent(-timeLeft);
-    }
-
-    public static SleepTimerUpdatedEvent updated(long timeLeft) {
-        return new SleepTimerUpdatedEvent(Math.max(0, timeLeft));
-    }
-
-    public static SleepTimerUpdatedEvent cancelled() {
-        return new SleepTimerUpdatedEvent(CANCELLED);
-    }
-
-    public long getTimeLeft() {
-        return Math.abs(timeLeft);
-    }
-
-    public boolean isOver() {
-        return timeLeft == 0;
-    }
-
-    public boolean wasJustEnabled() {
-        return timeLeft < 0;
-    }
-
-    public boolean isCancelled() {
-        return timeLeft == CANCELLED;
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/SpeedChangedEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/playback/SpeedChangedEvent.java
deleted file mode 100644
index 2fd20c7fb..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/SpeedChangedEvent.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package de.danoeh.antennapod.core.event.playback;
-
-public class SpeedChangedEvent {
-    private final float newSpeed;
-
-    public SpeedChangedEvent(float newSpeed) {
-        this.newSpeed = newSpeed;
-    }
-
-    public float getNewSpeed() {
-        return newSpeed;
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/settings/SkipIntroEndingChangedEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/settings/SkipIntroEndingChangedEvent.java
deleted file mode 100644
index 583f7b13f..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/settings/SkipIntroEndingChangedEvent.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.danoeh.antennapod.core.event.settings;
-
-public class SkipIntroEndingChangedEvent {
-    private final int skipIntro;
-    private final int skipEnding;
-    private final long feedId;
-
-    public SkipIntroEndingChangedEvent(int skipIntro, int skipEnding, long feedId) {
-        this.skipIntro= skipIntro;
-        this.skipEnding = skipEnding;
-        this.feedId = feedId;
-    }
-
-    public int getSkipIntro() {
-        return skipIntro;
-    }
-
-    public int getSkipEnding() {
-        return skipEnding;
-    }
-
-    public long getFeedId() {
-        return feedId;
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/settings/SpeedPresetChangedEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/settings/SpeedPresetChangedEvent.java
deleted file mode 100644
index 0ac7e1316..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/settings/SpeedPresetChangedEvent.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.danoeh.antennapod.core.event.settings;
-
-public class SpeedPresetChangedEvent {
-    private final float speed;
-    private final long feedId;
-
-    public SpeedPresetChangedEvent(float speed, long feedId) {
-        this.speed = speed;
-        this.feedId = feedId;
-    }
-
-    public float getSpeed() {
-        return speed;
-    }
-
-    public long getFeedId() {
-        return feedId;
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/settings/VolumeAdaptionChangedEvent.java b/core/src/main/java/de/danoeh/antennapod/core/event/settings/VolumeAdaptionChangedEvent.java
deleted file mode 100644
index 3905ce68f..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/event/settings/VolumeAdaptionChangedEvent.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.danoeh.antennapod.core.event.settings;
-
-import de.danoeh.antennapod.model.feed.VolumeAdaptionSetting;
-
-public class VolumeAdaptionChangedEvent {
-    private final VolumeAdaptionSetting volumeAdaptionSetting;
-    private final long feedId;
-
-    public VolumeAdaptionChangedEvent(VolumeAdaptionSetting volumeAdaptionSetting, long feedId) {
-        this.volumeAdaptionSetting = volumeAdaptionSetting;
-        this.feedId = feedId;
-    }
-
-    public VolumeAdaptionSetting getVolumeAdaptionSetting() {
-        return volumeAdaptionSetting;
-    }
-
-    public long getFeedId() {
-        return feedId;
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java
index 9c73ed9ae..8d80ef32b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java
@@ -5,7 +5,7 @@ import android.content.SharedPreferences;
 import androidx.preference.PreferenceManager;
 
 import android.util.Log;
-import de.danoeh.antennapod.core.event.PlayerStatusEvent;
+import de.danoeh.antennapod.event.PlayerStatusEvent;
 import de.danoeh.antennapod.model.feed.FeedMedia;
 import de.danoeh.antennapod.model.playback.MediaType;
 import de.danoeh.antennapod.core.service.playback.PlayerStatus;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index 2a1aef6cc..f26421cdf 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import de.danoeh.antennapod.core.event.DownloadEvent;
-import de.danoeh.antennapod.core.event.FeedItemEvent;
+import de.danoeh.antennapod.event.FeedItemEvent;
 import de.danoeh.antennapod.model.feed.Feed;
 import de.danoeh.antennapod.model.feed.FeedItem;
 import de.danoeh.antennapod.model.feed.FeedMedia;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/MediaDownloadedHandler.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/MediaDownloadedHandler.java
index 6bbd704e2..84d66918a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/MediaDownloadedHandler.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/MediaDownloadedHandler.java
@@ -11,7 +11,7 @@ import org.greenrobot.eventbus.EventBus;
 import java.io.File;
 import java.util.concurrent.ExecutionException;
 
-import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent;
+import de.danoeh.antennapod.event.UnreadItemsUpdateEvent;
 import de.danoeh.antennapod.core.service.download.DownloadRequest;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
index 1556e5a51..7f2db7bef 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
@@ -14,9 +14,9 @@ import android.view.SurfaceHolder;
 import androidx.media.AudioAttributesCompat;
 import androidx.media.AudioFocusRequestCompat;
 import androidx.media.AudioManagerCompat;
-import de.danoeh.antennapod.core.event.PlayerErrorEvent;
-import de.danoeh.antennapod.core.event.playback.BufferUpdateEvent;
-import de.danoeh.antennapod.core.event.playback.SpeedChangedEvent;
+import de.danoeh.antennapod.event.PlayerErrorEvent;
+import de.danoeh.antennapod.event.playback.BufferUpdateEvent;
+import de.danoeh.antennapod.event.playback.SpeedChangedEvent;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.playback.MediaPlayerError;
 import org.antennapod.audio.MediaPlayer;
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 c969923d4..415b9f1ed 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
@@ -43,10 +43,10 @@ import androidx.core.app.NotificationManagerCompat;
 import androidx.media.MediaBrowserServiceCompat;
 import androidx.preference.PreferenceManager;
 
-import de.danoeh.antennapod.core.event.playback.BufferUpdateEvent;
-import de.danoeh.antennapod.core.event.playback.PlaybackServiceEvent;
-import de.danoeh.antennapod.core.event.PlayerErrorEvent;
-import de.danoeh.antennapod.core.event.playback.SleepTimerUpdatedEvent;
+import de.danoeh.antennapod.event.playback.BufferUpdateEvent;
+import de.danoeh.antennapod.event.playback.PlaybackServiceEvent;
+import de.danoeh.antennapod.event.PlayerErrorEvent;
+import de.danoeh.antennapod.event.playback.SleepTimerUpdatedEvent;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -57,11 +57,11 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.core.R;
-import de.danoeh.antennapod.core.event.MessageEvent;
-import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent;
-import de.danoeh.antennapod.core.event.settings.SkipIntroEndingChangedEvent;
-import de.danoeh.antennapod.core.event.settings.SpeedPresetChangedEvent;
-import de.danoeh.antennapod.core.event.settings.VolumeAdaptionChangedEvent;
+import de.danoeh.antennapod.event.MessageEvent;
+import de.danoeh.antennapod.event.playback.PlaybackPositionEvent;
+import de.danoeh.antennapod.event.settings.SkipIntroEndingChangedEvent;
+import de.danoeh.antennapod.event.settings.SpeedPresetChangedEvent;
+import de.danoeh.antennapod.event.settings.VolumeAdaptionChangedEvent;
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.SleepTimerPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
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 a99a178da..7ddb65c8e 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
@@ -7,7 +7,7 @@ import android.os.Vibrator;
 import androidx.annotation.NonNull;
 import android.util.Log;
 
-import de.danoeh.antennapod.core.event.playback.SleepTimerUpdatedEvent;
+import de.danoeh.antennapod.event.playback.SleepTimerUpdatedEvent;
 import de.danoeh.antennapod.core.preferences.SleepTimerPreferences;
 import de.danoeh.antennapod.core.util.ChapterUtils;
 import de.danoeh.antennapod.core.widget.WidgetUpdater;
@@ -23,8 +23,8 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import de.danoeh.antennapod.core.event.FeedItemEvent;
-import de.danoeh.antennapod.core.event.QueueEvent;
+import de.danoeh.antennapod.event.FeedItemEvent;
+import de.danoeh.antennapod.event.QueueEvent;
 import de.danoeh.antennapod.model.feed.FeedItem;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.model.playback.Playable;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
index d7267f16a..04722b916 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
@@ -28,9 +28,9 @@ import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import de.danoeh.antennapod.core.R;
-import de.danoeh.antennapod.core.event.FeedItemEvent;
-import de.danoeh.antennapod.core.event.FeedListUpdateEvent;
-import de.danoeh.antennapod.core.event.MessageEvent;
+import de.danoeh.antennapod.event.FeedItemEvent;
+import de.danoeh.antennapod.event.FeedListUpdateEvent;
+import de.danoeh.antennapod.event.MessageEvent;
 import de.danoeh.antennapod.core.feed.LocalFeedUpdater;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
index f659fb34d..51dafc575 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
@@ -23,13 +23,13 @@ import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.event.DownloadLogEvent;
-import de.danoeh.antennapod.core.event.FavoritesEvent;
-import de.danoeh.antennapod.core.event.FeedItemEvent;
-import de.danoeh.antennapod.core.event.FeedListUpdateEvent;
-import de.danoeh.antennapod.core.event.MessageEvent;
-import de.danoeh.antennapod.core.event.playback.PlaybackHistoryEvent;
-import de.danoeh.antennapod.core.event.QueueEvent;
-import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent;
+import de.danoeh.antennapod.event.FavoritesEvent;
+import de.danoeh.antennapod.event.FeedItemEvent;
+import de.danoeh.antennapod.event.FeedListUpdateEvent;
+import de.danoeh.antennapod.event.MessageEvent;
+import de.danoeh.antennapod.event.playback.PlaybackHistoryEvent;
+import de.danoeh.antennapod.event.QueueEvent;
+import de.danoeh.antennapod.event.UnreadItemsUpdateEvent;
 import de.danoeh.antennapod.core.feed.FeedEvent;
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java b/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java
index e6496bb7d..b2a474598 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java
@@ -29,7 +29,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.core.R;
-import de.danoeh.antennapod.core.event.SyncServiceEvent;
+import de.danoeh.antennapod.event.SyncServiceEvent;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 import de.danoeh.antennapod.core.storage.DBReader;
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 11a3ad9b3..b436d80b2 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
@@ -12,11 +12,11 @@ import android.util.Log;
 import android.util.Pair;
 import android.view.SurfaceHolder;
 import androidx.annotation.NonNull;
-import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent;
-import de.danoeh.antennapod.core.event.playback.PlaybackServiceEvent;
-import de.danoeh.antennapod.core.event.playback.SpeedChangedEvent;
 import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.event.playback.PlaybackPositionEvent;
 import de.danoeh.antennapod.model.feed.FeedMedia;
+import de.danoeh.antennapod.event.playback.PlaybackServiceEvent;
+import de.danoeh.antennapod.event.playback.SpeedChangedEvent;
 import de.danoeh.antennapod.model.playback.MediaType;
 import de.danoeh.antennapod.core.feed.util.PlaybackSpeedUtils;
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
diff --git a/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java b/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java
index 38e84017f..41fd01441 100644
--- a/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java
+++ b/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeoutException;
 import de.danoeh.antennapod.core.cast.CastConsumer;
 import de.danoeh.antennapod.core.cast.CastManager;
 import de.danoeh.antennapod.core.cast.DefaultCastConsumer;
-import de.danoeh.antennapod.core.event.MessageEvent;
+import de.danoeh.antennapod.event.MessageEvent;
 import de.danoeh.antennapod.model.playback.MediaType;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.util.NetworkUtils;