From 364acb6dcd99ec20002621555a030aa5ac70fece Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 1 Nov 2012 19:32:29 -0700
Subject: [PATCH] cleanup: remove some logging and unused string resources

---
 xwords4/android/XWords4/res/values/strings.xml | 18 ------------------
 .../org/eehouse/android/xw4/BoardActivity.java |  8 +-------
 .../android/xw4/UpdateCheckReceiver.java       |  1 -
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index c7a6ac89d..ed28c155a 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -1820,12 +1820,6 @@
       <!--  -->
     <string name="button_donef">Done with %s</string>
 
-      <!--  -->
-    <string name="site_spinner_label">Pick a site</string>
-      <!--  -->
-    <string name="site_spinner_prompt">Pick a site</string>
-      <!--  -->
-    <string name="word_list_label">Tap word to search</string>
       <!--  -->
     <string name="pick_url_titlef">Look up %s at</string>
 
@@ -1896,8 +1890,6 @@
     <string name="bt_pick_rescan_button">Rescan</string>
       <!--  -->
     <string name="bt_pick_clear_button">Remove checked</string>
-      <!--  -->
-    <string name="bt_pick_title">Opponent devices</string>
 
       <!--  -->
     <string name="scan_progress">Scanning for Crosswords on paired devices</string>
@@ -1961,8 +1953,6 @@
     <!--  -->
     <string name="newgame_enable_sms">Launch Settings</string>
     <!--  -->
-    <string name="err_no_phone">Phone number required</string>
-    <!--  -->
     <string name="dft_sms_namef">SMS Game %X</string>    
     <!--  -->
     <string name="new_sms_title">New game via SMS</string>
@@ -1977,15 +1967,11 @@
     number[s] you want to invite to your new game, then tap \"Invite
     checked\".</string>
     <!--  -->
-    <string name="manual_number_hint">Enter manually</string>
-    <!--  -->
     <string name="manual_owner_name">(Not in contacts)</string>
     <!--  -->
     <string name="warn_nomobilef">The number %1$s for %2$s is not
     a \"mobile\" number. Import anyway?</string>
     <!--  -->
-    <string name="button_use">Use anyway</string>
-    <!--  -->
     <string name="empty_sms_inviter">Phone list is empty. Use the
     \"Import contact\" button to add people you want to
     invite, the + button to enter numbers directly.</string>
@@ -2121,10 +2107,6 @@
     <!-- Shown in toast when relaunching after switching dicts -->
     <string name="reload_new_dict">Reloading game with %1$s</string>
 
-    <!--  -->
-    <string name="inform_dict_phonies">\u0020(Remember that phonies
-    will be discarded based on the host\'s wordlist.)</string>
-
     <string name="missing_dict_title">Game invitation pending</string>
     <string name="missing_dict_detail">Required wordlist missing</string>
     <string name="invite_dict_missing_title">Missing wordlist</string>
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
index a5838db31..db252b137 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
@@ -1228,8 +1228,6 @@ public class BoardActivity extends XWActivity
             DeviceRole newRole = isServer? DeviceRole.SERVER_ISSERVER
                 : DeviceRole.SERVER_ISCLIENT;
             if ( newRole != m_gi.serverRole ) {
-                DbgUtils.logf( "new role: %s; old role: %s", 
-                               newRole.toString(), m_gi.serverRole.toString() );
                 m_gi.serverRole = newRole;
                 if ( !isServer ) {
                     m_jniThread.handle( JNICmd.CMD_SWITCHCLIENT );
@@ -1368,7 +1366,6 @@ public class BoardActivity extends XWActivity
         @Override
         public void turnChanged( int newTurn )
         {
-            DbgUtils.logf( "turnChanged(%d)", newTurn );
             if ( 0 <= newTurn ) {
                 post( new Runnable() {
                         public void run() {
@@ -1548,7 +1545,7 @@ public class BoardActivity extends XWActivity
                                                              oldName );
                 if ( !oldSum.equals( newSum ) ) {
                     // Same dict, different versions
-                    msg = getString( R.string. inform_dict_diffversionf,
+                    msg = getString( R.string.inform_dict_diffversionf,
                                      oldName );
                 }
             } else {
@@ -1585,7 +1582,6 @@ public class BoardActivity extends XWActivity
         public boolean warnIllegalWord( String dict, String[] words, int turn, 
                                         boolean turnLost )
         {
-            DbgUtils.logf( "warnIllegalWord(dict=%s)", dict );
             boolean accept = turnLost;
 
             StringBuffer sb = new StringBuffer();
@@ -1609,7 +1605,6 @@ public class BoardActivity extends XWActivity
                 accept = 0 != waitBlockingDialog( QUERY_REQUEST_BLK, 0 );
             }
 
-            DbgUtils.logf( "warnIllegalWord=>%b", accept );
             return accept;
         }
 
@@ -2039,7 +2034,6 @@ public class BoardActivity extends XWActivity
             if ( null == m_screenTimer ) {
                 m_screenTimer = new Runnable() {
                         public void run() {
-                            DbgUtils.logf( "run() called for setKeepScreenOn()" );
                             if ( null != m_view ) {
                                 m_view.setKeepScreenOn( false );
                             }
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java
index 625760377..a87f77537 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java
@@ -29,7 +29,6 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.SystemClock;
-import android.widget.Toast;
 import java.util.ArrayList;
 import java.util.List;