From 9f6baf39c49d308f4bc282feb1668dd69e9f8645 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 8 Nov 2013 06:31:20 -0800
Subject: [PATCH] don't insert rowid in any prefs list except the right one

---
 xwords4/android/XWords4/res/xml/xwprefs.xml   |  2 +-
 .../eehouse/android/xw4/XWListPreference.java | 16 +-----
 .../android/xw4/XWSumListPreference.java      | 55 +++++++++++++++++++
 3 files changed, 57 insertions(+), 16 deletions(-)
 create mode 100644 xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java

diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml
index 845c35268..7f99e9a11 100644
--- a/xwords4/android/XWords4/res/xml/xwprefs.xml
+++ b/xwords4/android/XWords4/res/xml/xwprefs.xml
@@ -134,7 +134,7 @@
              />
     </PreferenceScreen>
 
-    <org.eehouse.android.xw4.XWListPreference 
+    <org.eehouse.android.xw4.XWSumListPreference 
        android:key="@string/key_summary_field"
        android:title="@string/summary_field"
 	   android:entries="@array/game_summary_values"
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListPreference.java
index 34c4f940c..17c3dc4bf 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListPreference.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListPreference.java
@@ -27,7 +27,7 @@ import android.util.AttributeSet;
 import junit.framework.Assert;
 
 public class XWListPreference extends ListPreference {
-    private Context m_context;
+    protected Context m_context;
 
     public XWListPreference( Context context, AttributeSet attrs )
     {
@@ -39,20 +39,6 @@ public class XWListPreference extends ListPreference {
     {
         super.onAttachedToActivity();
         setSummary( getPersistedString( "" ) );
-
-        if ( XWPrefs.getDebugEnabled( m_context ) ) {
-            CharSequence[] entries = getEntries();
-            String lastRow 
-                = m_context.getString( R.string.game_summary_field_rowid );
-            if ( !entries[entries.length - 1].equals( lastRow ) ) {
-                CharSequence[] newEntries = new CharSequence[1 + entries.length];
-                System.arraycopy( entries, 0, newEntries, 0, entries.length );
-                newEntries[entries.length] = lastRow;
-                setEntries( newEntries );
-
-                setEntryValues( newEntries );
-            }
-        }
     }
 
     protected boolean persistString( String value )
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java
new file mode 100644
index 000000000..8bfa356d4
--- /dev/null
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java
@@ -0,0 +1,55 @@
+/* -*- compile-command: "cd ../../../../../; ant debug install"; -*- */
+/*
+ * Copyright 2010 - 2011 by Eric House (xwords@eehouse.org).  All
+ * rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package org.eehouse.android.xw4;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class XWSumListPreference extends XWListPreference {
+
+    public XWSumListPreference( Context context, AttributeSet attrs )
+    {
+        super( context, attrs );
+    }
+
+    // Why I exist: insert the rowid line if debug is on
+    protected void onAttachedToActivity()
+    {
+        super.onAttachedToActivity();
+
+        if ( XWPrefs.getDebugEnabled( m_context ) ) {
+            CharSequence[] entries = getEntries();
+            String lastRow
+                = m_context.getString( R.string.game_summary_field_rowid );
+            if ( !entries[entries.length - 1].equals( lastRow ) ) {
+                CharSequence[] newEntries = 
+                    new CharSequence[1 + entries.length];
+                System.arraycopy( entries, 0, newEntries, 0, 
+                                  entries.length );
+                newEntries[entries.length] = lastRow;
+                setEntries( newEntries );
+
+                setEntryValues( newEntries );
+            }
+        }
+    }
+
+}