Only show wear purchase popup after initial setup is complete. Only slide player fragment up when it's being shown from the main fragment.

Author: Chris Bellew

mobile/src/main/java/com/atomjack/vcfp/activities/MainActivity.java

@@ -191,6 +191,10 @@ public class MainActivity extends AppCompatActivity
 
   private boolean userIsInteracting;
 
+  // This will be set to true if wear support is purchased immediately upon launch before
+  // initial setup has been done, to delay the wear purchase popup until after that has finished
+  private boolean showWearPurchase = false;
+
   // First time setup
   private boolean doingFirstTimeSetup = false;
   // The next two booleans will be set to true when their respective scans are finished. This will ensure
@@ -444,6 +448,11 @@ private void init() {
 
       setupNavigationDrawer();
 
+      //
+      if(showWearPurchase) {
+        showWearPurchase = false;
+        showWearPurchase();
+      }
       Logger.d("[MainActivity] Intent action: %s", getIntent().getAction());
       if(getIntent().getAction() != null && getIntent().getAction().equals(ACTION_SHOW_NOW_PLAYING)) {
         handleShowNowPlayingIntent(getIntent());
@@ -840,7 +849,7 @@ public void onDrawerClosed(View drawerView) {
 
 
     };
-    mDrawer.setDrawerListener(drawerToggle);
+    mDrawer.addDrawerListener(drawerToggle);
     // Find our drawer view
     if(navigationViewMain == null)
       navigationViewMain = (NavigationView) findViewById(R.id.navigationViewMain);
@@ -1013,8 +1022,16 @@ protected void onNewIntent(Intent intent) {
         if(VoiceControlForPlexApplication.getInstance().hasWear()) {
           hidePurchaseWearMenuItem();
         } else {
-          if (prefs.get(Preferences.HAS_SHOWN_WEAR_PURCHASE_POPUP, false) == false)
-            showWearPurchase();
+          if (prefs.get(Preferences.HAS_SHOWN_WEAR_PURCHASE_POPUP, false) == false) {
+            // If wear support has been purchased before initial setup has been done, the navigation drawer
+            // won't have been setup yet, so let's delay showing the popup until after that is done
+            // (since it's bad UI to show that popup so soon, and because upon successful purchase, the
+            // wear options navigation item isn't even showing yet
+            if(navigationViewMain == null)
+              showWearPurchase = true;
+            else
+              showWearPurchase();
+          }
         }
       } else if(intent.getAction() != null && intent.getAction().equals(com.atomjack.shared.Intent.SHOW_WEAR_PURCHASE_REQUIRED)) {
         showWearPurchaseRequired();
@@ -1079,7 +1096,9 @@ private void handleShowNowPlayingIntent(Intent intent) {
 
   private void switchToPlayerFragment() {
     FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-    transaction.setCustomAnimations(R.anim.slide_in_up, R.anim.slide_out_up);
+    if(getMainFragment().isVisible()) {
+      transaction.setCustomAnimations(R.anim.slide_in_up, R.anim.slide_out_up);
+    }
     transaction.replace(R.id.flContent, playerFragment);
     transaction.commit();
   }
@@ -2129,11 +2148,14 @@ public void onUserInteraction() {
   }
 
   public void hidePurchaseWearMenuItem() {
-    MenuItem wearItem = navigationViewMain.getMenu().findItem(R.id.menu_purchase_wear);
-    wearItem.setVisible(false);
-    MenuItem wearOptionsItem = navigationViewMain.getMenu().findItem(R.id.menu_wear_options);
-    wearOptionsItem.setVisible(true);
-
+    if(navigationViewMain != null) {
+      MenuItem wearItem = navigationViewMain.getMenu().findItem(R.id.menu_purchase_wear);
+      if (wearItem != null)
+        wearItem.setVisible(false);
+      MenuItem wearOptionsItem = navigationViewMain.getMenu().findItem(R.id.menu_wear_options);
+      if (wearOptionsItem != null)
+        wearOptionsItem.setVisible(true);
+    }
   }
 
   private boolean hasValidAutoVoice() {

mobile/src/main/java/com/atomjack/vcfp/fragments/PlayerFragment.java

@@ -159,11 +159,13 @@ public void init(int layout, PlexClient client, PlexMedia media, boolean fromWea
 
   public void mediaChanged(PlexMedia media) {
     nowPlayingMedia = media;
-    showNowPlaying();
-    setCurrentTimeDisplay(getOffset(nowPlayingMedia));
-    seekBar.setMax(nowPlayingMedia.duration / 1000);
-    seekBar.setProgress(Integer.parseInt(nowPlayingMedia.viewOffset) / 1000);
-    durationDisplay.setText(VoiceControlForPlexApplication.secondsToTimecode(nowPlayingMedia.duration / 1000));
+    if(mainView != null) { // Can't do anything with UI elements until mainView is defined and set
+      showNowPlaying();
+      setCurrentTimeDisplay(getOffset(nowPlayingMedia));
+      seekBar.setMax(nowPlayingMedia.duration / 1000);
+      seekBar.setProgress(Integer.parseInt(nowPlayingMedia.viewOffset) / 1000);
+      durationDisplay.setText(VoiceControlForPlexApplication.secondsToTimecode(nowPlayingMedia.duration / 1000));
+    }
   }
 
   @Override

mobile/src/main/java/com/atomjack/vcfp/interfaces/ActivityListener.java

@@ -3,12 +3,4 @@
 // This interface is used for the PlayerFragment to pass messages on to the activity
 public interface ActivityListener {
   void onLayoutNotFound();
-  // This will get passed to the activity with the key of the currently playing media, so the activity can set up the
-  // fragment to display the media
-//  void onFoundPlayingMedia(Timeline timeline);
-  // Need this so that the activity can set the cast icon as active
-//  void onSubscribed();
-//  void onUnsubscribed();
-//  void onStopped();
-//  void onStopped();
 }