2 files changed, 55 insertions, 14 deletions

diff --git a/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java b/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java
index 87304b3d6..caca8a6e3 100644
--- a/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java
+++ b/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java
@@ -29,17 +29,34 @@ public abstract class CastEnabledActivity extends AppCompatActivity
         implements SharedPreferences.OnSharedPreferenceChangeListener {
     public static final String TAG = "CastEnabledActivity";
 
-    protected CastManager castManager;
-    protected SwitchableMediaRouteActionProvider mediaRouteActionProvider;
+    private CastConsumer castConsumer;
+    private CastManager castManager;
+
+    private SwitchableMediaRouteActionProvider mediaRouteActionProvider;
     private final CastButtonVisibilityManager castButtonVisibilityManager = new CastButtonVisibilityManager();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (!CastManager.isInitialized()) {
+            return;
+        }
+
         PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).
                 registerOnSharedPreferenceChangeListener(this);
 
+        castConsumer = new DefaultCastConsumer() {
+            @Override
+            public void onApplicationConnected(ApplicationMetadata appMetadata, String sessionId, boolean wasLaunched) {
+                onCastConnectionChanged(true);
+            }
+
+            @Override
+            public void onDisconnected() {
+                onCastConnectionChanged(false);
+            }
+        };
         castManager = CastManager.getInstance();
         castManager.addCastConsumer(castConsumer);
         castButtonVisibilityManager.setPrefEnabled(UserPreferences.isCastEnabled());
@@ -48,6 +65,10 @@ public abstract class CastEnabledActivity extends AppCompatActivity
 
     @Override
     protected void onDestroy() {
+        if (!CastManager.isInitialized()) {
+            super.onDestroy();
+            return;
+        }
         PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
                 .unregisterOnSharedPreferenceChangeListener(this);
         castManager.removeCastConsumer(castConsumer);
@@ -58,6 +79,9 @@ public abstract class CastEnabledActivity extends AppCompatActivity
     @CallSuper
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
+        if (!CastManager.isInitialized()) {
+            return true;
+        }
         getMenuInflater().inflate(R.menu.cast_enabled, menu);
         castButtonVisibilityManager.setMenu(menu);
         return true;
@@ -67,6 +91,10 @@ public abstract class CastEnabledActivity extends AppCompatActivity
     @CallSuper
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
+        if (!CastManager.isInitialized()) {
+            return true;
+        }
+
         MenuItem mediaRouteButton = menu.findItem(R.id.media_route_menu_item);
         if (mediaRouteButton == null) {
             Log.wtf(TAG, "MediaRoute item could not be found on the menu!", new Exception());
@@ -83,15 +111,22 @@ public abstract class CastEnabledActivity extends AppCompatActivity
     @Override
     protected void onResume() {
         super.onResume();
+        if (!CastManager.isInitialized()) {
+            return;
+        }
         castButtonVisibilityManager.setResumed(true);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
+        if (!CastManager.isInitialized()) {
+            return;
+        }
         castButtonVisibilityManager.setResumed(false);
     }
 
+
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         if (UserPreferences.PREF_CAST_ENABLED.equals(key)) {
@@ -105,18 +140,6 @@ public abstract class CastEnabledActivity extends AppCompatActivity
         }
     }
 
-    CastConsumer castConsumer = new DefaultCastConsumer() {
-        @Override
-        public void onApplicationConnected(ApplicationMetadata appMetadata, String sessionId, boolean wasLaunched) {
-            onCastConnectionChanged(true);
-        }
-
-        @Override
-        public void onDisconnected() {
-            onCastConnectionChanged(false);
-        }
-    };
-
     private void onCastConnectionChanged(boolean connected) {
         if (connected) {
             castButtonVisibilityManager.onConnected();
@@ -133,6 +156,9 @@ public abstract class CastEnabledActivity extends AppCompatActivity
      * @param showAsAction refer to {@link MenuItem#setShowAsAction(int)}
      */
     public final void requestCastButton(int showAsAction) {
+        if (!CastManager.isInitialized()) {
+            return;
+        }
         castButtonVisibilityManager.requestCastButton(showAsAction);
     }
 
diff --git a/app/src/play/java/de/danoeh/antennapod/preferences/PreferenceControllerFlavorHelper.java b/app/src/play/java/de/danoeh/antennapod/preferences/PreferenceControllerFlavorHelper.java
index c9d52df0c..0e69da61e 100644
--- a/app/src/play/java/de/danoeh/antennapod/preferences/PreferenceControllerFlavorHelper.java
+++ b/app/src/play/java/de/danoeh/antennapod/preferences/PreferenceControllerFlavorHelper.java
@@ -1,8 +1,13 @@
 package de.danoeh.antennapod.preferences;
 
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AlertDialog;
+
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
+import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.fragment.preferences.PlaybackPreferencesFragment;
 
@@ -18,6 +23,7 @@ public class PreferenceControllerFlavorHelper {
                 final int googlePlayServicesCheck = GoogleApiAvailability.getInstance()
                         .isGooglePlayServicesAvailable(ui.getActivity());
                 if (googlePlayServicesCheck == ConnectionResult.SUCCESS) {
+                    displayRestartRequiredDialog(ui.requireContext());
                     return true;
                 } else {
                     GoogleApiAvailability.getInstance()
@@ -29,4 +35,13 @@ public class PreferenceControllerFlavorHelper {
             return true;
         });
     }
+
+    private static void displayRestartRequiredDialog(@NonNull Context context) {
+        AlertDialog.Builder dialog = new AlertDialog.Builder(context);
+        dialog.setTitle(android.R.string.dialog_alert_title);
+        dialog.setMessage(R.string.pref_restart_required);
+        dialog.setPositiveButton(android.R.string.ok, null);
+        dialog.setCancelable(false);
+        dialog.show();
+    }
 }