move the initialization call to CastManager

3 files changed, 12 insertions, 20 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/ClientConfig.java b/core/src/main/java/de/danoeh/antennapod/core/ClientConfig.java
index d7735b34e..3dfd6ea65 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/ClientConfig.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/ClientConfig.java
@@ -2,10 +2,10 @@ package de.danoeh.antennapod.core;
 
 import android.content.Context;
 
+import de.danoeh.antennapod.core.cast.CastManager;
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.PodDBAdapter;
-import de.danoeh.antennapod.core.util.CastUtils;
 import de.danoeh.antennapod.core.util.NetworkUtils;
 
 /**
@@ -44,7 +44,7 @@ public class ClientConfig {
         UpdateManager.init(context);
         PlaybackPreferences.init(context);
         NetworkUtils.init(context);
-        CastUtils.initializeCastManager(context);
+        CastManager.init(context);
         initialized = true;
     }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/cast/CastManager.java b/core/src/main/java/de/danoeh/antennapod/core/cast/CastManager.java
index 7094017db..870ff9a36 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/cast/CastManager.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/cast/CastManager.java
@@ -31,6 +31,7 @@ import android.view.KeyEvent;
 import com.google.android.gms.cast.ApplicationMetadata;
 import com.google.android.gms.cast.Cast;
 import com.google.android.gms.cast.CastDevice;
+import com.google.android.gms.cast.CastMediaControlIntent;
 import com.google.android.gms.cast.CastStatusCodes;
 import com.google.android.gms.cast.MediaInfo;
 import com.google.android.gms.cast.MediaQueueItem;
@@ -67,9 +68,8 @@ import static com.google.android.gms.cast.RemoteMediaPlayer.RESUME_STATE_UNCHANG
  * needed).
  * <p>
  * Clients need to initialize this class by calling
- * {@link #initialize(android.content.Context, CastConfiguration)} in the Application's
- * {@code onCreate()} method. All configurable parameters are encapsulates in the
- * {@link CastConfiguration} parameter. To access the (singleton) instance of this class, clients
+ * {@link #init(android.content.Context)} in the Application's
+ * {@code onCreate()} method. To access the (singleton) instance of this class, clients
  * need to call {@link #getInstance()}.
  * <p>This
  * class manages various states of the remote cast device. Client applications, however, can
@@ -89,6 +89,8 @@ import static com.google.android.gms.cast.RemoteMediaPlayer.RESUME_STATE_UNCHANG
 public class CastManager extends BaseCastManager implements OnFailedListener {
     public static final String TAG = "CastManager";
 
+    public static final String CAST_APP_ID = CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID;
+
     public static final double DEFAULT_VOLUME_STEP = 0.05;
     public static final long DEFAULT_LIVE_STREAM_DURATION_MS = TimeUnit.HOURS.toMillis(2);
     private double mVolumeStep = DEFAULT_VOLUME_STEP;
@@ -129,9 +131,12 @@ public class CastManager extends BaseCastManager implements OnFailedListener {
         }
     }
 
-    public static synchronized CastManager initialize(Context context,
-                                                           CastConfiguration castConfiguration) {
+    public static synchronized CastManager init(Context context) {
         if (INSTANCE == null) {
+            CastConfiguration castConfiguration = new CastConfiguration.Builder(CAST_APP_ID)
+                    .enableDebug()
+                    .enableAutoReconnect()
+                    .build();
             Log.d(TAG, "New instance of CastManager is created");
             if (ConnectionResult.SUCCESS != GoogleApiAvailability.getInstance()
                     .isGooglePlayServicesAvailable(context)) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/CastUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/CastUtils.java
index aa60afd3d..9f41317da 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/CastUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/CastUtils.java
@@ -1,15 +1,12 @@
 package de.danoeh.antennapod.core.util;
 
-import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
 
 import com.google.android.gms.cast.CastDevice;
-import com.google.android.gms.cast.CastMediaControlIntent;
 import com.google.android.gms.cast.MediaInfo;
 import com.google.android.gms.cast.MediaMetadata;
 import com.google.android.gms.common.images.WebImage;
-import com.google.android.libraries.cast.companionlibrary.cast.CastConfiguration;
 
 import java.util.Calendar;
 
@@ -26,18 +23,8 @@ import de.danoeh.antennapod.core.util.playback.Playable;
 public class CastUtils {
     private static final String TAG = "CastUtils";
 
-    public static final String CAST_APP_ID = CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID;
-
     public static final String KEY_MEDIA_ID = "CastUtils.Id";
 
-    public static void initializeCastManager(Context context){
-        CastManager.initialize(context, new CastConfiguration.Builder(CastUtils.CAST_APP_ID)
-                .enableDebug()
-                .enableWifiReconnection()
-                .enableAutoReconnect()
-                .build());
-    }
-
     public static boolean isCastable(Playable media){
         if (media == null || media instanceof ExternalMedia) {
             return false;