From 231c8bb12f0da6d49b223d2611dcb898d40f9efa Mon Sep 17 00:00:00 2001
From: David Carver <d_a_carver@yahoo.com>
Date: Sun, 15 Dec 2024 18:28:12 -0500
Subject: [PATCH] chore: Remove old external player code and clean up unused
 imports

---
 serenity-app/build.gradle.kts                 |   2 -
 .../us/nineworlds/serenity/AboutDialog.java   |   1 +
 .../us/nineworlds/serenity/AndroidTV.java     |   1 +
 .../serenity/GalleryOnItemClickListener.java  |   1 +
 .../serenity/GalleryOnItemSelectedListener.kt |   7 +-
 .../serenity/MainMenuTextViewAdapter.java     |   5 +-
 .../us/nineworlds/serenity/MainPresenter.java |   6 +-
 .../serenity/core/RecommendationBuilder.java  |   3 +-
 ...SerenityRecommendationContentProvider.java |   1 +
 .../serenity/core/ServerConfig.java           |   2 +
 .../AbstractExternalPlayer.java               |  68 --------
 .../core/externalplayer/ExternalPlayer.java   |  70 --------
 .../externalplayer/ExternalPlayerFactory.java |  62 -------
 .../core/externalplayer/MXPlayer.java         | 107 ------------
 .../core/externalplayer/MXPlayerPro.java      |  46 ------
 .../externalplayer/SystemDefaultPlayer.java   |  75 ---------
 .../core/externalplayer/ViMuPlayer.java       | 104 ------------
 .../serenity/core/model/VideoContentInfo.java |   1 -
 .../model/impl/AbstractMediaContainer.java    |   2 +
 .../model/impl/AbstractSeriesContentInfo.java |   1 +
 .../model/impl/AbstractVideoContentInfo.java  |   2 +
 .../model/impl/CategoryMediaContainer.java    |   1 +
 .../model/impl/EpisodeMediaContainer.java     |   3 +
 .../core/model/impl/EpisodePosterInfo.java    |   1 +
 .../core/model/impl/MenuMediaContainer.java   |   4 +-
 .../core/model/impl/MovieMediaContainer.java  |   1 +
 .../model/impl/SeasonsMediaContainer.java     |   1 +
 .../impl/SecondaryCategoryMediaContainer.java |   1 +
 .../core/model/impl/SeriesMediaContainer.java |   1 +
 .../model/impl/SubtitleMediaContainer.java    |   1 +
 .../model/impl/TVCategoryMediaContainer.java  |   1 +
 .../AbstractPlexRESTIntentService.java        |   2 +
 .../services/MovieSearchIntentService.java    |   1 +
 .../MoviesRetrievalIntentService.java         |   2 +
 .../core/services/UnWatchVideoAsyncTask.java  |   3 +
 .../core/services/UpdateProgressRequest.java  |   2 +
 .../core/services/WatchedVideoAsyncTask.java  |   3 +
 .../serenity/core/util/AndroidHelper.java     |   4 -
 .../serenity/events/users/AllUsersEvent.java  |   2 +
 .../serenity/fragments/MainMenuFragment.kt    |  27 ++-
 ...ainMenuVideoContentVerticalGridFragment.kt |  12 +-
 .../AutoConfigureHandlerRunnable.java         |   3 +
 .../serenity/injection/BaseInjector.java      |   1 +
 .../serenity/injection/InjectingActivity.java |   2 +
 .../injection/InjectingBaseAdapter.java       |   1 +
 .../serenity/injection/InjectingFragment.java |   1 +
 .../injection/InjectingIntentService.java     |   1 +
 .../InjectingRecyclerViewAdapter.java         |   1 +
 .../injection/modules/AndroidModule.java      |   6 +-
 .../modules/ExoplayerVideoModule.java         |   2 -
 .../injection/modules/SerenityModule.java     |   1 +
 .../providers/DataSourceFactoryProvider.kt    |   3 -
 .../providers/EventLoggerProvider.java        |   2 +
 .../HttpDataSourceFactoryProvider.java        |   2 +
 .../ServerClientPreferenceProvider.java       |   2 +
 .../VideoPlayerIntentUtilsProvider.java       |   3 +
 .../providers/VideoQueueHelperProvider.java   |   3 +
 .../serenity/jobs/EpisodesRetrievalJob.java   |   6 +-
 .../serenity/jobs/GlideClearCacheJob.java     |   2 +
 .../serenity/jobs/MovieCategoryJob.java       |   6 +-
 .../serenity/jobs/MovieRetrievalJob.java      |   6 +-
 .../jobs/MovieSecondaryCategoryJob.java       |   6 +-
 .../serenity/jobs/RetrieveAllUsersJob.java    |   7 +-
 .../serenity/jobs/SeasonsRetrievalJob.java    |   6 +-
 .../nineworlds/serenity/jobs/SubtitleJob.java |   6 +-
 .../serenity/jobs/TVCategoryJob.java          |   6 +-
 .../serenity/jobs/TVCategorySecondaryJob.java |   6 +-
 .../serenity/jobs/TVShowRetrievalJob.java     |   6 +-
 .../serenity/jobs/video/StartPlaybackJob.java |   3 +
 .../serenity/jobs/video/StopPlaybackJob.java  |   3 +
 .../jobs/video/UpdatePlaybackPostionJob.java  |   3 +
 .../serenity/jobs/video/WatchedStatusJob.java |   3 +
 .../GridSpacingItemDecoration.java            |   3 +-
 .../recyclerutils/ItemOffsetDecoration.java   |   3 +-
 .../recyclerutils/SpaceItemDecoration.java    |   3 +-
 .../ui/activity/OverscanSetupActivity.java    |   1 +
 .../ui/activity/SerenityActivity.java         |   5 +-
 .../ui/activity/SerenityVideoActivity.java    |  13 +-
 .../AbstractPosterImageGalleryAdapter.java    |   4 +-
 .../ui/adapters/MenuDrawerAdapter.java        |   2 +
 .../ui/adapters/RecyclerViewDiffUtil.kt       |   1 -
 .../ui/dialogs/DirectoryChooserDialog.java    |   2 +
 .../ui/leanback/search/CardPresenter.kt       |   8 +-
 .../leanback/search/MovieSearchFragment.java  |  25 ++-
 .../ui/leanback/search/SearchActivity.java    |   2 +
 .../AbstractVideoOnItemClickListener.java     |   2 +
 .../AbstractVideoOnItemLongClickListener.java |   3 +
 .../AbstractVideoOnItemSelectedListener.java  |  11 +-
 .../preferences/LeanbackSettingsActivity.java |   2 +
 .../ui/preferences/SettingsFragment.java      |   8 +-
 .../ui/util/ExternalPlayerResultHandler.java  | 145 -----------------
 .../serenity/ui/util/ImageUtils.java          |   1 +
 .../serenity/ui/util/PlayerResultHandler.java |   4 +-
 .../ui/util/VideoPlayerIntentUtils.java       |  99 +----------
 .../serenity/ui/util/VideoQueueHelper.java    |   3 +
 .../serenity/ui/video/player/EventLogger.java |   8 +-
 .../serenity/ui/views/TextClock.java          |   1 +
 .../serenity/ui/views/mvp/MvpFrameLayout.java |   6 +-
 .../StatusOverlayFrameLayout.java             |  18 +-
 .../AbstractPosterImageViewHolder.java        |   8 +-
 .../serenity/widgets/RoundedImageView.java    |   1 +
 .../core/repository/CategoryRepository.kt     |   5 +-
 .../core/repository/LoginRepository.kt        |   2 +-
 .../core/repository/VideoRepository.kt        |   1 -
 .../fragments/mainmenu/MainMenuPresenter.kt   |   8 +-
 .../fragments/mainmenu/MainMenuView.kt        |   1 -
 .../activity/leanback/details/DetailsView.kt  |   1 -
 .../ui/activity/login/LoginUserViewHolder.kt  |   6 +-
 .../presenters/ActionPresenterSelector.java   |   2 +
 .../presenters/CategoryVideoPresenter.kt      |   2 -
 .../DetailsOverviewLogoPresenter.java         |   2 +
 .../FullWidthDetailsOverviewRowPresenter.java |   4 +-
 .../presenters/MoviePresenterViewHolder.kt    |   9 +-
 .../presenters/SeriesPresenterViewHolder.kt   |  23 +--
 .../presenters/VideoContentInfoPresenter.kt   |   1 -
 .../serenity/ui/util/ImageInfographicUtils.kt |   1 -
 .../ui/video/player/ExoplayerContract.kt      |   1 -
 .../ui/video/player/ExoplayerVideoActivity.kt |   5 +-
 .../player/VideoKeyCodeHandlerDelegate.kt     |   1 -
 .../main/res/color/item_selector_color.xml    |   3 +-
 .../res/layout-large/activity_login_user.xml  |  13 +-
 .../res/layout/movie_custom_actionbar.xml     |  13 +-
 .../us/nineworlds/serenity/AndroidTVTest.java |   9 +-
 .../GalleryOnItemClickListenerTest.java       |  12 +-
 .../nineworlds/serenity/MainActivityTest.java |  14 +-
 .../serenity/MainMenuTextViewAdapterTest.java |  15 +-
 .../StartupBroadcastReceiverTest.java         |  14 +-
 .../serenity/TestSerenityApplication.java     |  13 +-
 .../us/nineworlds/serenity/TestingModule.java |   3 +
 .../serenity/core/ServerConfigTest.java       |  13 +-
 .../ExternalPlayerFactoryTest.java            |  90 ----------
 .../core/externalplayer/MXPlayerProTest.java  | 154 ------------------
 .../core/externalplayer/MXPlayerTest.java     | 154 ------------------
 .../SystemDefaultPlayerTest.java              | 107 ------------
 .../core/externalplayer/VimuPlayerTest.java   | 140 ----------------
 .../BackgroundBitmapDisplayerTest.java        |  12 +-
 .../core/menus/DialogMenuItemTest.java        |   4 +-
 .../core/menus/MenuDrawerItemImplTest.java    |   4 +-
 .../serenity/core/menus/MenuItemTest.java     |   4 +-
 .../impl/CategoryMediaContainerTest.java      |  14 +-
 .../model/impl/EpisodeMediaContainerTest.java |  15 +-
 .../model/impl/MenuMediaContainerTest.java    |  15 +-
 .../model/impl/MovieMediaContainerTest.java   |  14 +-
 .../model/impl/SeasonsMediaContainerTest.java |  14 +-
 .../model/impl/SeriesMediaContainerTest.java  |  14 +-
 .../MovieSearchIntentServiceTest.java         |  10 +-
 .../serenity/core/util/TimeUtilsTest.java     |   4 +-
 .../serenity/test/InjectingTest.java          |   2 +-
 .../serenity/test/ShadowSubtitleView.java     |   1 +
 .../DoNothingShadowSQLiteConnection.java      |   1 +
 ...AbstractPosterImageGalleryAdapterTest.java |  14 +-
 .../ui/adapters/MenuDrawerAdapterTest.java    |   7 +-
 .../StatusOverlayFrameLayoutTest.java         |   5 +-
 .../serenity/jobs/EpisodesRetrievalJobTest.kt |   1 -
 .../serenity/jobs/MovieCategoryJobTest.kt     |   1 -
 .../serenity/jobs/MovieRetrievalJobTest.kt    |   1 -
 .../jobs/MovieSecondaryCategoryJobTest.kt     |   1 -
 .../serenity/jobs/RetrieveAllUsersJobTest.kt  |   1 -
 .../serenity/jobs/SeasonsRetrievalJobTest.kt  |   3 -
 .../serenity/jobs/TVCategoryJobTest.kt        |   1 -
 .../jobs/TVCategorySecondaryJobTest.kt        |   1 -
 .../serenity/jobs/TVShowsRetrievalJobTest.kt  |   1 -
 .../jobs/videos/AuthenticateUserJobTest.kt    |   1 -
 .../jobs/videos/StartPlaybackJobTest.kt       |   1 -
 .../jobs/videos/StopPlaybackJobTest.kt        |   1 -
 .../videos/UpdatePlaybackPositionJobTest.kt   |   1 -
 .../jobs/videos/WatchedStatusJobTest.kt       |   1 -
 .../serenity/test/util/FragmentTestUtil.java  |   4 +-
 .../activity/ServerSelectionActivityTest.kt   |   4 +-
 .../ui/activity/login/LoginRepositoryTest.kt  |   8 +-
 .../activity/login/LoginUserPresenterTest.kt  |   7 +-
 .../manualentry/ManualServerActivityTest.kt   |   2 -
 .../ManualServerSettingsFragmentTest.kt       |   1 -
 .../ui/leanback/search/CardPresenterTest.kt   |   4 +-
 .../util/ExternalPlayerResultHandlerTest.kt   |  97 -----------
 .../ui/util/VideoPlayerIntentUtilsTest.kt     |  96 +----------
 .../player/ExoplayerVideoActivityTest.kt      |   1 -
 177 files changed, 460 insertions(+), 1917 deletions(-)
 delete mode 100644 serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/AbstractExternalPlayer.java
 delete mode 100644 serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayer.java
 delete mode 100644 serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayerFactory.java
 delete mode 100644 serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/MXPlayer.java
 delete mode 100644 serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/MXPlayerPro.java
 delete mode 100644 serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/SystemDefaultPlayer.java
 delete mode 100644 serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ViMuPlayer.java
 delete mode 100644 serenity-app/src/main/java/us/nineworlds/serenity/ui/util/ExternalPlayerResultHandler.java
 delete mode 100644 serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayerFactoryTest.java
 delete mode 100644 serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/MXPlayerProTest.java
 delete mode 100644 serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/MXPlayerTest.java
 delete mode 100644 serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/SystemDefaultPlayerTest.java
 delete mode 100644 serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/VimuPlayerTest.java
 delete mode 100644 serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/util/ExternalPlayerResultHandlerTest.kt

diff --git a/serenity-app/build.gradle.kts b/serenity-app/build.gradle.kts
index e037df8c8..02db005ba 100644
--- a/serenity-app/build.gradle.kts
+++ b/serenity-app/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
   id("com.android.application")
   id("project-report")
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/AboutDialog.java b/serenity-app/src/main/java/us/nineworlds/serenity/AboutDialog.java
index d2326f976..f17c01260 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/AboutDialog.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/AboutDialog.java
@@ -8,6 +8,7 @@
 import android.text.Html;
 import android.text.method.ScrollingMovementMethod;
 import android.widget.TextView;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/AndroidTV.java b/serenity-app/src/main/java/us/nineworlds/serenity/AndroidTV.java
index 14b4339a0..c8fa52fec 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/AndroidTV.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/AndroidTV.java
@@ -24,6 +24,7 @@
 package us.nineworlds.serenity;
 
 import android.content.Intent;
+
 import us.nineworlds.serenity.ui.leanback.search.SearchActivity;
 
 public class AndroidTV extends MainActivity {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemClickListener.java b/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemClickListener.java
index 4c3855414..989da917f 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemClickListener.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemClickListener.java
@@ -27,6 +27,7 @@
 import android.content.Intent;
 import android.view.View;
 import android.widget.Toast;
+
 import us.nineworlds.serenity.core.menus.MenuItem;
 import us.nineworlds.serenity.ui.preferences.LeanbackSettingsActivity;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemSelectedListener.kt b/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemSelectedListener.kt
index 30188d134..948dc9c88 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemSelectedListener.kt
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/GalleryOnItemSelectedListener.kt
@@ -24,10 +24,8 @@
  */
 package us.nineworlds.serenity
 
-import us.nineworlds.serenity.injection.BaseInjector
-import javax.inject.Inject
-import android.content.SharedPreferences
 import android.app.Activity
+import android.content.SharedPreferences
 import android.view.View
 import android.view.animation.AnimationUtils
 import android.widget.ImageView
@@ -35,7 +33,8 @@ import androidx.core.content.ContextCompat
 import com.bumptech.glide.Glide
 import us.nineworlds.serenity.core.menus.MenuItem
 import us.nineworlds.serenity.fragments.mainmenu.MainMenuPresenter
-import javax.inject.Provider
+import us.nineworlds.serenity.injection.BaseInjector
+import javax.inject.Inject
 
 class GalleryOnItemSelectedListener(private val adapter: MainMenuTextViewAdapter, private val presenter: MainMenuPresenter) : BaseInjector(), IGalleryOnItemSelectedListener {
     @Inject
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/MainMenuTextViewAdapter.java b/serenity-app/src/main/java/us/nineworlds/serenity/MainMenuTextViewAdapter.java
index fff99a88d..62bbb5b59 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/MainMenuTextViewAdapter.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/MainMenuTextViewAdapter.java
@@ -22,15 +22,18 @@
  */
 package us.nineworlds.serenity;
 
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils.TruncateAt;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import us.nineworlds.serenity.core.menus.MenuItem;
 import us.nineworlds.serenity.fragments.mainmenu.MainMenuPresenter;
 import us.nineworlds.serenity.injection.InjectingRecyclerViewAdapter;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/MainPresenter.java b/serenity-app/src/main/java/us/nineworlds/serenity/MainPresenter.java
index 66d58c6f2..b8f45195b 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/MainPresenter.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/MainPresenter.java
@@ -1,14 +1,14 @@
 package us.nineworlds.serenity;
 
 import android.content.Context;
+
+import javax.inject.Inject;
+
 import moxy.InjectViewState;
 import moxy.MvpPresenter;
-import com.birbit.android.jobqueue.JobManager;
-import javax.inject.Inject;
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
 import us.nineworlds.serenity.common.rest.SerenityClient;
-import us.nineworlds.serenity.jobs.GlideClearCacheJob;
 
 @InjectViewState
 public class MainPresenter extends MvpPresenter<MainView> {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/RecommendationBuilder.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/RecommendationBuilder.java
index 6b6816d1e..59b9c672a 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/RecommendationBuilder.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/RecommendationBuilder.java
@@ -21,9 +21,10 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import androidx.core.app.NotificationCompat;
 import android.util.Log;
 
+import androidx.core.app.NotificationCompat;
+
 import com.bumptech.glide.Glide;
 
 import java.io.IOException;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/SerenityRecommendationContentProvider.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/SerenityRecommendationContentProvider.java
index 8fb418357..57b1f55d2 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/SerenityRecommendationContentProvider.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/SerenityRecommendationContentProvider.java
@@ -29,6 +29,7 @@
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/ServerConfig.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/ServerConfig.java
index c48c70a56..bc63f30ae 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/ServerConfig.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/ServerConfig.java
@@ -27,7 +27,9 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.injection.BaseInjector;
 
 /**
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/AbstractExternalPlayer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/AbstractExternalPlayer.java
deleted file mode 100644
index 7700f48fa..000000000
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/AbstractExternalPlayer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * <p>
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * <p>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.core.externalplayer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import us.nineworlds.serenity.core.SerenityConstants;
-import us.nineworlds.serenity.core.model.VideoContentInfo;
-
-/**
- * @author dcarver
- */
-public abstract class AbstractExternalPlayer {
-
-  protected VideoContentInfo videoContent;
-  protected Context activity;
-
-  /**
-   *
-   */
-  public AbstractExternalPlayer(VideoContentInfo vc, Context ac) {
-    videoContent = vc;
-    activity = ac;
-  }
-
-  /**
-   * Sets the class and package name for the activity to be launched.
-   */
-  protected abstract void setClassAndPackagename(Intent vpIntent);
-
-  protected void launchActivity(Intent vpIntent) {
-    Activity activity = (Activity) this.activity;
-    activity.startActivityForResult(vpIntent, SerenityConstants.BROWSER_RESULT_CODE);
-  }
-
-  /**
-   * @return
-   */
-  public Intent createIntent() {
-    Intent vpIntent = new Intent(Intent.ACTION_VIEW);
-    vpIntent.setDataAndType(Uri.parse(videoContent.getDirectPlayUrl()), "video/*");
-
-    return vpIntent;
-  }
-}
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayer.java
deleted file mode 100644
index 0ae24a6a8..000000000
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2013 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * <p>
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * <p>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.core.externalplayer;
-
-import android.content.Intent;
-
-/**
- * Represents the capabilities of an external player.
- *
- * @author dcarver
- */
-public interface ExternalPlayer {
-
-  public void launch();
-
-  /**
-   * Whether the external player supports resume offset position for starting
-   * playback.
-   */
-  public boolean supportsResume();
-
-  /**
-   * Whether the external player supports reporting that it will report it's
-   * last playback position or not. Not all players will pass this information
-   * back as an activity result. If a player doesn't support this feature then
-   * the Plex playback position can't be updated.
-   */
-  public boolean supportsPlaybackPosition();
-
-  /**
-   * Whether subtitles can be passed into the player for playback.
-   */
-  public boolean supportsSubtitleUrls();
-
-  /**
-   * Whether the title of the video can be passed to the external player or
-   * not.
-   */
-
-  public boolean hasTitleSupport();
-
-  public boolean hasHardwareDecodingSupport();
-
-  public void enableHardwareDecodinging();
-
-  public void disableHadwareDecoding();
-
-  public Intent createIntent();
-}
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayerFactory.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayerFactory.java
deleted file mode 100644
index b3b2a8ba1..000000000
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayerFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * <p>
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * <p>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.core.externalplayer;
-
-import android.content.Context;
-import us.nineworlds.serenity.core.model.VideoContentInfo;
-
-/**
- * A factory that handles returning the selected video player.
- *
- * @author dcarver
- */
-public class ExternalPlayerFactory {
-
-  private final VideoContentInfo videoContent;
-  private final Context activity;
-
-  /**
-   *
-   */
-  public ExternalPlayerFactory(VideoContentInfo vc, Context ac) {
-    videoContent = vc;
-    activity = ac;
-  }
-
-  public ExternalPlayer createExternalPlayer(String identifier) {
-    if ("mxplayer".equals(identifier)) {
-      return new MXPlayer(videoContent, activity);
-    }
-
-    if ("mxplayerpro".equals(identifier)) {
-      return new MXPlayerPro(videoContent, activity);
-    }
-
-    if ("vimu".equals(identifier)) {
-      return new ViMuPlayer(videoContent, activity);
-    }
-
-    return new SystemDefaultPlayer(videoContent, activity);
-  }
-}
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/MXPlayer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/MXPlayer.java
deleted file mode 100644
index cb0ed399c..000000000
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/MXPlayer.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * <p>
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * <p>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.core.externalplayer;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import us.nineworlds.serenity.core.model.VideoContentInfo;
-import us.nineworlds.serenity.core.model.impl.Subtitle;
-
-/**
- * @author dcarver
- */
-public class MXPlayer extends AbstractExternalPlayer implements ExternalPlayer {
-
-  private static final String PLAYER_CLASS_NAME = "com.mxtech.videoplayer.ad.ActivityScreen";
-  private static final String PLAYER_PACKAGE_NAME = "com.mxtech.videoplayer.ad";
-
-  private boolean hardwareDecoding;
-
-  public MXPlayer(VideoContentInfo vc, Context ac) {
-    super(vc, ac);
-  }
-
-  @Override public void launch() {
-    Intent vpIntent = createIntent();
-    launchActivity(vpIntent);
-  }
-
-  @Override public Intent createIntent() {
-    Intent vpIntent = super.createIntent();
-    if (hardwareDecoding) {
-      vpIntent.putExtra("decode_mode", 1);
-    }
-    vpIntent.putExtra("title", videoContent.getTitle());
-    vpIntent.putExtra("return_result", true);
-    if (videoContent.getSubtitle() != null) {
-      Subtitle subtitle = videoContent.getSubtitle();
-      if (!"none".equals(subtitle.getFormat())) {
-        Uri[] subt = { Uri.parse(subtitle.getKey()) };
-        vpIntent.putExtra("subs", subt);
-        vpIntent.putExtra("subs.enable", subt);
-      }
-    }
-    if (videoContent.getResumeOffset() != 0 && videoContent.isPartiallyWatched()) {
-      vpIntent.putExtra("position", videoContent.getResumeOffset());
-    }
-
-    setClassAndPackagename(vpIntent);
-
-    return vpIntent;
-  }
-
-  @Override protected void setClassAndPackagename(Intent vpIntent) {
-    vpIntent.setPackage(PLAYER_PACKAGE_NAME);
-    vpIntent.setClassName(PLAYER_PACKAGE_NAME, PLAYER_CLASS_NAME);
-  }
-
-  @Override public boolean supportsResume() {
-    return true;
-  }
-
-  @Override public boolean supportsPlaybackPosition() {
-    return true;
-  }
-
-  @Override public boolean supportsSubtitleUrls() {
-    return true;
-  }
-
-  @Override public boolean hasTitleSupport() {
-    return true;
-  }
-
-  @Override public boolean hasHardwareDecodingSupport() {
-    return true;
-  }
-
-  @Override public void enableHardwareDecodinging() {
-    hardwareDecoding = true;
-  }
-
-  @Override public void disableHadwareDecoding() {
-    hardwareDecoding = false;
-  }
-}
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/MXPlayerPro.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/MXPlayerPro.java
deleted file mode 100644
index 998eb5a0e..000000000
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/MXPlayerPro.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * <p>
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * <p>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.core.externalplayer;
-
-import android.content.Context;
-import android.content.Intent;
-import us.nineworlds.serenity.core.model.VideoContentInfo;
-
-/**
- * @author dcarver
- */
-public class MXPlayerPro extends MXPlayer {
-
-  private static final String PLAYER_CLASS_NAME = "com.mxtech.videoplayer.ActivityScreen";
-  private static final String PLAYER_PACKAGENAME = "com.mxtech.videoplayer.pro";
-
-  public MXPlayerPro(VideoContentInfo vc, Context ac) {
-    super(vc, ac);
-  }
-
-  @Override protected void setClassAndPackagename(Intent vpIntent) {
-    vpIntent.setPackage(PLAYER_PACKAGENAME);
-    vpIntent.setClassName(PLAYER_PACKAGENAME, PLAYER_CLASS_NAME);
-  }
-}
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/SystemDefaultPlayer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/SystemDefaultPlayer.java
deleted file mode 100644
index 31d757971..000000000
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/SystemDefaultPlayer.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * <p>
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * <p>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.core.externalplayer;
-
-import android.content.Context;
-import android.content.Intent;
-import us.nineworlds.serenity.core.model.VideoContentInfo;
-
-/**
- * @author dcarver
- */
-public class SystemDefaultPlayer extends AbstractExternalPlayer implements ExternalPlayer {
-
-  public SystemDefaultPlayer(VideoContentInfo vc, Context ac) {
-    super(vc, ac);
-  }
-
-  @Override public void launch() {
-    Intent vpIntent = createIntent();
-    launchActivity(vpIntent);
-  }
-
-  @Override public boolean supportsResume() {
-    return false;
-  }
-
-  @Override public boolean supportsPlaybackPosition() {
-    return false;
-  }
-
-  @Override public boolean supportsSubtitleUrls() {
-    return false;
-  }
-
-  @Override public boolean hasTitleSupport() {
-    return false;
-  }
-
-  @Override public boolean hasHardwareDecodingSupport() {
-    return false;
-  }
-
-  @Override public void enableHardwareDecodinging() {
-
-  }
-
-  @Override public void disableHadwareDecoding() {
-
-  }
-
-  @Override protected void setClassAndPackagename(Intent vpIntent) {
-
-  }
-}
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ViMuPlayer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ViMuPlayer.java
deleted file mode 100644
index 2a4750815..000000000
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/externalplayer/ViMuPlayer.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * <p>
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * <p>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.core.externalplayer;
-
-import android.content.Context;
-import android.content.Intent;
-import us.nineworlds.serenity.core.model.VideoContentInfo;
-import us.nineworlds.serenity.core.model.impl.Subtitle;
-
-/**
- * @author dcarver
- */
-public class ViMuPlayer extends AbstractExternalPlayer implements ExternalPlayer {
-
-  /**
-   * @param vc
-   * @param ac
-   */
-  public ViMuPlayer(VideoContentInfo vc, Context ac) {
-    super(vc, ac);
-  }
-
-  @Override public void launch() {
-    Intent vpIntent = createIntent();
-
-    setClassAndPackagename(vpIntent);
-    launchActivity(vpIntent);
-  }
-
-  @Override public Intent createIntent() {
-    Intent vpIntent = super.createIntent();
-
-    vpIntent.putExtra("forcename", videoContent.getTitle());
-    vpIntent.putExtra("forcedirect", true);
-    vpIntent.putExtra("startfrom", videoContent.getResumeOffset());
-    if (videoContent.getSubtitle() != null) {
-      Subtitle subtitle = videoContent.getSubtitle();
-      if (!"none".equals(subtitle.getFormat())) {
-        vpIntent.putExtra("forcedsrt", subtitle.getKey());
-      }
-    }
-    return vpIntent;
-  }
-
-  @Override public boolean supportsResume() {
-    return true;
-  }
-
-  @Override public boolean supportsPlaybackPosition() {
-    return true;
-  }
-
-  @Override public boolean supportsSubtitleUrls() {
-    return true;
-  }
-
-  @Override public boolean hasTitleSupport() {
-    return true;
-  }
-
-  /*
-   * (non-Javadoc)
-   *
-   * @see us.nineworlds.serenity.core.externalplayer.ExternalPlayer#
-   * hasHardwareDecodingSupport()
-   */
-  @Override public boolean hasHardwareDecodingSupport() {
-    return true;
-  }
-
-  @Override public void enableHardwareDecodinging() {
-
-  }
-
-  @Override public void disableHadwareDecoding() {
-
-  }
-
-  @Override protected void setClassAndPackagename(Intent vpIntent) {
-    vpIntent.setPackage("net.gtvbox.videoplayer");
-    vpIntent.setClassName("net.gtvbox.videoplayer", "net.gtvbox.videoplayer.PlayerActivity");
-  }
-}
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/VideoContentInfo.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/VideoContentInfo.java
index 0a31ec9fc..c72a1e99c 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/VideoContentInfo.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/VideoContentInfo.java
@@ -25,7 +25,6 @@
 
 import java.util.List;
 
-import androidx.annotation.Nullable;
 import us.nineworlds.serenity.core.model.impl.Subtitle;
 
 /**
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractMediaContainer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractMediaContainer.java
index ec7338986..d19ab1299 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractMediaContainer.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractMediaContainer.java
@@ -24,7 +24,9 @@
 package us.nineworlds.serenity.core.model.impl;
 
 import java.util.List;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.rest.SerenityClient;
 import us.nineworlds.serenity.core.model.VideoContentInfo;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractSeriesContentInfo.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractSeriesContentInfo.java
index 14dcbf197..4c823a927 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractSeriesContentInfo.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractSeriesContentInfo.java
@@ -25,6 +25,7 @@
 
 import java.io.Serializable;
 import java.util.List;
+
 import timber.log.Timber;
 import us.nineworlds.serenity.common.rest.Types;
 import us.nineworlds.serenity.core.model.SeriesContentInfo;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractVideoContentInfo.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractVideoContentInfo.java
index fe4d85bf1..20a8203ea 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractVideoContentInfo.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/AbstractVideoContentInfo.java
@@ -24,8 +24,10 @@
 package us.nineworlds.serenity.core.model.impl;
 
 import android.content.res.Resources;
+
 import java.io.Serializable;
 import java.util.List;
+
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.common.rest.Types;
 import us.nineworlds.serenity.core.SerenityConstants;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/CategoryMediaContainer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/CategoryMediaContainer.java
index 13a801a15..4d6571f8c 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/CategoryMediaContainer.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/CategoryMediaContainer.java
@@ -25,6 +25,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import us.nineworlds.serenity.common.media.model.IDirectory;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.core.model.CategoryInfo;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/EpisodeMediaContainer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/EpisodeMediaContainer.java
index 7c4c62cf3..bfb4b20c5 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/EpisodeMediaContainer.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/EpisodeMediaContainer.java
@@ -24,9 +24,12 @@
 package us.nineworlds.serenity.core.model.impl;
 
 import android.content.res.Resources;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.media.model.IDirector;
 import us.nineworlds.serenity.common.media.model.IGenre;
 import us.nineworlds.serenity.common.media.model.IMedia;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/EpisodePosterInfo.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/EpisodePosterInfo.java
index 5cf035786..cc93969e1 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/EpisodePosterInfo.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/EpisodePosterInfo.java
@@ -24,6 +24,7 @@
 package us.nineworlds.serenity.core.model.impl;
 
 import android.content.res.Resources;
+
 import java.io.Serializable;
 
 public class EpisodePosterInfo extends AbstractVideoContentInfo implements Serializable {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainer.java
index 9a1ece4f0..46280bf47 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainer.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainer.java
@@ -25,15 +25,17 @@
 
 import android.content.SharedPreferences;
 import android.content.res.Resources;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.common.media.model.IDirectory;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.core.menus.MenuItem;
-import us.nineworlds.serenity.core.util.AndroidHelper;
 
 /**
  * Represents the meta data returned for the various libraries in media servers. Used to
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MovieMediaContainer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MovieMediaContainer.java
index fc3cca8f9..0b3f24133 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MovieMediaContainer.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/MovieMediaContainer.java
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+
 import us.nineworlds.serenity.common.media.model.IDirector;
 import us.nineworlds.serenity.common.media.model.IGenre;
 import us.nineworlds.serenity.common.media.model.IMedia;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SeasonsMediaContainer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SeasonsMediaContainer.java
index 6b405e7c7..4e499b022 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SeasonsMediaContainer.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SeasonsMediaContainer.java
@@ -24,6 +24,7 @@
 package us.nineworlds.serenity.core.model.impl;
 
 import java.util.List;
+
 import us.nineworlds.serenity.common.media.model.IDirectory;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.core.model.SeriesContentInfo;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SecondaryCategoryMediaContainer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SecondaryCategoryMediaContainer.java
index e68369804..0b41accba 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SecondaryCategoryMediaContainer.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SecondaryCategoryMediaContainer.java
@@ -25,6 +25,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import us.nineworlds.serenity.common.media.model.IDirectory;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.core.model.SecondaryCategoryInfo;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SeriesMediaContainer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SeriesMediaContainer.java
index 5b027411c..56abdff7f 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SeriesMediaContainer.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SeriesMediaContainer.java
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+
 import us.nineworlds.serenity.common.media.model.IDirectory;
 import us.nineworlds.serenity.common.media.model.IGenre;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SubtitleMediaContainer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SubtitleMediaContainer.java
index 72e373264..642fa8213 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SubtitleMediaContainer.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/SubtitleMediaContainer.java
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.media.model.IStream;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/TVCategoryMediaContainer.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/TVCategoryMediaContainer.java
index eb630a1cb..fb9084f29 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/TVCategoryMediaContainer.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/model/impl/TVCategoryMediaContainer.java
@@ -25,6 +25,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import us.nineworlds.serenity.common.media.model.IDirectory;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.core.model.CategoryInfo;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/AbstractPlexRESTIntentService.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/AbstractPlexRESTIntentService.java
index 29d871b8a..ee815a6f3 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/AbstractPlexRESTIntentService.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/AbstractPlexRESTIntentService.java
@@ -24,7 +24,9 @@
 package us.nineworlds.serenity.core.services;
 
 import android.content.Intent;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.rest.SerenityClient;
 import us.nineworlds.serenity.injection.InjectingIntentService;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/MovieSearchIntentService.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/MovieSearchIntentService.java
index 2a8cd4285..52ebacb55 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/MovieSearchIntentService.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/MovieSearchIntentService.java
@@ -26,6 +26,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
+
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 
 /**
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/MoviesRetrievalIntentService.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/MoviesRetrievalIntentService.java
index 20e9fb61e..7eb04dbb3 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/MoviesRetrievalIntentService.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/MoviesRetrievalIntentService.java
@@ -29,9 +29,11 @@
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.util.Log;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.rest.Types;
 import us.nineworlds.serenity.core.model.VideoContentInfo;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/UnWatchVideoAsyncTask.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/UnWatchVideoAsyncTask.java
index eee61694b..87d1fcbb9 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/UnWatchVideoAsyncTask.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/UnWatchVideoAsyncTask.java
@@ -24,8 +24,11 @@
 package us.nineworlds.serenity.core.services;
 
 import android.os.AsyncTask;
+
 import java.io.IOException;
+
 import javax.inject.Inject;
+
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/UpdateProgressRequest.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/UpdateProgressRequest.java
index 742433410..4ce752f25 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/UpdateProgressRequest.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/UpdateProgressRequest.java
@@ -1,7 +1,9 @@
 package us.nineworlds.serenity.core.services;
 
 import android.os.AsyncTask;
+
 import javax.inject.Inject;
+
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/WatchedVideoAsyncTask.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/WatchedVideoAsyncTask.java
index 424fc250b..561976dd2 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/services/WatchedVideoAsyncTask.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/services/WatchedVideoAsyncTask.java
@@ -24,8 +24,11 @@
 package us.nineworlds.serenity.core.services;
 
 import android.os.AsyncTask;
+
 import java.io.IOException;
+
 import javax.inject.Inject;
+
 import timber.log.Timber;
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/core/util/AndroidHelper.java b/serenity-app/src/main/java/us/nineworlds/serenity/core/util/AndroidHelper.java
index cb843537b..68664be3b 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/core/util/AndroidHelper.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/core/util/AndroidHelper.java
@@ -26,10 +26,6 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import us.nineworlds.serenity.common.android.injection.ApplicationContext;
-import us.nineworlds.serenity.injection.BaseInjector;
 
 public class AndroidHelper {
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/events/users/AllUsersEvent.java b/serenity-app/src/main/java/us/nineworlds/serenity/events/users/AllUsersEvent.java
index 90f9274ad..3807db3b7 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/events/users/AllUsersEvent.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/events/users/AllUsersEvent.java
@@ -1,7 +1,9 @@
 package us.nineworlds.serenity.events.users;
 
 import androidx.annotation.NonNull;
+
 import java.util.List;
+
 import us.nineworlds.serenity.common.rest.SerenityUser;
 
 public class AllUsersEvent {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuFragment.kt b/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuFragment.kt
index b36c948ce..5960d13fa 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuFragment.kt
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuFragment.kt
@@ -24,30 +24,29 @@
  */
 package us.nineworlds.serenity.fragments
 
-import us.nineworlds.serenity.fragments.mainmenu.MainMenuView
-import javax.inject.Inject
-import us.nineworlds.serenity.fragments.mainmenu.MainMenuPresenter
-import us.nineworlds.serenity.R
-import androidx.leanback.widget.HorizontalGridView
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.os.Bundle
 import android.app.Activity
+import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.fragment.app.FragmentContainerView
-import us.nineworlds.serenity.MainMenuTextViewAdapter
-import us.nineworlds.serenity.core.menus.MenuItem
-import us.nineworlds.serenity.events.MainMenuEvent
-import us.nineworlds.serenity.core.model.impl.MenuMediaContainer
-import java.util.ArrayList
-import javax.inject.Provider
+import androidx.leanback.widget.HorizontalGridView
 import moxy.ktx.moxyPresenter
 import us.nineworlds.serenity.MainActivity
+import us.nineworlds.serenity.MainMenuTextViewAdapter
+import us.nineworlds.serenity.R
+import us.nineworlds.serenity.core.menus.MenuItem
 import us.nineworlds.serenity.core.model.CategoryInfo
 import us.nineworlds.serenity.core.model.CategoryVideoInfo
 import us.nineworlds.serenity.core.model.VideoCategory
+import us.nineworlds.serenity.core.model.impl.MenuMediaContainer
+import us.nineworlds.serenity.events.MainMenuEvent
+import us.nineworlds.serenity.fragments.mainmenu.MainMenuPresenter
+import us.nineworlds.serenity.fragments.mainmenu.MainMenuView
 import us.nineworlds.serenity.injection.InjectingMvpFragment
+import javax.inject.Inject
+import javax.inject.Provider
 
 class MainMenuFragment : InjectingMvpFragment(), MainMenuView {
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuVideoContentVerticalGridFragment.kt b/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuVideoContentVerticalGridFragment.kt
index 1ce86bdfd..16f597f42 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuVideoContentVerticalGridFragment.kt
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/fragments/MainMenuVideoContentVerticalGridFragment.kt
@@ -1,17 +1,21 @@
 package us.nineworlds.serenity.fragments
 
-import android.os.Bundle
-import androidx.leanback.app.RowsSupportFragment
-import androidx.leanback.widget.*
-import us.nineworlds.serenity.core.model.CategoryInfo
 import android.content.Intent
+import android.os.Bundle
 import android.widget.ImageView
+import androidx.leanback.app.RowsSupportFragment
+import androidx.leanback.widget.ArrayObjectAdapter
+import androidx.leanback.widget.DiffCallback
+import androidx.leanback.widget.HeaderItem
+import androidx.leanback.widget.ListRow
+import androidx.leanback.widget.ListRowPresenter
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import toothpick.Toothpick
 import us.nineworlds.serenity.R
 import us.nineworlds.serenity.common.annotations.InjectionConstants
 import us.nineworlds.serenity.common.rest.Types
+import us.nineworlds.serenity.core.model.CategoryInfo
 import us.nineworlds.serenity.core.model.CategoryVideoInfo
 import us.nineworlds.serenity.core.model.VideoCategory
 import us.nineworlds.serenity.ui.activity.leanback.details.DetailsActivity
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/handlers/AutoConfigureHandlerRunnable.java b/serenity-app/src/main/java/us/nineworlds/serenity/handlers/AutoConfigureHandlerRunnable.java
index 91a734122..669dfc6dc 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/handlers/AutoConfigureHandlerRunnable.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/handlers/AutoConfigureHandlerRunnable.java
@@ -5,8 +5,11 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.widget.Toast;
+
 import java.util.Map;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.common.Server;
 import us.nineworlds.serenity.injection.BaseInjector;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/BaseInjector.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/BaseInjector.java
index 2aad9f8ad..d4cd02b76 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/BaseInjector.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/BaseInjector.java
@@ -26,6 +26,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
+
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
 public abstract class BaseInjector {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingActivity.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingActivity.java
index 8db7ad65d..04648ba40 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingActivity.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingActivity.java
@@ -25,7 +25,9 @@
 
 import android.app.Activity;
 import android.os.Bundle;
+
 import androidx.annotation.Nullable;
+
 import toothpick.Scope;
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingBaseAdapter.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingBaseAdapter.java
index 4455a65f0..51e4e4469 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingBaseAdapter.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingBaseAdapter.java
@@ -1,6 +1,7 @@
 package us.nineworlds.serenity.injection;
 
 import android.widget.BaseAdapter;
+
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingFragment.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingFragment.java
index c90d4f10b..5f588cc4f 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingFragment.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingFragment.java
@@ -24,6 +24,7 @@
 package us.nineworlds.serenity.injection;
 
 import androidx.fragment.app.Fragment;
+
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingIntentService.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingIntentService.java
index 43983f912..e7b70bac8 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingIntentService.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingIntentService.java
@@ -24,6 +24,7 @@
 package us.nineworlds.serenity.injection;
 
 import android.app.IntentService;
+
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingRecyclerViewAdapter.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingRecyclerViewAdapter.java
index 34e3761e4..203177e24 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingRecyclerViewAdapter.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/InjectingRecyclerViewAdapter.java
@@ -24,6 +24,7 @@
 package us.nineworlds.serenity.injection;
 
 import androidx.recyclerview.widget.RecyclerView;
+
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/AndroidModule.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/AndroidModule.java
index 5be5a846a..c8090f458 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/AndroidModule.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/AndroidModule.java
@@ -28,13 +28,17 @@
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.preference.PreferenceManager;
+
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import com.birbit.android.jobqueue.JobManager;
 import com.birbit.android.jobqueue.config.Configuration;
 
+import org.greenrobot.eventbus.EventBus;
+
 import javax.inject.Inject;
 import javax.inject.Provider;
-import org.greenrobot.eventbus.EventBus;
+
 import toothpick.config.Module;
 import us.nineworlds.serenity.common.android.injection.ApplicationContext;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/ExoplayerVideoModule.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/ExoplayerVideoModule.java
index 2d4929b00..c94271935 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/ExoplayerVideoModule.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/ExoplayerVideoModule.java
@@ -2,9 +2,7 @@
 
 import com.google.android.exoplayer2.trackselection.TrackSelector;
 import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
-import com.google.android.exoplayer2.upstream.cache.SimpleCache;
 
 import toothpick.config.Module;
 import us.nineworlds.serenity.injection.modules.providers.DataSourceFactoryProvider;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/SerenityModule.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/SerenityModule.java
index b7eedd8af..42dc20d4b 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/SerenityModule.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/SerenityModule.java
@@ -26,6 +26,7 @@
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
 import okhttp3.OkHttpClient;
 import toothpick.config.Module;
 import us.nineworlds.serenity.common.Server;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/DataSourceFactoryProvider.kt b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/DataSourceFactoryProvider.kt
index 52803ce34..e666e047a 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/DataSourceFactoryProvider.kt
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/DataSourceFactoryProvider.kt
@@ -1,14 +1,11 @@
 package us.nineworlds.serenity.injection.modules.providers
 
 import android.content.Context
-import com.google.android.exoplayer2.database.ExoDatabaseProvider
 import com.google.android.exoplayer2.upstream.DataSource
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
 import com.google.android.exoplayer2.upstream.HttpDataSource
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource
-import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
-import com.google.android.exoplayer2.upstream.cache.SimpleCache
 import us.nineworlds.serenity.SerenityApplication
 import us.nineworlds.serenity.common.android.injection.ApplicationContext
 import javax.inject.Inject
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/EventLoggerProvider.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/EventLoggerProvider.java
index a1f8236ae..c277d7706 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/EventLoggerProvider.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/EventLoggerProvider.java
@@ -1,8 +1,10 @@
 package us.nineworlds.serenity.injection.modules.providers;
 
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
+
 import javax.inject.Inject;
 import javax.inject.Provider;
+
 import us.nineworlds.serenity.ui.video.player.EventLogger;
 
 public class EventLoggerProvider implements Provider<EventLogger> {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/HttpDataSourceFactoryProvider.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/HttpDataSourceFactoryProvider.java
index d443731ce..4bf3c53f8 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/HttpDataSourceFactoryProvider.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/HttpDataSourceFactoryProvider.java
@@ -2,8 +2,10 @@
 
 import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSourceFactory;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
+
 import javax.inject.Inject;
 import javax.inject.Provider;
+
 import okhttp3.OkHttpClient;
 
 public class HttpDataSourceFactoryProvider implements Provider<HttpDataSource.Factory> {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/ServerClientPreferenceProvider.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/ServerClientPreferenceProvider.java
index 61f4f61b3..ce9982657 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/ServerClientPreferenceProvider.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/ServerClientPreferenceProvider.java
@@ -1,8 +1,10 @@
 package us.nineworlds.serenity.injection.modules.providers;
 
 import android.content.SharedPreferences;
+
 import javax.inject.Inject;
 import javax.inject.Provider;
+
 import us.nineworlds.serenity.core.util.StringPreference;
 
 public class ServerClientPreferenceProvider implements Provider<StringPreference> {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/VideoPlayerIntentUtilsProvider.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/VideoPlayerIntentUtilsProvider.java
index 9d58252ff..0f60669a2 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/VideoPlayerIntentUtilsProvider.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/VideoPlayerIntentUtilsProvider.java
@@ -1,9 +1,12 @@
 package us.nineworlds.serenity.injection.modules.providers;
 
 import android.content.SharedPreferences;
+
 import java.util.LinkedList;
+
 import javax.inject.Inject;
 import javax.inject.Provider;
+
 import us.nineworlds.serenity.core.model.VideoContentInfo;
 import us.nineworlds.serenity.core.util.TimeUtil;
 import us.nineworlds.serenity.injection.ForVideoQueue;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/VideoQueueHelperProvider.java b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/VideoQueueHelperProvider.java
index fa72003ac..b2584fcad 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/VideoQueueHelperProvider.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/injection/modules/providers/VideoQueueHelperProvider.java
@@ -2,9 +2,12 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+
 import java.util.LinkedList;
+
 import javax.inject.Inject;
 import javax.inject.Provider;
+
 import us.nineworlds.serenity.common.android.injection.ApplicationContext;
 import us.nineworlds.serenity.core.model.VideoContentInfo;
 import us.nineworlds.serenity.ui.util.VideoQueueHelper;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/EpisodesRetrievalJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/EpisodesRetrievalJob.java
index 3fcceefa4..613423dbc 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/EpisodesRetrievalJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/EpisodesRetrievalJob.java
@@ -2,9 +2,13 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
-import javax.inject.Inject;
+
 import org.greenrobot.eventbus.EventBus;
+
+import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/GlideClearCacheJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/GlideClearCacheJob.java
index 509082397..d016f43d5 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/GlideClearCacheJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/GlideClearCacheJob.java
@@ -1,8 +1,10 @@
 package us.nineworlds.serenity.jobs;
 
 import android.content.Context;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.Job;
 import com.birbit.android.jobqueue.Params;
 import com.birbit.android.jobqueue.RetryConstraint;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieCategoryJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieCategoryJob.java
index fe82746c1..57f69ffae 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieCategoryJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieCategoryJob.java
@@ -2,9 +2,13 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
-import javax.inject.Inject;
+
 import org.greenrobot.eventbus.EventBus;
+
+import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieRetrievalJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieRetrievalJob.java
index 45c2fc525..cf702bb00 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieRetrievalJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieRetrievalJob.java
@@ -2,9 +2,13 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
-import javax.inject.Inject;
+
 import org.greenrobot.eventbus.EventBus;
+
+import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieSecondaryCategoryJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieSecondaryCategoryJob.java
index e2df68522..7d5791e45 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieSecondaryCategoryJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/MovieSecondaryCategoryJob.java
@@ -2,9 +2,13 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
-import javax.inject.Inject;
+
 import org.greenrobot.eventbus.EventBus;
+
+import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/RetrieveAllUsersJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/RetrieveAllUsersJob.java
index 51e2a3a26..a5ce82cc2 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/RetrieveAllUsersJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/RetrieveAllUsersJob.java
@@ -2,10 +2,15 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
+
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.List;
+
 import javax.inject.Inject;
-import org.greenrobot.eventbus.EventBus;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.rest.SerenityClient;
 import us.nineworlds.serenity.common.rest.SerenityUser;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/SeasonsRetrievalJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/SeasonsRetrievalJob.java
index ef8f551c0..7dc98c12a 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/SeasonsRetrievalJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/SeasonsRetrievalJob.java
@@ -2,9 +2,13 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
-import javax.inject.Inject;
+
 import org.greenrobot.eventbus.EventBus;
+
+import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/SubtitleJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/SubtitleJob.java
index 352c3168b..12635ed12 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/SubtitleJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/SubtitleJob.java
@@ -2,9 +2,13 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
-import javax.inject.Inject;
+
 import org.greenrobot.eventbus.EventBus;
+
+import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVCategoryJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVCategoryJob.java
index 7e3f68b43..1a2da8d77 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVCategoryJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVCategoryJob.java
@@ -3,9 +3,13 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+
 import com.birbit.android.jobqueue.RetryConstraint;
-import javax.inject.Inject;
+
 import org.greenrobot.eventbus.EventBus;
+
+import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVCategorySecondaryJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVCategorySecondaryJob.java
index 86320a99f..a09389497 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVCategorySecondaryJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVCategorySecondaryJob.java
@@ -2,9 +2,13 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
-import javax.inject.Inject;
+
 import org.greenrobot.eventbus.EventBus;
+
+import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVShowRetrievalJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVShowRetrievalJob.java
index 77254ef4a..4087d5288 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVShowRetrievalJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/TVShowRetrievalJob.java
@@ -3,9 +3,13 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+
 import com.birbit.android.jobqueue.RetryConstraint;
-import javax.inject.Inject;
+
 import org.greenrobot.eventbus.EventBus;
+
+import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.media.model.IMediaContainer;
 import us.nineworlds.serenity.common.rest.SerenityClient;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/StartPlaybackJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/StartPlaybackJob.java
index 917049785..d755883b6 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/StartPlaybackJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/StartPlaybackJob.java
@@ -2,8 +2,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.rest.SerenityClient;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/StopPlaybackJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/StopPlaybackJob.java
index 6bc35fd76..101b11682 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/StopPlaybackJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/StopPlaybackJob.java
@@ -2,8 +2,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.rest.SerenityClient;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/UpdatePlaybackPostionJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/UpdatePlaybackPostionJob.java
index d2d6ed96b..0890b04c5 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/UpdatePlaybackPostionJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/UpdatePlaybackPostionJob.java
@@ -2,8 +2,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.rest.SerenityClient;
 import us.nineworlds.serenity.core.model.VideoContentInfo;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/WatchedStatusJob.java b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/WatchedStatusJob.java
index 81cdee4d0..c5ca72070 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/WatchedStatusJob.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/jobs/video/WatchedStatusJob.java
@@ -2,8 +2,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.RetryConstraint;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.common.android.injection.InjectingJob;
 import us.nineworlds.serenity.common.rest.SerenityClient;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/GridSpacingItemDecoration.java b/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/GridSpacingItemDecoration.java
index 0bb5c0af4..162208005 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/GridSpacingItemDecoration.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/GridSpacingItemDecoration.java
@@ -1,9 +1,10 @@
 package us.nineworlds.serenity.recyclerutils;
 
 import android.graphics.Rect;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 public class GridSpacingItemDecoration extends RecyclerView.ItemDecoration {
 
   private int spanCount;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/ItemOffsetDecoration.java b/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/ItemOffsetDecoration.java
index 154a318d8..e7107a184 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/ItemOffsetDecoration.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/ItemOffsetDecoration.java
@@ -2,10 +2,11 @@
 
 import android.content.Context;
 import android.graphics.Rect;
+import android.view.View;
+
 import androidx.annotation.DimenRes;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;
 
 public class ItemOffsetDecoration extends RecyclerView.ItemDecoration {
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/SpaceItemDecoration.java b/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/SpaceItemDecoration.java
index 92590ab90..a4fcb491e 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/SpaceItemDecoration.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/recyclerutils/SpaceItemDecoration.java
@@ -1,9 +1,10 @@
 package us.nineworlds.serenity.recyclerutils;
 
 import android.graphics.Rect;
+import android.view.View;
+
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;
 
 public class SpaceItemDecoration extends RecyclerView.ItemDecoration {
   private static final boolean DEFAULT_ADD_SPACE_ABOVE_FIRST_ITEM = false;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/OverscanSetupActivity.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/OverscanSetupActivity.java
index 4cf7b1edd..634ae3212 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/OverscanSetupActivity.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/OverscanSetupActivity.java
@@ -10,6 +10,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+
 import us.nineworlds.serenity.R;
 
 public class OverscanSetupActivity extends Activity
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/SerenityActivity.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/SerenityActivity.java
index 087b6a027..b41630bef 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/SerenityActivity.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/SerenityActivity.java
@@ -27,12 +27,13 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.KeyEvent;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.google.firebase.analytics.FirebaseAnalytics;
+
 import timber.log.Timber;
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.injection.InjectingMvpActivity;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/SerenityVideoActivity.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/SerenityVideoActivity.java
index 0569ca7d6..8b5ecb88f 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/SerenityVideoActivity.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/activity/SerenityVideoActivity.java
@@ -26,17 +26,20 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.Toast;
+
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.LinkedList;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.core.SerenityConstants;
 import us.nineworlds.serenity.core.model.VideoContentInfo;
 import us.nineworlds.serenity.injection.ForVideoQueue;
 import us.nineworlds.serenity.ui.adapters.AbstractPosterImageGalleryAdapter;
-import us.nineworlds.serenity.ui.util.ExternalPlayerResultHandler;
 import us.nineworlds.serenity.ui.util.PlayerResultHandler;
 import us.nineworlds.serenity.ui.video.player.ExoplayerVideoActivity;
 
@@ -76,16 +79,10 @@ public abstract class SerenityVideoActivity extends SerenityActivity {
     video = (VideoContentInfo) adapter.getItem(videoRecyclerView.getChildAdapterPosition(selectedView));
 
     if (data != null) {
-      if (externalPlayer) {
-        ExternalPlayerResultHandler externalPlayerHandler =
-            new ExternalPlayerResultHandler(resultCode, data, this, adapter);
-        externalPlayerHandler.updatePlaybackPosition(video, selectedView);
-      } else {
         PlayerResultHandler playerResultHandler =
 
             new PlayerResultHandler(data, adapter);
         playerResultHandler.updateVideoPlaybackPosition(video, selectedView);
-      }
     }
 
     if (requestCode == SerenityConstants.EXIT_PLAYBACK_IMMEDIATELY) {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/AbstractPosterImageGalleryAdapter.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/AbstractPosterImageGalleryAdapter.java
index 0ee91d459..4bd8e6448 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/AbstractPosterImageGalleryAdapter.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/AbstractPosterImageGalleryAdapter.java
@@ -24,11 +24,13 @@
 package us.nineworlds.serenity.ui.adapters;
 
 import android.os.Handler;
-import androidx.core.content.ContextCompat;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
+
+import androidx.core.content.ContextCompat;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/MenuDrawerAdapter.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/MenuDrawerAdapter.java
index 3b17f27f6..6594c8322 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/MenuDrawerAdapter.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/MenuDrawerAdapter.java
@@ -30,7 +30,9 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
 import java.util.List;
+
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.core.menus.MenuDrawerItem;
 import us.nineworlds.serenity.injection.InjectingBaseAdapter;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/RecyclerViewDiffUtil.kt b/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/RecyclerViewDiffUtil.kt
index 72bb314f2..808a45c18 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/RecyclerViewDiffUtil.kt
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/adapters/RecyclerViewDiffUtil.kt
@@ -1,7 +1,6 @@
 package us.nineworlds.serenity.ui.adapters
 
 import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
 import us.nineworlds.serenity.core.model.ContentInfo
 
 class RecyclerViewDiffUtil(private val oldList: List<ContentInfo>?, private val newList: List<ContentInfo>) : DiffUtil.Callback() {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/dialogs/DirectoryChooserDialog.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/dialogs/DirectoryChooserDialog.java
index ee750356e..116639183 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/dialogs/DirectoryChooserDialog.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/dialogs/DirectoryChooserDialog.java
@@ -19,12 +19,14 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+
 import us.nineworlds.serenity.R;
 
 public class DirectoryChooserDialog {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/CardPresenter.kt b/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/CardPresenter.kt
index b58297b05..9767c7e32 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/CardPresenter.kt
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/CardPresenter.kt
@@ -28,13 +28,13 @@ package us.nineworlds.serenity.ui.leanback.search
 import android.app.Activity
 import android.content.Context
 import android.content.ContextWrapper
-import androidx.annotation.VisibleForTesting
-import androidx.leanback.widget.ImageCardView
-import androidx.leanback.widget.Presenter
-import androidx.core.content.ContextCompat
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import androidx.annotation.VisibleForTesting
+import androidx.core.content.ContextCompat
+import androidx.leanback.widget.ImageCardView
+import androidx.leanback.widget.Presenter
 import com.bumptech.glide.Glide
 import us.nineworlds.serenity.R
 import us.nineworlds.serenity.core.model.VideoContentInfo
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/MovieSearchFragment.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/MovieSearchFragment.java
index ddfc8d8eb..8bc4054b0 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/MovieSearchFragment.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/MovieSearchFragment.java
@@ -30,19 +30,32 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.leanback.app.SearchSupportFragment;
 import androidx.leanback.app.SearchSupportFragment.SearchResultProvider;
-import androidx.leanback.widget.*;
+import androidx.leanback.widget.ArrayObjectAdapter;
+import androidx.leanback.widget.HeaderItem;
+import androidx.leanback.widget.ListRow;
+import androidx.leanback.widget.ListRowPresenter;
+import androidx.leanback.widget.ObjectAdapter;
+import androidx.leanback.widget.OnItemViewSelectedListener;
 import androidx.leanback.widget.Presenter.ViewHolder;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.Toast;
+import androidx.leanback.widget.Row;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
+
+import java.net.URLEncoder;
+import java.util.List;
+
+import javax.inject.Inject;
+
 import toothpick.Toothpick;
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
@@ -54,10 +67,6 @@
 import us.nineworlds.serenity.core.util.AndroidHelper;
 import us.nineworlds.serenity.ui.util.VideoPlayerIntentUtils;
 
-import javax.inject.Inject;
-import java.net.URLEncoder;
-import java.util.List;
-
 public class MovieSearchFragment extends SearchSupportFragment implements SearchResultProvider {
 
     private ArrayObjectAdapter rowsAdapter;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/SearchActivity.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/SearchActivity.java
index a5d931ebf..198618b21 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/SearchActivity.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/leanback/search/SearchActivity.java
@@ -25,7 +25,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+
 import androidx.fragment.app.FragmentActivity;
+
 import us.nineworlds.serenity.R;
 
 public class SearchActivity extends FragmentActivity {
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemClickListener.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemClickListener.java
index 32581bbf1..722e68632 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemClickListener.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemClickListener.java
@@ -25,7 +25,9 @@
 
 import android.app.Activity;
 import android.view.View;
+
 import javax.inject.Inject;
+
 import us.nineworlds.serenity.core.model.VideoContentInfo;
 import us.nineworlds.serenity.injection.BaseInjector;
 import us.nineworlds.serenity.ui.adapters.AbstractPosterImageGalleryAdapter;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemLongClickListener.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemLongClickListener.java
index 204c483a9..3caec7f8a 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemLongClickListener.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemLongClickListener.java
@@ -33,9 +33,12 @@
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.ListView;
+
 import java.util.ArrayList;
 import java.util.LinkedList;
+
 import javax.inject.Inject;
+
 import timber.log.Timber;
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.core.menus.DialogMenuItem;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemSelectedListener.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemSelectedListener.java
index e1cc49283..447561c55 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemSelectedListener.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/listeners/AbstractVideoOnItemSelectedListener.java
@@ -26,17 +26,22 @@
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RatingBar;
 import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.birbit.android.jobqueue.JobManager;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
+
+import javax.inject.Inject;
+
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.common.rest.SerenityClient;
 import us.nineworlds.serenity.core.imageloader.BackgroundBitmapDisplayer;
@@ -45,8 +50,6 @@
 import us.nineworlds.serenity.injection.BaseInjector;
 import us.nineworlds.serenity.ui.util.ImageInfographicUtils;
 
-import javax.inject.Inject;
-
 /**
  * Abstract class for handling video selection information. This can either be a
  * movie or a tv episode. This is primarily used in a detail view browsing
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/preferences/LeanbackSettingsActivity.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/preferences/LeanbackSettingsActivity.java
index 912131d67..59b49e9a7 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/preferences/LeanbackSettingsActivity.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/preferences/LeanbackSettingsActivity.java
@@ -1,7 +1,9 @@
 package us.nineworlds.serenity.ui.preferences;
 
 import android.os.Bundle;
+
 import androidx.annotation.Nullable;
+
 import us.nineworlds.serenity.MainActivity;
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.injection.InjectingActivity;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/preferences/SettingsFragment.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/preferences/SettingsFragment.java
index 5232a32c8..1abfcde75 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/preferences/SettingsFragment.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/preferences/SettingsFragment.java
@@ -5,20 +5,24 @@
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
-import androidx.preference.PreferenceDialogFragment;
-import androidx.preference.PreferenceFragment;
+
 import androidx.leanback.preference.LeanbackPreferenceFragment;
 import androidx.leanback.preference.LeanbackSettingsFragment;
 import androidx.preference.DialogPreference;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceDialogFragment;
+import androidx.preference.PreferenceFragment;
 import androidx.preference.PreferenceScreen;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+
 import javax.inject.Inject;
+
 import toothpick.Toothpick;
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.common.Server;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/ExternalPlayerResultHandler.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/ExternalPlayerResultHandler.java
deleted file mode 100644
index 0087d4efb..000000000
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/ExternalPlayerResultHandler.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * <p>
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * <p>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.ui.util;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.view.View;
-import android.widget.Toast;
-import java.util.LinkedList;
-import javax.inject.Inject;
-import us.nineworlds.serenity.R;
-import us.nineworlds.serenity.core.externalplayer.ExternalPlayer;
-import us.nineworlds.serenity.core.externalplayer.ExternalPlayerFactory;
-import us.nineworlds.serenity.core.externalplayer.MXPlayer;
-import us.nineworlds.serenity.core.model.VideoContentInfo;
-import us.nineworlds.serenity.injection.ForVideoQueue;
-import us.nineworlds.serenity.ui.adapters.AbstractPosterImageGalleryAdapter;
-
-public class ExternalPlayerResultHandler extends PlayerResultHandler {
-
-  Activity activity;
-  String externalPlayerValue;
-  boolean extPlayerVideoQueueEnabled;
-  int resultCode;
-  ExternalPlayer externalPlayer;
-
-  @Inject protected VideoPlayerIntentUtils vpUtils;
-
-  @Inject @ForVideoQueue protected LinkedList<VideoContentInfo> videoQueue;
-
-  @Inject protected SharedPreferences preferences;
-
-  public ExternalPlayerResultHandler(int resultCode, Intent data, Activity activity,
-      AbstractPosterImageGalleryAdapter adapter) {
-    super(data, adapter);
-    this.activity = activity;
-    externalPlayerValue = preferences.getString("serenity_external_player_filter", "default");
-    extPlayerVideoQueueEnabled =
-        preferences.getBoolean("external_player_continuous_playback", false);
-    this.resultCode = resultCode;
-  }
-
-  public void updatePlaybackPosition(VideoContentInfo video, View selectedView) {
-    ExternalPlayerFactory externalPlayerFactory = new ExternalPlayerFactory(video, activity);
-    externalPlayer = externalPlayerFactory.createExternalPlayer(externalPlayerValue);
-
-    boolean mxPlayerCompleted = updateMXPlayerCompletedNormally(video);
-    if (shouldUpdatePlaybackPosition(mxPlayerCompleted)) {
-      updateVideoPlaybackPosition(video, selectedView);
-    }
-
-    if (!extPlayerVideoQueueEnabled) {
-      return;
-    }
-
-    playNextQueueEntry();
-    return;
-  }
-
-  private void playNextQueueEntry() {
-    if (videoQueue.isEmpty()) {
-      return;
-    }
-
-    if (isVimuUserCancelResult(resultCode)) {
-      showQueueNotEmptyMessage();
-      return;
-    }
-
-    if (notMXPlayer(data)) {
-      externalPlayerPlayNext();
-      return;
-    }
-
-    String mxplayerEndedBy = data.getStringExtra("end_by");
-    if ("user".equals(mxplayerEndedBy)) {
-      showQueueNotEmptyMessage();
-      return;
-    }
-
-    externalPlayerPlayNext();
-  }
-
-  private boolean shouldUpdatePlaybackPosition(boolean mxPlayerCompleted) {
-    return !mxPlayerCompleted && externalPlayer.supportsPlaybackPosition() && data.hasExtra(
-        "position");
-  }
-
-  private boolean updateMXPlayerCompletedNormally(VideoContentInfo video) {
-    if (externalPlayer instanceof MXPlayer && hasMXPlayerCompletedNormally(data)) {
-      if (video != null) {
-        video.setResumeOffset(video.getDuration());
-        toggleWatched(video);
-        adapter.notifyDataSetChanged();
-      }
-      return true;
-    }
-    return false;
-  }
-
-  protected boolean hasMXPlayerCompletedNormally(Intent data) {
-    String mxplayerString = data.getStringExtra("end_by");
-    return "playback_completion".equals(mxplayerString);
-  }
-
-  protected boolean notMXPlayer(Intent data) {
-    return !data.hasExtra("end_by");
-  }
-
-  protected boolean isVimuUserCancelResult(int resultCode) {
-    return resultCode == 0 || resultCode == 4;
-  }
-
-  protected void showQueueNotEmptyMessage() {
-    Toast.makeText(activity, R.string.there_are_still_videos_int_the_queue_, Toast.LENGTH_LONG)
-        .show();
-  }
-
-  protected void externalPlayerPlayNext() {
-    VideoContentInfo videoContentInfo = videoQueue.poll();
-    vpUtils.launchExternalPlayer(videoContentInfo, activity, false);
-  }
-}
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/ImageUtils.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/ImageUtils.java
index 53bd98099..b96d6423d 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/ImageUtils.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/ImageUtils.java
@@ -25,6 +25,7 @@
 
 import android.view.View;
 import android.widget.ProgressBar;
+
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.core.SerenityConstants;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/PlayerResultHandler.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/PlayerResultHandler.java
index cfde72f2d..2559e575a 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/PlayerResultHandler.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/PlayerResultHandler.java
@@ -24,8 +24,10 @@
 package us.nineworlds.serenity.ui.util;
 
 import android.content.Intent;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.core.model.VideoContentInfo;
 import us.nineworlds.serenity.core.services.UpdateProgressRequest;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/VideoPlayerIntentUtils.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/VideoPlayerIntentUtils.java
index 751b6227c..f6cae7b04 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/VideoPlayerIntentUtils.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/VideoPlayerIntentUtils.java
@@ -24,17 +24,13 @@
 package us.nineworlds.serenity.ui.util;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.ActivityNotFoundException;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.widget.Toast;
+
 import java.util.LinkedList;
-import us.nineworlds.serenity.R;
+
 import us.nineworlds.serenity.core.SerenityConstants;
-import us.nineworlds.serenity.core.externalplayer.ExternalPlayer;
-import us.nineworlds.serenity.core.externalplayer.ExternalPlayerFactory;
 import us.nineworlds.serenity.core.model.VideoContentInfo;
 import us.nineworlds.serenity.core.util.TimeUtil;
 import us.nineworlds.serenity.ui.video.player.ExoplayerVideoActivity;
@@ -49,103 +45,12 @@ public VideoPlayerIntentUtils(LinkedList<VideoContentInfo> videoQueue, SharedPre
     this.prefs = prefs;
     this.timeUtil = timeUtil;
   }
-
-  /**
-   * This must run on a UI thread.
-   *
-   * Launches an external player based on the information provided.
-   */
-  public void launchExternalPlayer(VideoContentInfo videoContent, Activity activity, boolean autoResume) {
-
-    String externalPlayerValue = prefs.getString("serenity_external_player_filter", "default");
-
-    if ("default".equals(externalPlayerValue)) {
-      videoContent.setResumeOffset(0);
-      launchPlayer(videoContent, activity);
-      return;
-    }
-
-    if (videoContent.isPartiallyWatched() && !autoResume) {
-      showResumeDialogQueue(activity, videoContent);
-      return;
-    }
-
-    launchPlayer(videoContent, activity);
-  }
-
-  protected void launchPlayer(VideoContentInfo videoContent, Activity activity) {
-    String externalPlayerValue = prefs.getString("serenity_external_player_filter", "default");
-
-    ExternalPlayerFactory factory = new ExternalPlayerFactory(videoContent, activity);
-    ExternalPlayer extplay = factory.createExternalPlayer(externalPlayerValue);
-    try {
-      extplay.launch();
-    } catch (ActivityNotFoundException ex) {
-      extplay = factory.createExternalPlayer("default");
-      extplay.launch();
-    }
-  }
-
-  /**
-   * Play all videos in the queue launching the appropriate player.
-   */
-  public void playAllFromQueue(Activity context) {
-    if (!videoQueue.isEmpty()) {
-      boolean extplayer = prefs.getBoolean("external_player", false);
-      boolean extplayerVideoQueue = prefs.getBoolean("external_player_continuous_playback", false);
-
-      if (extplayer) {
-        if (extplayerVideoQueue) {
-          VideoContentInfo videoContent = videoQueue.poll();
-          launchExternalPlayer(videoContent, context, false);
-        } else {
-          Toast.makeText(context,
-              context.getResources().getString(R.string.external_player_video_queue_support_has_not_been_enabled_),
-              Toast.LENGTH_LONG).show();
-        }
-      } else {
-        Intent vpIntent = new Intent(context, ExoplayerVideoActivity.class);
-        context.startActivityForResult(vpIntent, SerenityConstants.EXIT_PLAYBACK_IMMEDIATELY);
-      }
-    } else {
-      Toast.makeText(context, context.getResources().getString(R.string.queue_is_empty_), Toast.LENGTH_LONG).show();
-    }
-  }
-
-  protected void showResumeDialogQueue(Activity context, VideoContentInfo videoContent) {
-    final VideoContentInfo video = videoContent;
-    final Activity c = context;
-    AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context, android.R.style.Theme_Holo_Dialog);
-
-    alertDialogBuilder.setTitle(R.string.resume_video);
-    alertDialogBuilder.setMessage(
-        context.getResources().getText(R.string.resume_the_video_from_) + timeUtil.formatDuration(
-            video.getResumeOffset()) + context.getResources().getText(R.string._or_restart_))
-        .setCancelable(false)
-        .setPositiveButton(R.string.resume, (dialog, which) -> launchPlayer(video, c))
-        .setNegativeButton(R.string.restart, (dialog, which) -> {
-          video.setResumeOffset(0);
-          launchPlayer(video, c);
-        });
-
-    alertDialogBuilder.create();
-    AlertDialog dialog = alertDialogBuilder.show();
-    dialog.getButton(DialogInterface.BUTTON_POSITIVE).requestFocusFromTouch();
-  }
-
   public void playVideo(Activity activity, VideoContentInfo videoInfo, boolean autoResume) {
     if (!videoQueue.isEmpty()) {
       Toast.makeText(activity, "Cleared video queue before playback.", Toast.LENGTH_LONG).show();
       videoQueue.clear();
     }
 
-    boolean externalPlayer = prefs.getBoolean("external_player", false);
-
-    if (externalPlayer) {
-      launchExternalPlayer(videoInfo, activity, autoResume);
-      return;
-    }
-
     launchInternalPlayer(videoInfo, activity, autoResume);
   }
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/VideoQueueHelper.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/VideoQueueHelper.java
index 35ec71171..36392d5de 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/VideoQueueHelper.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/util/VideoQueueHelper.java
@@ -26,9 +26,12 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.widget.Toast;
+
 import java.util.LinkedList;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
+
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.common.android.injection.ApplicationContext;
 import us.nineworlds.serenity.core.model.VideoContentInfo;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/video/player/EventLogger.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/video/player/EventLogger.java
index 98842c4e1..e70a64c34 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/video/player/EventLogger.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/video/player/EventLogger.java
@@ -17,9 +17,9 @@
 
 import android.os.SystemClock;
 import android.util.Log;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
@@ -34,14 +34,14 @@
 import com.google.android.exoplayer2.metadata.id3.TextInformationFrame;
 import com.google.android.exoplayer2.metadata.id3.UrlLinkFrame;
 import com.google.android.exoplayer2.source.MediaSourceEventListener;
-import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
-import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
+
 import java.text.NumberFormat;
 import java.util.Locale;
+
 import javax.inject.Inject;
+
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
 import us.nineworlds.serenity.core.logger.Logger;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/TextClock.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/TextClock.java
index 25f6ee6ee..24417dd12 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/TextClock.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/TextClock.java
@@ -15,6 +15,7 @@
 import android.util.AttributeSet;
 import android.view.ViewDebug;
 import android.widget.TextView;
+
 import java.util.Calendar;
 import java.util.TimeZone;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/mvp/MvpFrameLayout.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/mvp/MvpFrameLayout.java
index 8a258fe5f..4ab9c18a7 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/mvp/MvpFrameLayout.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/mvp/MvpFrameLayout.java
@@ -4,12 +4,14 @@
 import android.content.Context;
 import android.os.Build;
 import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
 import androidx.annotation.AttrRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
-import android.util.AttributeSet;
-import android.widget.FrameLayout;
+
 import moxy.MvpDelegate;
 import moxy.MvpPresenter;
 
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/statusoverlayview/StatusOverlayFrameLayout.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/statusoverlayview/StatusOverlayFrameLayout.java
index cc623fc1f..7ea4a7ad1 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/statusoverlayview/StatusOverlayFrameLayout.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/statusoverlayview/StatusOverlayFrameLayout.java
@@ -4,12 +4,6 @@
 import android.content.Context;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StyleRes;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
@@ -17,11 +11,19 @@
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import moxy.MvpPresenter;
-import moxy.presenter.InjectPresenter;
+
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+import moxy.MvpPresenter;
+import moxy.presenter.InjectPresenter;
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.common.rest.Types;
 import us.nineworlds.serenity.core.model.VideoContentInfo;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/viewholders/AbstractPosterImageViewHolder.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/viewholders/AbstractPosterImageViewHolder.java
index 63de2d48b..30ec68ede 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/viewholders/AbstractPosterImageViewHolder.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/ui/views/viewholders/AbstractPosterImageViewHolder.java
@@ -1,16 +1,18 @@
 package us.nineworlds.serenity.ui.views.viewholders;
 
 import android.graphics.drawable.ColorDrawable;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
 import us.nineworlds.serenity.R;
 import us.nineworlds.serenity.core.model.ContentInfo;
 import us.nineworlds.serenity.widgets.RoundedImageView;
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/widgets/RoundedImageView.java b/serenity-app/src/main/java/us/nineworlds/serenity/widgets/RoundedImageView.java
index 1ddfe718e..13e510762 100644
--- a/serenity-app/src/main/java/us/nineworlds/serenity/widgets/RoundedImageView.java
+++ b/serenity-app/src/main/java/us/nineworlds/serenity/widgets/RoundedImageView.java
@@ -11,6 +11,7 @@
 import android.util.AttributeSet;
 import android.util.Log;
 import android.widget.ImageView;
+
 import us.nineworlds.serenity.R;
 
 public class RoundedImageView extends ImageView {
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/CategoryRepository.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/CategoryRepository.kt
index d5e9c47ab..e7e0f51b8 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/CategoryRepository.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/CategoryRepository.kt
@@ -4,14 +4,15 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import toothpick.InjectConstructor
 import us.nineworlds.serenity.common.repository.Result
-import us.nineworlds.serenity.common.repository.Result.*
+import us.nineworlds.serenity.common.repository.Result.Error
+import us.nineworlds.serenity.common.repository.Result.Success
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.common.rest.Types
 import us.nineworlds.serenity.core.model.CategoryInfo
 import us.nineworlds.serenity.core.model.VideoContentInfo
 import us.nineworlds.serenity.core.model.impl.CategoryMediaContainer
-import us.nineworlds.serenity.events.MainMenuEvent
 import us.nineworlds.serenity.core.model.impl.MovieMediaContainer
+import us.nineworlds.serenity.events.MainMenuEvent
 
 @InjectConstructor
 class CategoryRepository constructor(private val client: SerenityClient) {
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/LoginRepository.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/LoginRepository.kt
index 05f40b0c1..9092f21c6 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/LoginRepository.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/LoginRepository.kt
@@ -3,9 +3,9 @@ package us.nineworlds.serenity.core.repository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import toothpick.InjectConstructor
+import us.nineworlds.serenity.common.repository.Result
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.common.rest.SerenityUser
-import us.nineworlds.serenity.common.repository.Result
 
 @InjectConstructor
 class LoginRepository(private val client: SerenityClient) {
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/VideoRepository.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/VideoRepository.kt
index 30d49a1bc..23713f434 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/VideoRepository.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/core/repository/VideoRepository.kt
@@ -8,7 +8,6 @@ import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.common.rest.Types
 import us.nineworlds.serenity.core.model.VideoContentInfo
 import us.nineworlds.serenity.core.model.impl.EpisodeMediaContainer
-import us.nineworlds.serenity.events.SeasonsRetrievalEvent
 
 @InjectConstructor
 class VideoRepository constructor(private val client: SerenityClient) {
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/fragments/mainmenu/MainMenuPresenter.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/fragments/mainmenu/MainMenuPresenter.kt
index 1040cbed3..99abd6079 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/fragments/mainmenu/MainMenuPresenter.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/fragments/mainmenu/MainMenuPresenter.kt
@@ -1,6 +1,9 @@
 package us.nineworlds.serenity.fragments.mainmenu
 
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import moxy.InjectViewState
 import moxy.MvpPresenter
 import moxy.presenterScope
@@ -8,13 +11,12 @@ import moxy.viewstate.strategy.SkipStrategy
 import moxy.viewstate.strategy.StateStrategyType
 import toothpick.Toothpick
 import us.nineworlds.serenity.common.annotations.InjectionConstants
-import us.nineworlds.serenity.core.repository.CategoryRepository
 import us.nineworlds.serenity.common.repository.Result
 import us.nineworlds.serenity.common.rest.Types
 import us.nineworlds.serenity.core.model.CategoryInfo
 import us.nineworlds.serenity.core.model.CategoryVideoInfo
 import us.nineworlds.serenity.core.model.VideoCategory
-
+import us.nineworlds.serenity.core.repository.CategoryRepository
 import javax.inject.Inject
 
 @InjectViewState
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/fragments/mainmenu/MainMenuView.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/fragments/mainmenu/MainMenuView.kt
index 88904bce5..1fa23eea1 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/fragments/mainmenu/MainMenuView.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/fragments/mainmenu/MainMenuView.kt
@@ -6,7 +6,6 @@ import moxy.viewstate.strategy.StateStrategyType
 import us.nineworlds.serenity.core.model.CategoryInfo
 import us.nineworlds.serenity.core.model.CategoryVideoInfo
 import us.nineworlds.serenity.core.model.VideoCategory
-import us.nineworlds.serenity.core.model.VideoContentInfo
 import us.nineworlds.serenity.events.MainMenuEvent
 
 interface MainMenuView : MvpView {
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/leanback/details/DetailsView.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/leanback/details/DetailsView.kt
index 682747b86..6bbdebf34 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/leanback/details/DetailsView.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/leanback/details/DetailsView.kt
@@ -1,7 +1,6 @@
 package us.nineworlds.serenity.ui.activity.leanback.details
 
 import moxy.MvpView
-import moxy.viewstate.strategy.AddToEndStrategy
 import moxy.viewstate.strategy.OneExecutionStateStrategy
 import moxy.viewstate.strategy.StateStrategyType
 import us.nineworlds.serenity.core.model.ContentInfo
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserViewHolder.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserViewHolder.kt
index a6196be2f..d14980eef 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserViewHolder.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserViewHolder.kt
@@ -1,11 +1,11 @@
 package us.nineworlds.serenity.ui.activity.login
 
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.DrawableCompat
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.bumptech.glide.Glide
 import toothpick.Toothpick
 import us.nineworlds.serenity.R
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/ActionPresenterSelector.java b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/ActionPresenterSelector.java
index f899fe842..632dda478 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/ActionPresenterSelector.java
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/ActionPresenterSelector.java
@@ -12,12 +12,14 @@
  * the License.
  */
 package us.nineworlds.serenity.ui.leanback.presenters;
+
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+
 import androidx.leanback.R;
 import androidx.leanback.widget.Action;
 import androidx.leanback.widget.Presenter;
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/CategoryVideoPresenter.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/CategoryVideoPresenter.kt
index 3b9db002b..b61efa15b 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/CategoryVideoPresenter.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/CategoryVideoPresenter.kt
@@ -2,9 +2,7 @@ package us.nineworlds.serenity.ui.leanback.presenters
 
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import androidx.core.content.ContextCompat
-import androidx.leanback.widget.ImageCardView
 import androidx.leanback.widget.Presenter
 import us.nineworlds.serenity.R
 import us.nineworlds.serenity.common.rest.Types
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/DetailsOverviewLogoPresenter.java b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/DetailsOverviewLogoPresenter.java
index d47aea028..8043ccce2 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/DetailsOverviewLogoPresenter.java
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/DetailsOverviewLogoPresenter.java
@@ -1,8 +1,10 @@
 package us.nineworlds.serenity.ui.leanback.presenters;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+
 import androidx.leanback.R;
 import androidx.leanback.widget.Presenter;
 
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/FullWidthDetailsOverviewRowPresenter.java b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/FullWidthDetailsOverviewRowPresenter.java
index 37b7c7350..28e4c6c13 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/FullWidthDetailsOverviewRowPresenter.java
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/FullWidthDetailsOverviewRowPresenter.java
@@ -12,8 +12,8 @@
  * the License.
  */
 package us.nineworlds.serenity.ui.leanback.presenters;
+
 import android.annotation.SuppressLint;
-import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -23,10 +23,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewGroup.MarginLayoutParams;
 import android.widget.FrameLayout;
 
-import androidx.core.content.ContextCompat;
 import androidx.leanback.widget.Action;
 import androidx.leanback.widget.BaseGridView;
 import androidx.leanback.widget.HorizontalGridView;
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/MoviePresenterViewHolder.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/MoviePresenterViewHolder.kt
index 4eb35c43c..bbc4151ca 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/MoviePresenterViewHolder.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/MoviePresenterViewHolder.kt
@@ -3,16 +3,15 @@ package us.nineworlds.serenity.ui.leanback.presenters
 import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.RatingBar
 import androidx.leanback.widget.RowPresenter
+import com.bumptech.glide.Glide
 import us.nineworlds.serenity.R
 import us.nineworlds.serenity.core.model.VideoContentInfo
 import us.nineworlds.serenity.databinding.LeanbackDetailsSummaryBinding
 import us.nineworlds.serenity.ui.util.ImageInfographicUtils
-import android.widget.LinearLayout
-
-import android.widget.RatingBar
-import android.view.ViewGroup
-import com.bumptech.glide.Glide
 
 
 class MoviePresenterViewHolder(private val binding: LeanbackDetailsSummaryBinding) : RowPresenter.ViewHolder(binding.root) {
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/SeriesPresenterViewHolder.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/SeriesPresenterViewHolder.kt
index 75293dc0e..a83905152 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/SeriesPresenterViewHolder.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/SeriesPresenterViewHolder.kt
@@ -1,24 +1,17 @@
 package us.nineworlds.serenity.ui.leanback.presenters
 
-import androidx.leanback.widget.Presenter
-import us.nineworlds.serenity.core.model.impl.TVShowSeriesInfo
-import us.nineworlds.serenity.databinding.LeanbackDetailsSummaryBinding
-import android.widget.LinearLayout
-
-import android.widget.RatingBar
-
-import android.widget.TextView
-
-import us.nineworlds.serenity.ui.util.ImageInfographicUtils
-
-import android.view.ViewGroup
-import android.graphics.drawable.BitmapDrawable
-
 import android.graphics.Bitmap
-
+import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.RatingBar
+import androidx.leanback.widget.Presenter
 import com.bumptech.glide.Glide
 import us.nineworlds.serenity.R
+import us.nineworlds.serenity.core.model.impl.TVShowSeriesInfo
+import us.nineworlds.serenity.databinding.LeanbackDetailsSummaryBinding
+import us.nineworlds.serenity.ui.util.ImageInfographicUtils
 
 open class SeriesPresenterViewHolder(private val binding: LeanbackDetailsSummaryBinding) : Presenter.ViewHolder(binding.root) {
 
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/VideoContentInfoPresenter.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/VideoContentInfoPresenter.kt
index 52d473eef..f2ba9eebb 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/VideoContentInfoPresenter.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/leanback/presenters/VideoContentInfoPresenter.kt
@@ -6,7 +6,6 @@ import androidx.core.content.ContextCompat
 import androidx.leanback.widget.Presenter
 import us.nineworlds.serenity.R
 import us.nineworlds.serenity.common.rest.Types
-import us.nineworlds.serenity.core.model.ContentInfo
 import us.nineworlds.serenity.core.model.VideoContentInfo
 import us.nineworlds.serenity.ui.views.statusoverlayview.StatusOverlayFrameLayout
 
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/util/ImageInfographicUtils.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/util/ImageInfographicUtils.kt
index 10229960b..269466664 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/util/ImageInfographicUtils.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/util/ImageInfographicUtils.kt
@@ -37,7 +37,6 @@ import android.widget.ImageView.ScaleType
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.bumptech.glide.Glide
-import timber.log.Timber
 import us.nineworlds.serenity.R
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.core.model.VideoContentInfo
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerContract.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerContract.kt
index 5a84fb127..6c78d7a67 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerContract.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerContract.kt
@@ -4,7 +4,6 @@ import moxy.MvpView
 import moxy.viewstate.strategy.AddToEndSingleStrategy
 import moxy.viewstate.strategy.StateStrategyType
 import us.nineworlds.serenity.core.model.VideoContentInfo
-import us.nineworlds.serenity.emby.model.Video
 
 interface ExoplayerContract {
 
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerVideoActivity.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerVideoActivity.kt
index 6c3d6e82b..759642f45 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerVideoActivity.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerVideoActivity.kt
@@ -12,7 +12,10 @@ import android.os.Looper
 import android.view.KeyEvent
 import android.view.View
 import android.widget.FrameLayout
-import com.google.android.exoplayer2.*
+import com.google.android.exoplayer2.DefaultLoadControl
+import com.google.android.exoplayer2.ExoPlayer
+import com.google.android.exoplayer2.MediaItem
+import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory
 import com.google.android.exoplayer2.source.MediaSource
 import com.google.android.exoplayer2.source.ProgressiveMediaSource
diff --git a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/VideoKeyCodeHandlerDelegate.kt b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/VideoKeyCodeHandlerDelegate.kt
index 5c9c7e3b1..21593f0eb 100644
--- a/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/VideoKeyCodeHandlerDelegate.kt
+++ b/serenity-app/src/main/kotlin/us/nineworlds/serenity/ui/video/player/VideoKeyCodeHandlerDelegate.kt
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import android.util.Log
 import android.view.KeyEvent
 import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.SimpleExoPlayer
 import org.greenrobot.eventbus.EventBus
 import toothpick.Toothpick
 import us.nineworlds.serenity.common.annotations.InjectionConstants
diff --git a/serenity-app/src/main/res/color/item_selector_color.xml b/serenity-app/src/main/res/color/item_selector_color.xml
index 169a93cef..83f94b9fa 100644
--- a/serenity-app/src/main/res/color/item_selector_color.xml
+++ b/serenity-app/src/main/res/color/item_selector_color.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="?colorOnPrimary" android:state_focused="true"/>
     <item android:color="@android:color/transparent"/>
 </selector>
diff --git a/serenity-app/src/main/res/layout-large/activity_login_user.xml b/serenity-app/src/main/res/layout-large/activity_login_user.xml
index 875357b33..d31afb7c4 100644
--- a/serenity-app/src/main/res/layout-large/activity_login_user.xml
+++ b/serenity-app/src/main/res/layout-large/activity_login_user.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="@android:color/background_dark"
->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/background_dark">
 
   <include
     layout="@layout/include_loading_progress"
diff --git a/serenity-app/src/main/res/layout/movie_custom_actionbar.xml b/serenity-app/src/main/res/layout/movie_custom_actionbar.xml
index 9578bd8e1..ea6da9b0d 100644
--- a/serenity-app/src/main/res/layout/movie_custom_actionbar.xml
+++ b/serenity-app/src/main/res/layout/movie_custom_actionbar.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  style="@style/Widget.AppTheme.Toolbar.Transparent"
-  android:id="@+id/toolbar"
-  android:layout_height="45dp"
-  android:layout_width="match_parent"
->
+<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Widget.AppTheme.Toolbar.Transparent"
+    android:id="@+id/toolbar"
+    android:layout_height="45dp"
+    android:layout_width="match_parent">
 
   <RelativeLayout
     android:layout_width="match_parent"
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/AndroidTVTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/AndroidTVTest.java
index ea1b96468..841fa4550 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/AndroidTVTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/AndroidTVTest.java
@@ -1,20 +1,13 @@
 package us.nineworlds.serenity;
 
-import android.content.Intent;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 
-import org.assertj.android.api.Assertions;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.shadows.ShadowActivity;
-
-import us.nineworlds.serenity.ui.leanback.search.SearchActivity;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(RobolectricTestRunner.class)
 @Ignore
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/GalleryOnItemClickListenerTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/GalleryOnItemClickListenerTest.java
index 9ad779057..e790f7ec5 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/GalleryOnItemClickListenerTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/GalleryOnItemClickListenerTest.java
@@ -1,6 +1,12 @@
 package us.nineworlds.serenity;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.MockitoAnnotations.initMocks;
+
 import android.view.View;
+
 import org.assertj.android.api.Assertions;
 import org.junit.After;
 import org.junit.Before;
@@ -11,14 +17,10 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowActivity;
+
 import us.nineworlds.serenity.core.menus.MenuItem;
 import us.nineworlds.serenity.ui.preferences.LeanbackSettingsActivity;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.MockitoAnnotations.initMocks;
-
 @RunWith(RobolectricTestRunner.class)
 public class GalleryOnItemClickListenerTest {
 
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/MainActivityTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/MainActivityTest.java
index 965d1e25f..5940af2df 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/MainActivityTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/MainActivityTest.java
@@ -23,6 +23,13 @@
 
 package us.nineworlds.serenity;
 
+import static org.assertj.android.api.Assertions.assertThat;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.MockitoAnnotations.initMocks;
+
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.view.KeyEvent;
@@ -57,13 +64,6 @@
 import us.nineworlds.serenity.test.InjectingTest;
 import us.nineworlds.serenity.ui.util.VideoPlayerIntentUtils;
 
-import static org.assertj.android.api.Assertions.assertThat;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.MockitoAnnotations.initMocks;
-
 @RunWith(RobolectricTestRunner.class)
 @Config(qualifiers = "large")
 @LooperMode(LooperMode.Mode.LEGACY)
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/MainMenuTextViewAdapterTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/MainMenuTextViewAdapterTest.java
index 1ed26812e..df4e7aa33 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/MainMenuTextViewAdapterTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/MainMenuTextViewAdapterTest.java
@@ -1,26 +1,25 @@
 package us.nineworlds.serenity;
 
-import java.util.Collections;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+
 import androidx.test.core.app.ApplicationProvider;
+
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-import org.mockito.quality.Strictness;
 import org.robolectric.RobolectricTestRunner;
+
+import java.util.Collections;
+
 import toothpick.config.Module;
 import us.nineworlds.serenity.core.menus.MenuItem;
 import us.nineworlds.serenity.fragments.mainmenu.MainMenuPresenter;
 import us.nineworlds.serenity.test.InjectingTest;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
 @RunWith(RobolectricTestRunner.class)
 public class MainMenuTextViewAdapterTest extends InjectingTest {
 
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/StartupBroadcastReceiverTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/StartupBroadcastReceiverTest.java
index 7d2329af8..3610487f5 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/StartupBroadcastReceiverTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/StartupBroadcastReceiverTest.java
@@ -1,9 +1,14 @@
 package us.nineworlds.serenity;
 
-import static com.nhaarman.mockitokotlin2.VerificationKt.verifyZeroInteractions;
+import static org.assertj.android.api.Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+import static org.mockito.MockitoAnnotations.initMocks;
+import static org.robolectric.RuntimeEnvironment.application;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -11,16 +16,11 @@
 import org.mockito.Mock;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowApplication;
+
 import toothpick.config.Module;
 import us.nineworlds.serenity.core.util.AndroidHelper;
 import us.nineworlds.serenity.test.InjectingTest;
 
-import static org.assertj.android.api.Assertions.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-import static org.mockito.MockitoAnnotations.initMocks;
-import static org.robolectric.RuntimeEnvironment.application;
-
 @RunWith(RobolectricTestRunner.class)
 public class StartupBroadcastReceiverTest extends InjectingTest {
 
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/TestSerenityApplication.java b/serenity-app/src/test/java/us/nineworlds/serenity/TestSerenityApplication.java
index 64760d917..14f4ec383 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/TestSerenityApplication.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/TestSerenityApplication.java
@@ -23,24 +23,29 @@
 
 package us.nineworlds.serenity;
 
+import static org.mockito.Mockito.mock;
+
 import android.content.SharedPreferences;
+
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import com.birbit.android.jobqueue.JobManager;
 import com.google.firebase.analytics.FirebaseAnalytics;
-import java.lang.reflect.Method;
+
 import org.greenrobot.eventbus.EventBus;
 import org.robolectric.TestLifecycleApplication;
+
+import java.lang.reflect.Method;
+
 import toothpick.Scope;
 import toothpick.Toothpick;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
 import us.nineworlds.serenity.core.logger.Logger;
 import us.nineworlds.serenity.core.util.AndroidHelper;
 import us.nineworlds.serenity.injection.modules.AndroidModule;
+import us.nineworlds.serenity.injection.modules.ExoplayerVideoModule;
 import us.nineworlds.serenity.injection.modules.LoginModule;
 import us.nineworlds.serenity.injection.modules.SerenityModule;
-import us.nineworlds.serenity.injection.modules.ExoplayerVideoModule;
-
-import static org.mockito.Mockito.mock;
 
 public class TestSerenityApplication extends SerenityApplication implements TestLifecycleApplication {
 
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/TestingModule.java b/serenity-app/src/test/java/us/nineworlds/serenity/TestingModule.java
index 9a044ff70..ed5d8e783 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/TestingModule.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/TestingModule.java
@@ -24,11 +24,14 @@
 package us.nineworlds.serenity;
 
 import android.content.Context;
+
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.birbit.android.jobqueue.JobManager;
+
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+
 import toothpick.config.Module;
 import us.nineworlds.serenity.common.rest.SerenityClient;
 import us.nineworlds.serenity.core.logger.Logger;
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/ServerConfigTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/ServerConfigTest.java
index 6dbc073e4..3e009d3a1 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/ServerConfigTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/ServerConfigTest.java
@@ -23,11 +23,18 @@
 
 package us.nineworlds.serenity.core;
 
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.preference.PreferenceManager;
 
 import androidx.test.core.app.ApplicationProvider;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -40,12 +47,6 @@
 import us.nineworlds.serenity.TestingModule;
 import us.nineworlds.serenity.test.InjectingTest;
 
-import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(RobolectricTestRunner.class)
 @LooperMode(LooperMode.Mode.LEGACY)
 public class ServerConfigTest extends InjectingTest {
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayerFactoryTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayerFactoryTest.java
deleted file mode 100644
index f1573fd59..000000000
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/ExternalPlayerFactoryTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package us.nineworlds.serenity.core.externalplayer;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/**
- * @author dcarver
- *
- */
-public class ExternalPlayerFactoryTest {
-
-	private ExternalPlayerFactory player;
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Before
-	public void setUp() throws Exception {
-		player = new ExternalPlayerFactory(null, null);
-	}
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@After
-	public void tearDown() throws Exception {
-		player = null;
-	}
-
-	/**
-	 * Test method for
-	 * {@link us.nineworlds.serenity.core.externalplayer.ExternalPlayerFactory#createExternalPlayer(java.lang.String)}
-	 * .
-	 */
-	@Test
-	public void testCreateExternalPlayer() {
-		assertThat(player).isNotNull();
-	}
-
-	@Test
-	public void testCreateMXPlayer() {
-		ExternalPlayer p = player.createExternalPlayer("mxplayer");
-		assertThat(p).isNotNull().isInstanceOf(MXPlayer.class);
-	}
-
-	@Test
-	public void testCreateMXPlayerPro() {
-		ExternalPlayer p = player.createExternalPlayer("mxplayerpro");
-		assertThat(p).isNotNull().isInstanceOf(MXPlayerPro.class);
-	}
-
-	@Test
-	public void testCreateVimu() {
-		ExternalPlayer p = player.createExternalPlayer("vimu");
-		assertThat(p).isNotNull().isInstanceOf(ViMuPlayer.class);
-	}
-
-	@Test
-	public void testSystemDefaultPlayer() {
-		ExternalPlayer p = player.createExternalPlayer("default");
-		assertThat(p).isNotNull().isInstanceOf(SystemDefaultPlayer.class);
-	}
-
-}
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/MXPlayerProTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/MXPlayerProTest.java
deleted file mode 100644
index 5951d28fb..000000000
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/MXPlayerProTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.core.externalplayer;
-
-import android.app.Activity;
-import android.content.Intent;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-import us.nineworlds.serenity.core.model.VideoContentInfo;
-import us.nineworlds.serenity.core.model.impl.Subtitle;
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner;
-
-import static org.assertj.android.api.Assertions.assertThat;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(RobolectricTestRunner.class)
-public class MXPlayerProTest {
-
-	MXPlayerPro mxplayer;
-
-	@Mock
-	VideoContentInfo videoInfo;
-
-	@Mock
-	Subtitle subtitle;
-
-	@Mock
-	Activity activity;
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.initMocks(this);
-		when(videoInfo.getDirectPlayUrl()).thenReturn("http://www.example.com");
-		doNothing().when(activity).startActivityForResult(any(Intent.class),
-				anyInt());
-		mxplayer = new MXPlayerPro(videoInfo, activity);
-	}
-
-	@After
-	public void tearDown() {
-
-	}
-
-	@Test
-	public void createsExpectedIntentExtraTitle() {
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent).hasExtra("title");
-	}
-
-	@Test
-	public void hasDecodeMode() {
-		mxplayer.enableHardwareDecodinging();
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent).hasExtra("decode_mode");
-	}
-
-	@Test
-	public void hadReturnResult() {
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent).hasExtra("return_result");
-	}
-
-	@Test
-	public void hasPositionWhenVideoIsPartiallyWatched() {
-		when(videoInfo.getResumeOffset()).thenReturn(10);
-		when(videoInfo.isPartiallyWatched()).thenReturn(true);
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent).hasExtra("position");
-	}
-
-	@Test
-	public void subtitleSupportIsEnabled() {
-		when(subtitle.getFormat()).thenReturn("srt");
-		when(subtitle.getKey()).thenReturn("http://www.example.com/");
-		when(videoInfo.getSubtitle()).thenReturn(subtitle);
-
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent).hasExtra("subs");
-		assertThat(intent).hasExtra("subs.enable");
-	}
-
-	@Test
-	public void supportsResume() {
-		assertThat(mxplayer.supportsResume()).isTrue();
-	}
-
-	@Test
-	public void supportsPlaybackPosition() {
-		assertThat(mxplayer.supportsPlaybackPosition()).isTrue();
-	}
-
-	@Test
-	public void supportsSubtitleUrls() {
-		assertThat(mxplayer.supportsSubtitleUrls()).isTrue();
-	}
-
-	@Test
-	public void hasTitleSupport() {
-		assertThat(mxplayer.hasTitleSupport()).isTrue();
-	}
-
-	@Test
-	public void hasHardwareDecoding() {
-		assertThat(mxplayer.hasHardwareDecodingSupport()).isTrue();
-	}
-
-	@Test
-	public void disabledHardWareEncoding() {
-		mxplayer.enableHardwareDecodinging();
-		mxplayer.disableHadwareDecoding();
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent.getIntExtra("decode_mode", 0)).isEqualTo(0);
-	}
-
-	@Test
-	public void activityIsLaunched() {
-		mxplayer.launch();
-		verify(activity).startActivityForResult(any(Intent.class), anyInt());
-	}
-
-}
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/MXPlayerTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/MXPlayerTest.java
deleted file mode 100644
index 8aba842ff..000000000
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/MXPlayerTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.core.externalplayer;
-
-import android.app.Activity;
-import android.content.Intent;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-import us.nineworlds.serenity.core.model.VideoContentInfo;
-import us.nineworlds.serenity.core.model.impl.Subtitle;
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner;
-
-import static org.assertj.android.api.Assertions.assertThat;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(RobolectricTestRunner.class)
-public class MXPlayerTest {
-
-	MXPlayer mxplayer;
-
-	@Mock
-	VideoContentInfo videoInfo;
-
-	@Mock
-	Subtitle subtitle;
-
-	@Mock
-	Activity activity;
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.initMocks(this);
-		when(videoInfo.getDirectPlayUrl()).thenReturn("http://www.example.com");
-		doNothing().when(activity).startActivityForResult(any(Intent.class),
-				anyInt());
-		mxplayer = new MXPlayer(videoInfo, activity);
-	}
-
-	@After
-	public void tearDown() {
-
-	}
-
-	@Test
-	public void createsExpectedIntentExtraTitle() {
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent).hasExtra("title");
-	}
-
-	@Test
-	public void hasDecodeMode() {
-		mxplayer.enableHardwareDecodinging();
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent).hasExtra("decode_mode");
-	}
-
-	@Test
-	public void hadReturnResult() {
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent).hasExtra("return_result");
-	}
-
-	@Test
-	public void hasPositionWhenVideoIsPartiallyWatched() {
-		when(videoInfo.getResumeOffset()).thenReturn(10);
-		when(videoInfo.isPartiallyWatched()).thenReturn(true);
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent).hasExtra("position");
-	}
-
-	@Test
-	public void subtitleSupportIsEnabled() {
-		when(subtitle.getFormat()).thenReturn("srt");
-		when(subtitle.getKey()).thenReturn("http://www.example.com/");
-		when(videoInfo.getSubtitle()).thenReturn(subtitle);
-
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent).hasExtra("subs");
-		assertThat(intent).hasExtra("subs.enable");
-	}
-
-	@Test
-	public void supportsResume() {
-		assertThat(mxplayer.supportsResume()).isTrue();
-	}
-
-	@Test
-	public void supportsPlaybackPosition() {
-		assertThat(mxplayer.supportsPlaybackPosition()).isTrue();
-	}
-
-	@Test
-	public void supportsSubtitleUrls() {
-		assertThat(mxplayer.supportsSubtitleUrls()).isTrue();
-	}
-
-	@Test
-	public void hasTitleSupport() {
-		assertThat(mxplayer.hasTitleSupport()).isTrue();
-	}
-
-	@Test
-	public void hasHardwareDecoding() {
-		assertThat(mxplayer.hasHardwareDecodingSupport()).isTrue();
-	}
-
-	@Test
-	public void disabledHardWareEncoding() {
-		mxplayer.enableHardwareDecodinging();
-		mxplayer.disableHadwareDecoding();
-		Intent intent = mxplayer.createIntent();
-		assertThat(intent.getIntExtra("decode_mode", 0)).isEqualTo(0);
-	}
-
-	@Test
-	public void activityIsLaunched() {
-		mxplayer.launch();
-		verify(activity).startActivityForResult(any(Intent.class), anyInt());
-	}
-
-}
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/SystemDefaultPlayerTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/SystemDefaultPlayerTest.java
deleted file mode 100644
index d60eb2c23..000000000
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/SystemDefaultPlayerTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.core.externalplayer;
-
-import android.app.Activity;
-import android.content.Intent;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-import us.nineworlds.serenity.core.model.VideoContentInfo;
-import us.nineworlds.serenity.core.model.impl.Subtitle;
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(RobolectricTestRunner.class)
-public class SystemDefaultPlayerTest {
-
-	SystemDefaultPlayer mxplayer;
-
-	@Mock
-	VideoContentInfo videoInfo;
-
-	@Mock
-	Subtitle subtitle;
-
-	@Mock
-	Activity activity;
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.initMocks(this);
-		when(videoInfo.getDirectPlayUrl()).thenReturn("http://www.example.com");
-		doNothing().when(activity).startActivityForResult(any(Intent.class),
-				anyInt());
-		mxplayer = new SystemDefaultPlayer(videoInfo, activity);
-	}
-
-	@After
-	public void tearDown() {
-
-	}
-
-	@Test
-	public void doesNotSupportsResume() {
-		assertThat(mxplayer.supportsResume()).isFalse();
-	}
-
-	@Test
-	public void supportsPlaybackPosition() {
-		assertThat(mxplayer.supportsPlaybackPosition()).isFalse();
-	}
-
-	@Test
-	public void supportsSubtitleUrls() {
-		assertThat(mxplayer.supportsSubtitleUrls()).isFalse();
-	}
-
-	@Test
-	public void hasTitleSupport() {
-		assertThat(mxplayer.hasTitleSupport()).isFalse();
-	}
-
-	@Test
-	public void hasHardwareDecoding() {
-		assertThat(mxplayer.hasHardwareDecodingSupport()).isFalse();
-	}
-
-	@Test
-	public void activityIsLaunched() {
-		mxplayer.launch();
-		verify(activity).startActivityForResult(any(Intent.class), anyInt());
-	}
-
-}
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/VimuPlayerTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/VimuPlayerTest.java
deleted file mode 100644
index 281ca13bc..000000000
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/externalplayer/VimuPlayerTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * The MIT License (MIT)
- * Copyright (c) 2012 David Carver
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package us.nineworlds.serenity.core.externalplayer;
-
-import android.app.Activity;
-import android.content.Intent;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-import us.nineworlds.serenity.core.model.VideoContentInfo;
-import us.nineworlds.serenity.core.model.impl.Subtitle;
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner;
-
-import static org.assertj.android.api.Assertions.assertThat;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(RobolectricTestRunner.class)
-public class VimuPlayerTest {
-
-	ViMuPlayer player;
-
-	@Mock
-	VideoContentInfo videoInfo;
-
-	@Mock
-	Subtitle subtitle;
-
-	@Mock
-	Activity activity;
-
-	@Before
-	public void setUp() {
-		MockitoAnnotations.initMocks(this);
-		when(videoInfo.getDirectPlayUrl()).thenReturn("http://www.example.com");
-		doNothing().when(activity).startActivityForResult(any(Intent.class),
-				anyInt());
-		player = new ViMuPlayer(videoInfo, activity);
-	}
-
-	@After
-	public void tearDown() {
-
-	}
-
-	@Test
-	public void createsExpectedIntentExtraTitle() {
-		Intent intent = player.createIntent();
-		assertThat(intent).hasExtra("forcename");
-	}
-
-	@Test
-	public void hasStartFromWhenVideoIsPartiallyWatched() {
-		when(videoInfo.getResumeOffset()).thenReturn(10);
-		when(videoInfo.isPartiallyWatched()).thenReturn(true);
-		Intent intent = player.createIntent();
-		assertThat(intent).hasExtra("startfrom");
-	}
-
-	@Test
-	public void subtitleSupportIsEnabled() {
-		when(subtitle.getFormat()).thenReturn("srt");
-		when(subtitle.getKey()).thenReturn("http://www.example.com/");
-		when(videoInfo.getSubtitle()).thenReturn(subtitle);
-
-		Intent intent = player.createIntent();
-		assertThat(intent).hasExtra("forcedsrt");
-	}
-
-	@Test
-	public void supportsResume() {
-		assertThat(player.supportsResume()).isTrue();
-	}
-
-	@Test
-	public void supportsPlaybackPosition() {
-		assertThat(player.supportsPlaybackPosition()).isTrue();
-	}
-
-	@Test
-	public void supportsSubtitleUrls() {
-		assertThat(player.supportsSubtitleUrls()).isTrue();
-	}
-
-	@Test
-	public void hasTitleSupport() {
-		assertThat(player.hasTitleSupport()).isTrue();
-	}
-
-	@Test
-	public void hasHardwareDecoding() {
-		assertThat(player.hasHardwareDecodingSupport()).isTrue();
-	}
-
-	@Test
-	public void disabledHardWareEncoding() {
-		player.enableHardwareDecodinging();
-		player.disableHadwareDecoding();
-		Intent intent = player.createIntent();
-		assertThat(intent.getIntExtra("decode_mode", 0)).isEqualTo(0);
-	}
-
-	@Test
-	public void activityIsLaunched() {
-		player.launch();
-		verify(activity).startActivityForResult(any(Intent.class), anyInt());
-	}
-
-}
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/imageloader/BackgroundBitmapDisplayerTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/imageloader/BackgroundBitmapDisplayerTest.java
index aaccaba7b..982310f24 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/imageloader/BackgroundBitmapDisplayerTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/imageloader/BackgroundBitmapDisplayerTest.java
@@ -23,16 +23,20 @@
 
 package us.nineworlds.serenity.core.imageloader;
 
+import static org.assertj.android.api.Assertions.assertThat;
+import static org.mockito.MockitoAnnotations.initMocks;
+import static org.robolectric.RuntimeEnvironment.application;
+
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.graphics.Bitmap;
 import android.graphics.drawable.TransitionDrawable;
 import android.preference.PreferenceManager;
-import androidx.core.graphics.drawable.DrawableCompat;
 import android.view.View;
 import android.view.animation.Animation;
 
 import androidx.test.core.app.ApplicationProvider;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,12 +48,6 @@
 
 import us.nineworlds.serenity.R;
 
-import static org.assertj.android.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.MockitoAnnotations.initMocks;
-import static org.robolectric.RuntimeEnvironment.application;
-import static org.robolectric.Shadows.shadowOf;
-
 @RunWith(RobolectricTestRunner.class)
 @LooperMode(LooperMode.Mode.LEGACY)
 public class BackgroundBitmapDisplayerTest {
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/DialogMenuItemTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/DialogMenuItemTest.java
index ee3e0673a..e252b1fd3 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/DialogMenuItemTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/DialogMenuItemTest.java
@@ -23,11 +23,11 @@
 
 package us.nineworlds.serenity.core.menus;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
 public class DialogMenuItemTest {
 
 	DialogMenuItem dialogMenuItem;
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/MenuDrawerItemImplTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/MenuDrawerItemImplTest.java
index 373124eb4..6ce82420b 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/MenuDrawerItemImplTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/MenuDrawerItemImplTest.java
@@ -23,12 +23,12 @@
 
 package us.nineworlds.serenity.core.menus;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
 import org.junit.Test;
 
 import us.nineworlds.serenity.R;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
 public class MenuDrawerItemImplTest {
 
 	MenuDrawerItem menuItem;
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/MenuItemTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/MenuItemTest.java
index 0773b9ca6..1d038b7ee 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/MenuItemTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/menus/MenuItemTest.java
@@ -23,11 +23,11 @@
 
 package us.nineworlds.serenity.core.menus;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
 public class MenuItemTest {
 
 	MenuItem menuItem;
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/CategoryMediaContainerTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/CategoryMediaContainerTest.java
index 8acf6556f..4fa9f4fc2 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/CategoryMediaContainerTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/CategoryMediaContainerTest.java
@@ -23,24 +23,24 @@
 
 package us.nineworlds.serenity.core.model.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 import us.nineworlds.serenity.TestingModule;
 import us.nineworlds.serenity.core.model.CategoryInfo;
 import us.nineworlds.serenity.emby.model.Directory;
 import us.nineworlds.serenity.emby.model.MediaContainer;
 import us.nineworlds.serenity.test.InjectingTest;
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.doReturn;
 
 @RunWith(RobolectricTestRunner.class)
 public class CategoryMediaContainerTest extends InjectingTest {
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/EpisodeMediaContainerTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/EpisodeMediaContainerTest.java
index 45242c947..60b770da0 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/EpisodeMediaContainerTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/EpisodeMediaContainerTest.java
@@ -23,12 +23,13 @@
 
 package us.nineworlds.serenity.core.model.impl;
 
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
 
 import android.content.res.Resources;
+
 import androidx.test.core.app.ApplicationProvider;
+
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -39,6 +40,11 @@
 import org.robolectric.RobolectricTestRunner;
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
 import toothpick.config.Module;
 import us.nineworlds.serenity.TestingModule;
 import us.nineworlds.serenity.common.rest.SerenityClient;
@@ -47,9 +53,6 @@
 import us.nineworlds.serenity.emby.model.Video;
 import us.nineworlds.serenity.test.InjectingTest;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.doReturn;
-
 @RunWith(RobolectricTestRunner.class)
 @Ignore
 public class EpisodeMediaContainerTest extends InjectingTest {
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainerTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainerTest.java
index 27ceb27d8..4e9fa6daa 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainerTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/MenuMediaContainerTest.java
@@ -23,19 +23,26 @@
 
 package us.nineworlds.serenity.core.model.impl;
 
-import java.util.ArrayList;
-import java.util.List;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.doReturn;
 
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.preference.PreferenceManager;
+
 import androidx.test.core.app.ApplicationProvider;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import toothpick.config.Module;
 import us.nineworlds.serenity.TestingModule;
 import us.nineworlds.serenity.common.media.model.IDirectory;
@@ -43,10 +50,6 @@
 import us.nineworlds.serenity.core.menus.MenuItem;
 import us.nineworlds.serenity.test.InjectingTest;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.doReturn;
-
 @RunWith(RobolectricTestRunner.class)
 public class MenuMediaContainerTest extends InjectingTest {
 
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/MovieMediaContainerTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/MovieMediaContainerTest.java
index 3c787686d..9ae91964a 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/MovieMediaContainerTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/MovieMediaContainerTest.java
@@ -23,9 +23,9 @@
 
 package us.nineworlds.serenity.core.model.impl;
 
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -35,6 +35,11 @@
 import org.mockito.MockitoAnnotations;
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
 import toothpick.config.Module;
 import us.nineworlds.serenity.common.rest.SerenityClient;
 import us.nineworlds.serenity.core.model.VideoContentInfo;
@@ -43,9 +48,6 @@
 import us.nineworlds.serenity.test.InjectingTest;
 import us.nineworlds.serenity.testrunner.PlainAndroidRunner;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.doReturn;
-
 @RunWith(PlainAndroidRunner.class)
 @Ignore("Rework so that it doesn't use xml serialization")
 public class MovieMediaContainerTest extends InjectingTest {
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/SeasonsMediaContainerTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/SeasonsMediaContainerTest.java
index 0f68629b3..bcf4220b3 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/SeasonsMediaContainerTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/SeasonsMediaContainerTest.java
@@ -23,9 +23,9 @@
 
 package us.nineworlds.serenity.core.model.impl;
 
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -35,6 +35,11 @@
 import org.mockito.MockitoAnnotations;
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
 import toothpick.config.Module;
 import us.nineworlds.serenity.common.rest.SerenityClient;
 import us.nineworlds.serenity.core.model.SeriesContentInfo;
@@ -44,9 +49,6 @@
 import us.nineworlds.serenity.test.InjectingTest;
 import us.nineworlds.serenity.testrunner.PlainAndroidRunner;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.doReturn;
-
 @RunWith(PlainAndroidRunner.class)
 @Ignore("Rework to not require xml serialization")
 public class SeasonsMediaContainerTest extends InjectingTest {
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/SeriesMediaContainerTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/SeriesMediaContainerTest.java
index dbc880bc1..eb8998761 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/SeriesMediaContainerTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/model/impl/SeriesMediaContainerTest.java
@@ -23,9 +23,9 @@
 
 package us.nineworlds.serenity.core.model.impl;
 
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -35,6 +35,11 @@
 import org.mockito.MockitoAnnotations;
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
 import toothpick.config.Module;
 import us.nineworlds.serenity.common.rest.SerenityClient;
 import us.nineworlds.serenity.core.model.SeriesContentInfo;
@@ -44,9 +49,6 @@
 import us.nineworlds.serenity.test.InjectingTest;
 import us.nineworlds.serenity.testrunner.PlainAndroidRunner;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.doReturn;
-
 @RunWith(PlainAndroidRunner.class)
 @Ignore("Rework to not use XML Serialization")
 public class SeriesMediaContainerTest extends InjectingTest {
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/services/MovieSearchIntentServiceTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/services/MovieSearchIntentServiceTest.java
index b7b1e6d90..dddb9ddf8 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/services/MovieSearchIntentServiceTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/services/MovieSearchIntentServiceTest.java
@@ -23,19 +23,21 @@
 
 package us.nineworlds.serenity.core.services;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
 import android.content.Intent;
-import java.util.List;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.robolectric.RobolectricTestRunner;
+
+import java.util.List;
+
 import us.nineworlds.serenity.TestingModule;
 import us.nineworlds.serenity.core.model.VideoContentInfo;
 import us.nineworlds.serenity.test.InjectingTest;
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
 
 @RunWith(RobolectricTestRunner.class)
 public class MovieSearchIntentServiceTest extends InjectingTest {
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/core/util/TimeUtilsTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/core/util/TimeUtilsTest.java
index 196cd8db8..3881ff36e 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/core/util/TimeUtilsTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/core/util/TimeUtilsTest.java
@@ -23,6 +23,8 @@
 
 package us.nineworlds.serenity.core.util;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -31,8 +33,6 @@
 import java.util.Date;
 import java.util.TimeZone;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
 public class TimeUtilsTest {
 
 	TimeUtil timeUtil;
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/test/InjectingTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/test/InjectingTest.java
index 2cb76ed6f..760482d58 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/test/InjectingTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/test/InjectingTest.java
@@ -25,9 +25,9 @@
 
 import org.junit.After;
 import org.junit.Before;
+
 import toothpick.Scope;
 import toothpick.Toothpick;
-import toothpick.config.Module;
 import us.nineworlds.serenity.common.annotations.InjectionConstants;
 
 public abstract class InjectingTest {
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/test/ShadowSubtitleView.java b/serenity-app/src/test/java/us/nineworlds/serenity/test/ShadowSubtitleView.java
index 950e00033..5ff68ba39 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/test/ShadowSubtitleView.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/test/ShadowSubtitleView.java
@@ -2,6 +2,7 @@
 
 import com.google.android.exoplayer2.ui.CaptionStyleCompat;
 import com.google.android.exoplayer2.ui.SubtitleView;
+
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.RealObject;
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/test/shadows/DoNothingShadowSQLiteConnection.java b/serenity-app/src/test/java/us/nineworlds/serenity/test/shadows/DoNothingShadowSQLiteConnection.java
index 4c5a40482..32ccf8666 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/test/shadows/DoNothingShadowSQLiteConnection.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/test/shadows/DoNothingShadowSQLiteConnection.java
@@ -2,6 +2,7 @@
 
 import android.database.sqlite.SQLiteConnection;
 import android.database.sqlite.SQLiteCustomFunction;
+
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.Resetter;
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/ui/adapters/AbstractPosterImageGalleryAdapterTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/ui/adapters/AbstractPosterImageGalleryAdapterTest.java
index fdf7635c4..d1fce6c88 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/ui/adapters/AbstractPosterImageGalleryAdapterTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/ui/adapters/AbstractPosterImageGalleryAdapterTest.java
@@ -23,17 +23,18 @@
 
 package us.nineworlds.serenity.ui.adapters;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.preference.PreferenceManager;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
-import java.util.ArrayList;
-import java.util.LinkedList;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.test.core.app.ApplicationProvider;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,6 +44,9 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.LooperMode;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+
 import toothpick.config.Module;
 import us.nineworlds.serenity.MainActivity;
 import us.nineworlds.serenity.TestingModule;
@@ -51,8 +55,6 @@
 import us.nineworlds.serenity.injection.ForVideoQueue;
 import us.nineworlds.serenity.test.InjectingTest;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
 @RunWith(RobolectricTestRunner.class)
 @Config(qualifiers = "large")
 @LooperMode(LooperMode.Mode.LEGACY)
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/ui/adapters/MenuDrawerAdapterTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/ui/adapters/MenuDrawerAdapterTest.java
index 30bdfa6be..f0da0fa41 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/ui/adapters/MenuDrawerAdapterTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/ui/adapters/MenuDrawerAdapterTest.java
@@ -23,6 +23,9 @@
 
 package us.nineworlds.serenity.ui.adapters;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.robolectric.RuntimeEnvironment.application;
+
 import android.app.Activity;
 import android.view.View;
 import android.widget.FrameLayout;
@@ -34,7 +37,6 @@
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,9 +44,6 @@
 import us.nineworlds.serenity.core.menus.MenuDrawerItem;
 import us.nineworlds.serenity.core.menus.MenuDrawerItemImpl;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.robolectric.RuntimeEnvironment.application;
-
 @RunWith(RobolectricTestRunner.class)
 public class MenuDrawerAdapterTest {
 
diff --git a/serenity-app/src/test/java/us/nineworlds/serenity/ui/views/statusoverlayview/StatusOverlayFrameLayoutTest.java b/serenity-app/src/test/java/us/nineworlds/serenity/ui/views/statusoverlayview/StatusOverlayFrameLayoutTest.java
index a1298ad65..d4b08a71b 100644
--- a/serenity-app/src/test/java/us/nineworlds/serenity/ui/views/statusoverlayview/StatusOverlayFrameLayoutTest.java
+++ b/serenity-app/src/test/java/us/nineworlds/serenity/ui/views/statusoverlayview/StatusOverlayFrameLayoutTest.java
@@ -1,6 +1,9 @@
 package us.nineworlds.serenity.ui.views.statusoverlayview;
 
+import static org.assertj.android.api.Assertions.assertThat;
+
 import android.app.Activity;
+
 import org.assertj.core.api.Java6Assertions;
 import org.junit.After;
 import org.junit.Before;
@@ -9,8 +12,6 @@
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
-import static org.assertj.android.api.Assertions.assertThat;
-
 @RunWith(RobolectricTestRunner.class)
 public class StatusOverlayFrameLayoutTest {
 
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/EpisodesRetrievalJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/EpisodesRetrievalJobTest.kt
index 5bd557a02..258d72186 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/EpisodesRetrievalJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/EpisodesRetrievalJobTest.kt
@@ -16,7 +16,6 @@ import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.events.EpisodesRetrievalEvent
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieCategoryJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieCategoryJobTest.kt
index 86cd426a1..25096205d 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieCategoryJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieCategoryJobTest.kt
@@ -16,7 +16,6 @@ import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.events.MainCategoryEvent
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieRetrievalJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieRetrievalJobTest.kt
index b59a45d7f..696d545cb 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieRetrievalJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieRetrievalJobTest.kt
@@ -17,7 +17,6 @@ import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.events.MovieRetrievalEvent
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieSecondaryCategoryJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieSecondaryCategoryJobTest.kt
index aedf3e0f2..1948adeb9 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieSecondaryCategoryJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/MovieSecondaryCategoryJobTest.kt
@@ -17,7 +17,6 @@ import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.events.MovieSecondaryCategoryEvent
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/RetrieveAllUsersJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/RetrieveAllUsersJobTest.kt
index b7f37c4ab..1ac1d77aa 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/RetrieveAllUsersJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/RetrieveAllUsersJobTest.kt
@@ -15,7 +15,6 @@ import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.events.users.AllUsersEvent
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/SeasonsRetrievalJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/SeasonsRetrievalJobTest.kt
index efdeebf11..24a047176 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/SeasonsRetrievalJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/SeasonsRetrievalJobTest.kt
@@ -12,13 +12,10 @@ import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnit
 import org.mockito.quality.Strictness.STRICT_STUBS
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.LooperMode
 import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.events.SeasonsRetrievalEvent
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(AndroidJUnit4::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVCategoryJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVCategoryJobTest.kt
index c450b555b..5a4dd6f57 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVCategoryJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVCategoryJobTest.kt
@@ -16,7 +16,6 @@ import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.events.TVCategoryEvent
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVCategorySecondaryJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVCategorySecondaryJobTest.kt
index 7a89f42b7..b815cfc16 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVCategorySecondaryJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVCategorySecondaryJobTest.kt
@@ -17,7 +17,6 @@ import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.events.TVCategorySecondaryEvent
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVShowsRetrievalJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVShowsRetrievalJobTest.kt
index 1ff5e2907..ca2c0173a 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVShowsRetrievalJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/TVShowsRetrievalJobTest.kt
@@ -16,7 +16,6 @@ import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.events.TVShowRetrievalEvent
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/AuthenticateUserJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/AuthenticateUserJobTest.kt
index 526178700..17870351d 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/AuthenticateUserJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/AuthenticateUserJobTest.kt
@@ -18,7 +18,6 @@ import us.nineworlds.serenity.common.rest.SerenityUser
 import us.nineworlds.serenity.events.users.AuthenticatedUserEvent
 import us.nineworlds.serenity.jobs.AuthenticateUserJob
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/StartPlaybackJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/StartPlaybackJobTest.kt
index 878d944ea..8c475b3d4 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/StartPlaybackJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/StartPlaybackJobTest.kt
@@ -16,7 +16,6 @@ import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.jobs.video.StartPlaybackJob
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/StopPlaybackJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/StopPlaybackJobTest.kt
index 9d0e75ddc..a548aa975 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/StopPlaybackJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/StopPlaybackJobTest.kt
@@ -19,7 +19,6 @@ import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.jobs.video.StopPlaybackJob
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/UpdatePlaybackPositionJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/UpdatePlaybackPositionJobTest.kt
index e3a430093..2cf57655c 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/UpdatePlaybackPositionJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/UpdatePlaybackPositionJobTest.kt
@@ -17,7 +17,6 @@ import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.core.model.impl.MoviePosterInfo
 import us.nineworlds.serenity.jobs.video.UpdatePlaybackPostionJob
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/WatchedStatusJobTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/WatchedStatusJobTest.kt
index c0c60a43a..fa8c0cf57 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/WatchedStatusJobTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/jobs/videos/WatchedStatusJobTest.kt
@@ -13,7 +13,6 @@ import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.jobs.video.WatchedStatusJob
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/test/util/FragmentTestUtil.java b/serenity-app/src/test/kotlin/us/nineworlds/serenity/test/util/FragmentTestUtil.java
index 0414d95ef..0a17e5bf9 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/test/util/FragmentTestUtil.java
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/test/util/FragmentTestUtil.java
@@ -1,6 +1,8 @@
 package us.nineworlds.serenity.test.util;
 
 
+import static org.robolectric.shadows.ShadowLooper.shadowMainLooper;
+
 import android.os.Bundle;
 import android.widget.LinearLayout;
 
@@ -10,8 +12,6 @@
 
 import org.robolectric.Robolectric;
 
-import static org.robolectric.shadows.ShadowLooper.shadowMainLooper;
-
 public final class FragmentTestUtil {
   
   public static void startFragment(Fragment fragment) {
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/ServerSelectionActivityTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/ServerSelectionActivityTest.kt
index 14dbebe80..fccf3e880 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/ServerSelectionActivityTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/ServerSelectionActivityTest.kt
@@ -19,7 +19,6 @@ import org.robolectric.Robolectric
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows.shadowOf
 import org.robolectric.annotation.LooperMode
-import org.robolectric.plugins.LegacyDependencyResolver
 import toothpick.config.Module
 import us.nineworlds.serenity.R
 import us.nineworlds.serenity.TestingModule
@@ -30,11 +29,10 @@ import us.nineworlds.serenity.injection.ServerClientPreference
 import us.nineworlds.serenity.injection.ServerIPPreference
 import us.nineworlds.serenity.injection.ServerPortPreference
 import us.nineworlds.serenity.injection.modules.AndroidModule
-import us.nineworlds.serenity.injection.modules.SerenityModule
 import us.nineworlds.serenity.injection.modules.providers.ServerClientPreferenceProvider
 import us.nineworlds.serenity.test.InjectingTest
 import us.nineworlds.serenity.ui.activity.login.LoginUserActivity
-import java.util.*
+import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/login/LoginRepositoryTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/login/LoginRepositoryTest.kt
index b228cfe69..7248a76e7 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/login/LoginRepositoryTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/login/LoginRepositoryTest.kt
@@ -2,7 +2,11 @@ package us.nineworlds.serenity.ui.activity.login
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
-import com.nhaarman.mockitokotlin2.*
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doReturn
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.resetMain
@@ -10,9 +14,9 @@ import kotlinx.coroutines.test.setMain
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import us.nineworlds.serenity.common.repository.Result
 import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.common.rest.SerenityUser
-import us.nineworlds.serenity.common.repository.Result
 import us.nineworlds.serenity.core.repository.LoginRepository
 
 class LoginRepositoryTest {
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserPresenterTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserPresenterTest.kt
index ae2fe5b07..5e526bdda 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserPresenterTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/login/LoginUserPresenterTest.kt
@@ -1,7 +1,11 @@
 package us.nineworlds.serenity.ui.activity.login
 
 import com.birbit.android.jobqueue.JobManager
-import com.nhaarman.mockitokotlin2.*
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.atLeastOnce
+import com.nhaarman.mockitokotlin2.doReturn
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.resetMain
@@ -23,7 +27,6 @@ import us.nineworlds.serenity.common.rest.SerenityClient
 import us.nineworlds.serenity.common.rest.SerenityUser
 import us.nineworlds.serenity.core.repository.LoginRepository
 import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.testrunner.PlainAndroidRunner
 import javax.inject.Inject
 
 @RunWith(RobolectricTestRunner::class)
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/manualentry/ManualServerActivityTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/manualentry/ManualServerActivityTest.kt
index 32d53eb30..f19744aaa 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/manualentry/ManualServerActivityTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/manualentry/ManualServerActivityTest.kt
@@ -7,8 +7,6 @@ import assertk.assertThat
 import assertk.assertions.isNotNull
 import com.nhaarman.mockitokotlin2.spy
 import com.nhaarman.mockitokotlin2.verify
-import org.junit.After
-
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/manualentry/ManualServerSettingsFragmentTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/manualentry/ManualServerSettingsFragmentTest.kt
index 3e5553c7d..d81d01e9d 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/manualentry/ManualServerSettingsFragmentTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/activity/manualentry/ManualServerSettingsFragmentTest.kt
@@ -10,7 +10,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.LooperMode
 import us.nineworlds.serenity.test.util.FragmentTestUtil
 
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/leanback/search/CardPresenterTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/leanback/search/CardPresenterTest.kt
index 5980fdd75..d4be0bfc7 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/leanback/search/CardPresenterTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/leanback/search/CardPresenterTest.kt
@@ -1,9 +1,9 @@
 package us.nineworlds.serenity.ui.leanback.search
 
 import android.app.Activity
-import androidx.leanback.widget.ImageCardView
-import androidx.core.content.ContextCompat
 import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
+import androidx.leanback.widget.ImageCardView
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.atLeast
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/util/ExternalPlayerResultHandlerTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/util/ExternalPlayerResultHandlerTest.kt
deleted file mode 100644
index 00c3e0b31..000000000
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/util/ExternalPlayerResultHandlerTest.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package us.nineworlds.serenity.ui.util
-
-import android.app.Activity
-import android.content.Intent
-import android.content.SharedPreferences
-import android.view.View
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
-import org.junit.After
-import org.junit.Before
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.mockito.junit.MockitoJUnit
-import org.mockito.quality.Strictness
-import org.robolectric.Robolectric
-import org.robolectric.RobolectricTestRunner
-import toothpick.config.Module
-import us.nineworlds.serenity.TestingModule
-import us.nineworlds.serenity.core.model.VideoContentInfo
-import us.nineworlds.serenity.injection.ForVideoQueue
-import us.nineworlds.serenity.test.InjectingTest
-import us.nineworlds.serenity.ui.adapters.AbstractPosterImageGalleryAdapter
-import java.util.*
-
-@RunWith(RobolectricTestRunner::class)
-class ExternalPlayerResultHandlerTest : InjectingTest() {
-
-  @Rule @JvmField public val rule = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS)
-
-  @Mock lateinit var mockVideoPlayerIntentUtils: VideoPlayerIntentUtils
-  @Mock lateinit var mockAbstractPosterImageGalleryAdapter: AbstractPosterImageGalleryAdapter
-  @Mock lateinit var mockSharedPreferences: SharedPreferences
-  @Mock lateinit var mockIntent: Intent
-  @Mock lateinit var mockVideoContentInfo: VideoContentInfo
-  @Mock lateinit var mockView: View
-  private var mockVideoQueue = LinkedList<VideoContentInfo>()
-
-  lateinit var resultHander: ExternalPlayerResultHandler
-  lateinit var activity: Activity
-
-  @Before override fun setUp() {
-    super.setUp()
-    activity = Robolectric.buildActivity(Activity::class.java).create().get()
-    resultHander = ExternalPlayerResultHandler(0, mockIntent, activity, mockAbstractPosterImageGalleryAdapter)
-  }
-
-  @After fun tearDown() {
-    activity.finish()
-  }
-
-  @Test fun updatePlaybackPositionUpdatesPlaybackPositionForMxPlayer() {
-    resultHander.extPlayerVideoQueueEnabled = false
-    resultHander.externalPlayerValue = "mxplayer"
-    doReturn("playback_completion").whenever(mockIntent).getStringExtra("end_by")
-    doReturn(100).whenever(mockVideoContentInfo).duration
-
-    resultHander.updatePlaybackPosition(mockVideoContentInfo, mockView)
-
-    verify(mockVideoContentInfo).resumeOffset = 100
-    verify(mockAbstractPosterImageGalleryAdapter).notifyDataSetChanged()
-    verify(mockIntent).getStringExtra("end_by")
-  }
-
-  @Test
-  @Ignore
-  fun updatePlaysNextVideoInQueue() {
-    resultHander.extPlayerVideoQueueEnabled = true
-    resultHander.externalPlayerValue = "mxplayer"
-    resultHander.resultCode = 100
-    doReturn("playback_completion").whenever(mockIntent).getStringExtra("end_by")
-    doReturn(100).whenever(mockVideoContentInfo).duration
-
-    resultHander.updatePlaybackPosition(mockVideoContentInfo, mockView)
-
-    verify(mockVideoContentInfo).resumeOffset = 100
-    verify(mockAbstractPosterImageGalleryAdapter).notifyDataSetChanged()
-    verify(mockIntent).getStringExtra("end_by")
-    verify(mockVideoPlayerIntentUtils).launchExternalPlayer(mockVideoContentInfo, activity, false)
-  }
-
-  override fun installTestModules() {
-    scope.installTestModules(TestingModule(), TestModule())
-  }
-
-  inner class TestModule : Module() {
-    init {
-      bind(VideoPlayerIntentUtils::class.java).toInstance(mockVideoPlayerIntentUtils)
-      bind(SharedPreferences::class.java).toInstance(mockSharedPreferences)
-      bind(LinkedList::class.java).withName(ForVideoQueue::class.java).toInstance(mockVideoQueue)
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/util/VideoPlayerIntentUtilsTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/util/VideoPlayerIntentUtilsTest.kt
index c3391fac4..3bc2ee41a 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/util/VideoPlayerIntentUtilsTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/util/VideoPlayerIntentUtilsTest.kt
@@ -2,30 +2,24 @@ package us.nineworlds.serenity.ui.util
 
 import android.app.Activity
 import android.content.SharedPreferences
-import com.nhaarman.mockitokotlin2.*
 import org.assertj.android.api.Assertions.assertThat
-import org.assertj.core.api.Assertions
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnit
 import org.mockito.quality.Strictness
 import org.robolectric.Robolectric
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows.shadowOf
-import org.robolectric.shadows.ShadowActivity
-import org.robolectric.shadows.ShadowAlertDialog
-import org.robolectric.shadows.ShadowToast
 import us.nineworlds.serenity.TestingModule
 import us.nineworlds.serenity.core.model.VideoContentInfo
 import us.nineworlds.serenity.core.util.TimeUtil
 import us.nineworlds.serenity.test.InjectingTest
 import us.nineworlds.serenity.ui.video.player.ExoplayerVideoActivity
-import java.util.*
+import java.util.LinkedList
 
 @RunWith(RobolectricTestRunner::class)
 class VideoPlayerIntentUtilsTest : InjectingTest() {
@@ -33,7 +27,7 @@ class VideoPlayerIntentUtilsTest : InjectingTest() {
     scope.installTestModules(TestingModule())
   }
 
-  @Rule @JvmField public val rule = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS)
+  @Rule @JvmField val rule = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS)
 
   lateinit var videoPlayerIntentUtils: VideoPlayerIntentUtils
 
@@ -59,55 +53,8 @@ class VideoPlayerIntentUtilsTest : InjectingTest() {
     activity = null
   }
 
-  @Test fun whenVideoQueueIsEmptyResumeOffsetIsNeverResetToZero() {
-    doReturn("http://www.example.com/example.mkv").whenever(mockVideoContentInfo).directPlayUrl
-    videoPlayerIntentUtils.launchExternalPlayer(mockVideoContentInfo, mockActivity, false );
-
-    verify(mockVideoContentInfo, never()).resumeOffset = 0
-  }
-
-  @Test fun whenVideoQueueIsNotEmptyAndExternalPlayerIsSetToDefaultResetVideoResumeOffset() {
-    videoQueue.add(mockVideoContentInfo)
-    doReturn("http://www.example.com/example.mkv").whenever(mockVideoContentInfo).directPlayUrl
-    doReturn("default").whenever(mockSharedPreferences).getString(anyString(), anyString())
-    videoPlayerIntentUtils.launchExternalPlayer(mockVideoContentInfo, mockActivity, false)
-
-    verify(mockVideoContentInfo).resumeOffset = 0
-    verify(mockSharedPreferences, atLeastOnce()).getString("serenity_external_player_filter", "default")
-  }
-
-  @Test fun showResumeDialogWhenVideoHasBeenPartiallyWatched() {
-    videoQueue.add(mockVideoContentInfo)
-    doReturn("mxplayer").whenever(mockSharedPreferences).getString(anyString(), anyString())
-    doReturn(true).whenever(mockVideoContentInfo).isPartiallyWatched
-
-    activity = Robolectric.setupActivity(Activity::class.java)
-
-    videoPlayerIntentUtils.launchExternalPlayer(mockVideoContentInfo, activity, false)
-
-    val latestAlertDialog = ShadowAlertDialog.getLatestAlertDialog()
-
-    assertThat(latestAlertDialog).isNotNull.isShowing
-    verify(mockVideoContentInfo).isPartiallyWatched
-  }
-
-  @Test fun playVideoClearsQueueAndDisplaysToastIfNotEmpty() {
-    videoQueue.add(mockVideoContentInfo)
-    doReturn(true).whenever(mockSharedPreferences).getBoolean("external_player", false)
-    doReturn("http://www.example.com/example.mkv").whenever(mockVideoContentInfo).directPlayUrl
-    doReturn("mxplayer").whenever(mockSharedPreferences).getString("serenity_external_player_filter", "default")
-
-    activity = Robolectric.setupActivity(Activity::class.java)
-
-    videoPlayerIntentUtils.playVideo(activity, mockVideoContentInfo, false)
-
-    Assertions.assertThat(videoQueue).isEmpty()
-    assertThat(ShadowToast.getLatestToast()).isNotNull
-  }
-
   @Test fun playVideoUsingInternalPlayerWhenExternalPlayerIsFalse() {
     videoQueue.add(mockVideoContentInfo)
-    doReturn(false).whenever(mockSharedPreferences).getBoolean("external_player", false)
 
     activity = Robolectric.setupActivity(Activity::class.java)
 
@@ -118,43 +65,4 @@ class VideoPlayerIntentUtilsTest : InjectingTest() {
     assertThat(shadowActivity.nextStartedActivity).isNotNull.hasComponent(activity, ExoplayerVideoActivity::class.java)
   }
 
-  @Test fun playVideosFromQueueWhenNotEmpty() {
-    videoQueue.add(mockVideoContentInfo)
-    doReturn(false).whenever(mockSharedPreferences).getBoolean("external_player", false)
-
-    activity = Robolectric.setupActivity(Activity::class.java)
-
-    videoPlayerIntentUtils.playAllFromQueue(activity)
-
-    val shadowActivity = shadowOf(activity)
-    assertThat(shadowActivity.nextStartedActivity).isNotNull.hasComponent(activity, ExoplayerVideoActivity::class.java)
-  }
-
-  @Test fun playVideosFromQueueWhenNotEmptyLaunchesExternalPlayer() {
-    videoQueue.add(mockVideoContentInfo)
-    doReturn(true).whenever(mockSharedPreferences).getBoolean("external_player", false)
-    doReturn(true).whenever(mockSharedPreferences).getBoolean("external_player_continuous_playback", false)
-    doReturn("http://www.example.com/example.mkv").whenever(mockVideoContentInfo).directPlayUrl
-
-    activity = Robolectric.setupActivity(Activity::class.java)
-
-    videoPlayerIntentUtils.playAllFromQueue(activity)
-
-    val shadowActivity = shadowOf(activity)
-    assertThat(shadowActivity.nextStartedActivity).isNotNull
-  }
-
-  @Test fun playVideosFromQueueWhenNotEmptyShowsToastWhenExternalPlayerDoesNotSupportContinuousPlayback() {
-    videoQueue.add(mockVideoContentInfo)
-    doReturn(true).whenever(mockSharedPreferences).getBoolean("external_player", false)
-    doReturn(false).whenever(mockSharedPreferences).getBoolean("external_player_continuous_playback", false)
-
-    activity = Robolectric.setupActivity(Activity::class.java)
-
-    videoPlayerIntentUtils.playAllFromQueue(activity)
-
-    assertThat(ShadowToast.getLatestToast()).isNotNull
-  }
-
-
 }
\ No newline at end of file
diff --git a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerVideoActivityTest.kt b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerVideoActivityTest.kt
index d4a73dd92..b3882f72b 100644
--- a/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerVideoActivityTest.kt
+++ b/serenity-app/src/test/kotlin/us/nineworlds/serenity/ui/video/player/ExoplayerVideoActivityTest.kt
@@ -8,7 +8,6 @@ import com.google.android.exoplayer2.source.MediaSource
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray
 import com.google.android.exoplayer2.trackselection.TrackSelector
 import com.google.android.exoplayer2.upstream.DataSource
-import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter
 import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.whenever
 import org.assertj.android.api.Assertions