From 38b9420fa04861a042452f7711d9c879d97ba911 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 18 Aug 2014 07:53:23 -0700
Subject: [PATCH] move survey-display logic into one place so it's always right

---
 .../XWords4/src/org/eehouse/android/xw4/DlgDelegate.java    | 5 +----
 .../XWords4/src/org/eehouse/android/xw4/FirstRunDialog.java | 6 ++++--
 .../src/org/eehouse/android/xw4/GamesListDelegate.java      | 2 +-
 .../android/XWords4/src/org/eehouse/android/xw4/Utils.java  | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
index c8062e706..f541be322 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
@@ -458,10 +458,7 @@ public class DlgDelegate {
                                     public void onClick( DialogInterface dlg, 
                                                          int which )
                                     {
-                                        boolean firstVersion = 
-                                            Utils.onFirstVersion( m_activity );
-                                        FirstRunDialog.show( m_activity, 
-                                                             !firstVersion );
+                                        FirstRunDialog.show( m_activity );
                                     }
                                 } )
             .setPositiveButton( R.string.button_ok, null )
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/FirstRunDialog.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/FirstRunDialog.java
index 698c10103..050eabb3a 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/FirstRunDialog.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/FirstRunDialog.java
@@ -36,8 +36,10 @@ import org.eehouse.android.xw4.loc.LocUtils;
  */
 
 public class FirstRunDialog {
-    public static void show( final Context context, final boolean isUpgrade )
+    public static void show( final Context context )
     {
+        final boolean showSurvey = !Utils.onFirstVersion( context );
+
         // This won't support e.g mailto refs.  Probably want to
         // launch the browser with an intent eventually.
         final WebView view = new WebView( context );
@@ -58,7 +60,7 @@ public class FirstRunDialog {
                 {
                     if ( !m_loaded ) {
                         m_loaded = true;
-                        if ( isUpgrade ) {
+                        if ( showSurvey ) {
                             view.loadUrl( "javascript:showSurvey();" );
                         }
                     }
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
index feb078478..2b0c4d7be 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
@@ -765,7 +765,7 @@ public class GamesListDelegate extends ListDelegateBase
 
         boolean isUpgrade = Utils.firstBootThisVersion( m_activity );
         if ( isUpgrade && !s_firstShown ) {
-            FirstRunDialog.show( m_activity, isUpgrade );
+            FirstRunDialog.show( m_activity );
             s_firstShown = true;
         }
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
index bb6adb1fb..7ea69337f 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
@@ -531,7 +531,7 @@ public class Utils {
             s_isFirstBootEver = new Boolean( -1 == prevVersion );
 
             int firstVersion = prefs.getInt( FIRST_VERSION_KEY, Integer.MAX_VALUE );
-            s_firstVersion = new Boolean( firstVersion < thisVersion );
+            s_firstVersion = new Boolean( firstVersion >= thisVersion );
             if ( newVersion || Integer.MAX_VALUE == firstVersion ) {
                 SharedPreferences.Editor editor = prefs.edit();
                 if ( newVersion ) {