Don't show What's New Dialog after doing first time setup. Wait until the app has updated again.

Author: Chris Bellew

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

@@ -506,6 +506,8 @@ else if(musicPlayerFragment != null)
           doTutorial();
       }
     } else {
+      WhatsNewDialog whatsNewDialog = new WhatsNewDialog(this);
+      whatsNewDialog.updateLastShown();
       fragment = new SetupFragment();
       switchToFragment(fragment);
     }
@@ -721,7 +723,8 @@ protected void onResume() {
       }
     }
 
-    // If we get unsubscribed from the notification, and the app isn't visible, the next time we show up the app will think it's still subscribed, so we have to set the UI to be unsubbed
+    // If we get unsubscribed from the notification, and the app isn't visible, the next time we show up the app will think
+    // it's still subscribed, so we have to set the UI to be unsubbed
     if(!isSubscribed() && !doingFirstTimeSetup) {
       switchToMainFragment();
       setCastIconInactive();

mobile/src/main/java/com/cubeactive/martin/inscription/ChangeLogDialog.java

@@ -225,7 +225,6 @@ protected void show(final int version) {
         if(customView != null) {
           builder.setView(customView);
           final AlertDialog dialog = builder.create();
-//          customView.findViewWithTag()
           WebView whatsNewWebView = (WebView)customView.findViewById(mContext.getResources().getIdentifier("whatsNewWebView", "id", mContext.getPackageName()));
           whatsNewWebView.loadDataWithBaseURL(null, htmlChangelog, "text/html", "utf-8", null);
           Button whatsNewCloseButton = (Button)customView.findViewById(mContext.getResources().getIdentifier("whatsNewCloseButton", "id", mContext.getPackageName()));

mobile/src/main/java/com/cubeactive/martin/inscription/WhatsNewDialog.java

@@ -22,48 +22,53 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.preference.PreferenceManager;
 
-
 /**
  * Class to show a dialog with the latest changes for the current app version.
  */
 public class WhatsNewDialog extends ChangeLogDialog {
-    private static final String WHATS_NEW_LAST_SHOWN = "whats_new_last_shown";
+  private static final String WHATS_NEW_LAST_SHOWN = "whats_new_last_shown";
 
-    public WhatsNewDialog(final Context context) {
-        super(context);
-    }
+  final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
 
-    //Get the current app version
-    private int getAppVersionCode() {
-        try {
-            final PackageInfo packageInfo = getContext().getPackageManager().getPackageInfo(getContext().getPackageName(), 0);
-            return packageInfo.versionCode;
-        } catch (NameNotFoundException ignored) {
-            return 0;
-        }
-    }
+  public WhatsNewDialog(final Context context) {
+    super(context);
+  }
 
-    public void forceShow() {
-        //Show only the changes from this version (if available)
-        show(getAppVersionCode());
+  //Get the current app version
+  private int getAppVersionCode() {
+    try {
+      final PackageInfo packageInfo = getContext().getPackageManager().getPackageInfo(getContext().getPackageName(), 0);
+      return packageInfo.versionCode;
+    } catch (NameNotFoundException ignored) {
+      return 0;
     }
+  }
 
-    @Override
-    public void show() {
-        //ToDo check if version is shown
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-        final int versionShown = prefs.getInt(WHATS_NEW_LAST_SHOWN, 0);
-        if (versionShown != getAppVersionCode()) {
-            //This version is new, show only the changes from this version (if available)
-            show(getAppVersionCode());
+  public void forceShow() {
+    //Show only the changes from this version (if available)
+    show(getAppVersionCode());
+  }
 
-            //Update last shown version
-            final SharedPreferences.Editor edit = prefs.edit();
-            edit.putInt(WHATS_NEW_LAST_SHOWN, getAppVersionCode());
-            edit.commit();
-        }
-        if(mOnDismissListener != null) {
-            mOnDismissListener.onDismiss(null);
-        }
+  @Override
+  public void show() {
+    //ToDo check if version is shown
+    final int versionShown = prefs.getInt(WHATS_NEW_LAST_SHOWN, 0);
+    final int appVersionCode = getAppVersionCode();
+    if (versionShown != appVersionCode) {
+      //This version is new, show only the changes from this version (if available)
+      show(appVersionCode);
+
+      //Update last shown version
+      updateLastShown();
+    } else if(mOnDismissListener != null) {
+      mOnDismissListener.onDismiss(null);
     }
+  }
+
+  public void updateLastShown() {
+    final SharedPreferences.Editor edit = prefs.edit();
+    edit.putInt(WHATS_NEW_LAST_SHOWN, getAppVersionCode());
+    edit.commit();
+  }
 }
+