Remove ClientConfig class (#7038)

3 files changed, 1 insertions, 29 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index d39015834..34672141c 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -5,9 +5,7 @@ import android.os.StrictMode;
 
 import com.google.android.material.color.DynamicColors;
 
-import de.danoeh.antennapod.config.ApplicationCallbacksImpl;
 import de.danoeh.antennapod.core.ApCoreEventBusIndex;
-import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.ClientConfigurator;
 import de.danoeh.antennapod.error.CrashReportWriter;
 import de.danoeh.antennapod.error.RxJavaErrorHandlerSetup;
@@ -17,18 +15,9 @@ import org.greenrobot.eventbus.EventBus;
 
 /** Main application class. */
 public class PodcastApp extends Application {
-
-    private static PodcastApp singleton;
-
-    public static PodcastApp getInstance() {
-        return singleton;
-    }
-
     @Override
     public void onCreate() {
         super.onCreate();
-        ClientConfig.applicationCallbacks = new ApplicationCallbacksImpl();
-
         Thread.setDefaultUncaughtExceptionHandler(new CrashReportWriter());
         RxJavaErrorHandlerSetup.setupRxJavaErrorHandler();
 
@@ -43,8 +32,6 @@ public class PodcastApp extends Application {
             StrictMode.setVmPolicy(builder.build());
         }
 
-        singleton = this;
-
         ClientConfigurator.initialize(this);
         PreferenceUpgrader.checkUpgrades(this);
 
diff --git a/app/src/main/java/de/danoeh/antennapod/config/ApplicationCallbacksImpl.java b/app/src/main/java/de/danoeh/antennapod/config/ApplicationCallbacksImpl.java
deleted file mode 100644
index e9dfd66e0..000000000
--- a/app/src/main/java/de/danoeh/antennapod/config/ApplicationCallbacksImpl.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.danoeh.antennapod.config;
-
-
-import android.app.Application;
-
-import de.danoeh.antennapod.PodcastApp;
-import de.danoeh.antennapod.core.ApplicationCallbacks;
-
-public class ApplicationCallbacksImpl implements ApplicationCallbacks {
-
-    @Override
-    public Application getApplicationInstance() {
-        return PodcastApp.getInstance();
-    }
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index 4ffc72699..b4b6112ff 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -20,7 +20,7 @@ import de.danoeh.antennapod.storage.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.util.FeedUtil;
 import de.danoeh.antennapod.core.service.playback.PlaybackServiceInterface;
 import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.core.sync.SynchronizationSettings;
+import de.danoeh.antennapod.storage.preferences.SynchronizationSettings;
 import de.danoeh.antennapod.core.sync.queue.SynchronizationQueueSink;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.core.util.IntentUtils;