From 794bce1ceb1f671ca80f9a0218c456dad95bf7df Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 27 Jan 2016 07:31:10 -0800
Subject: [PATCH] cleanup from review of diff since last release. All
 whitespace or removing logging except for one check for null.

---
 .../android/XWords4-dbg/AndroidManifest.xml   |   6 +-
 .../android/XWords4/res/values/strings.xml    |   4 +-
 xwords4/android/XWords4/res/xml/xwprefs.xml   | 322 +++++++++---------
 .../eehouse/android/xw4/BTInviteDelegate.java |   4 +-
 .../src/org/eehouse/android/xw4/DBUtils.java  |  14 +-
 .../org/eehouse/android/xw4/GameUtils.java    |   2 +-
 .../org/eehouse/android/xw4/XWService.java    |   4 +-
 7 files changed, 176 insertions(+), 180 deletions(-)

diff --git a/xwords4/android/XWords4-dbg/AndroidManifest.xml b/xwords4/android/XWords4-dbg/AndroidManifest.xml
index 82e7cd47e..c284f5ad6 100644
--- a/xwords4/android/XWords4-dbg/AndroidManifest.xml
+++ b/xwords4/android/XWords4-dbg/AndroidManifest.xml
@@ -97,16 +97,16 @@
           />
     
     <activity android:name="BTInviteActivity"
-			  android:label="@string/bt_invite_title"
+              android:label="@string/bt_invite_title"
               android:configChanges="keyboardHidden|orientation|screenSize"
               />
     <activity android:name="SMSInviteActivity"
-			  android:label="@string/sms_invite_title"
+              android:label="@string/sms_invite_title"
               android:configChanges="keyboardHidden|orientation|screenSize"
               android:screenOrientation="sensor"
               />
     <activity android:name="RelayInviteActivity"
-			  android:label="@string/relay_invite_title"
+              android:label="@string/relay_invite_title"
               android:configChanges="keyboardHidden|orientation|screenSize"
               />
 
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 17920b91c..e1d804794 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -1974,9 +1974,9 @@
     \"Import contact\" button to add people you want to invite, the +
     button to enter numbers directly.</string>
     <!--  -->
-    <string name="empty_relay_inviter">This list of devies is
+    <string name="empty_relay_inviter">This list of devices is
     empty. Use the \"Scan games\" button to scan your old games
-    for opponents. Use the + button to enter device IDs directly.</string>
+    for opponents. Use the \"+\" button to enter device IDs directly.</string>
     <!--  -->
     <string name="get_sms_number">Enter phone number:</string>
     <string name="get_relay_number">Enter device ID:</string>
diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml
index f084091aa..b4d0f03ea 100644
--- a/xwords4/android/XWords4/res/xml/xwprefs.xml
+++ b/xwords4/android/XWords4/res/xml/xwprefs.xml
@@ -12,41 +12,41 @@
                       >
 
       <org.eehouse.android.xw4.XWEditTextPreference 
-	     android:key="@string/key_player1_name"
-	     android:title="@string/pref_human_name"
-         android:capitalize="words"
-	     android:defaultValue=""
-	     />
+          android:key="@string/key_player1_name"
+          android:title="@string/pref_human_name"
+          android:capitalize="words"
+          android:defaultValue=""
+          />
       <org.eehouse.android.xw4.XWEditTextPreference 
-	     android:key="@string/key_robot_name"
-	     android:title="@string/robot_label" 
-         android:capitalize="words"
-		 android:defaultValue="@string/button_default_robot"
-	     />
+          android:key="@string/key_robot_name"
+          android:title="@string/robot_label" 
+          android:capitalize="words"
+          android:defaultValue="@string/button_default_robot"
+          />
     </PreferenceScreen>
 
     <PreferenceScreen android:title="@string/prefs_dicts"
                       android:summary="@string/prefs_dicts_summary"
                       >
 
-	  <!-- entries provided programatically -->
+      <!-- entries provided programatically -->
       <org.eehouse.android.xw4.LangListPreference
-		  android:key="@string/key_default_language"
-		  android:title="@string/default_language"
-		  android:defaultValue="@string/lang_name_english"
-		  />
+          android:key="@string/key_default_language"
+          android:title="@string/default_language"
+          android:defaultValue="@string/lang_name_english"
+          />
 
       <org.eehouse.android.xw4.DictListPreference 
-         android:key="@string/key_default_dict"
-         android:title="@string/default_dict"
-         android:defaultValue="CollegeEng_2to8"
-         />
+          android:key="@string/key_default_dict"
+          android:title="@string/default_dict"
+          android:defaultValue="CollegeEng_2to8"
+          />
 
       <org.eehouse.android.xw4.DictListPreference 
-         android:key="@string/key_default_robodict"
-         android:title="@string/default_robodict"
-         android:defaultValue="Top5000"
-         />
+          android:key="@string/key_default_robodict"
+          android:title="@string/default_robodict"
+          android:defaultValue="Top5000"
+          />
     </PreferenceScreen>
 
     <CheckBoxPreference android:key="@string/key_init_hintsallowed"
@@ -68,12 +68,12 @@
                         />
 
     <org.eehouse.android.xw4.XWListPreference
-	   android:key="@string/key_default_phonies"
-	   android:title="@string/default_phonies"
-	   android:entries="@array/phony_names"
-	   android:entryValues="@array/phony_names"
-	   android:defaultValue="@string/phonies_warn"
-	   />
+        android:key="@string/key_default_phonies"
+        android:title="@string/default_phonies"
+        android:entries="@array/phony_names"
+        android:entryValues="@array/phony_names"
+        android:defaultValue="@string/phonies_warn"
+        />
 
     <CheckBoxPreference android:key="@string/key_default_timerenabled"
                         android:title="@string/use_timer"
@@ -81,19 +81,19 @@
                         />
 
     <org.eehouse.android.xw4.XWEditTextPreference
-	   android:key="@string/key_initial_player_minutes"
-	   android:title="@string/initial_player_minutes"
-	   android:defaultValue="25"
-	   android:numeric="decimal"
-	   />
+        android:key="@string/key_initial_player_minutes"
+        android:title="@string/initial_player_minutes"
+        android:defaultValue="25"
+        android:numeric="decimal"
+        />
 
     <org.eehouse.android.xw4.XWListPreference 
-	   android:key="@string/key_board_size"
-	   android:title="@string/board_size"
-	   android:entries="@array/board_sizes"
-	   android:entryValues="@array/board_sizes"
-	   android:defaultValue="15x15"
-	   />
+        android:key="@string/key_board_size"
+        android:title="@string/board_size"
+        android:entries="@array/board_sizes"
+        android:entryValues="@array/board_sizes"
+        android:defaultValue="15x15"
+        />
 
   </PreferenceScreen>
 
@@ -109,12 +109,12 @@
         />
 
     <org.eehouse.android.xw4.XWSumListPreference 
-       android:key="@string/key_summary_field"
-       android:title="@string/summary_field"
-	   android:entries="@array/game_summary_values"
-	   android:entryValues="@array/game_summary_values"
-       android:defaultValue="@string/game_summary_field_opponents"
-       />
+        android:key="@string/key_summary_field"
+        android:title="@string/summary_field"
+        android:entries="@array/game_summary_values"
+        android:entryValues="@array/game_summary_values"
+        android:defaultValue="@string/game_summary_field_opponents"
+        />
 
     <CheckBoxPreference android:key="@string/key_hide_title"
                         android:title="@string/hide_title"
@@ -146,74 +146,74 @@
                       android:summary="@string/prefs_colors_summary"
                       >
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_player0"
-         android:title="@string/pref_player1_name"
-         android:defaultValue="0x000000"
-         />
+          android:key="@string/key_player0"
+          android:title="@string/pref_player1_name"
+          android:defaultValue="0x000000"
+          />
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_player1"
-         android:title="@string/pref_player2_name"
-         android:defaultValue="0xFF0000"
-         />
+          android:key="@string/key_player1"
+          android:title="@string/pref_player2_name"
+          android:defaultValue="0xFF0000"
+          />
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_player2"
-         android:title="@string/pref_player3_name"
-         android:defaultValue="0x0000FF"
-         />
+          android:key="@string/key_player2"
+          android:title="@string/pref_player3_name"
+          android:defaultValue="0x0000FF"
+          />
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_player3"
-         android:title="@string/pref_player4_name"
-         android:defaultValue="0x008F00"
-         />
+          android:key="@string/key_player3"
+          android:title="@string/pref_player4_name"
+          android:defaultValue="0x008F00"
+          />
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_bonus_l2x"
-         android:title="@string/bonus_l2x"
-         android:defaultValue="0xAFAF00"
-         />
+          android:key="@string/key_bonus_l2x"
+          android:title="@string/bonus_l2x"
+          android:defaultValue="0xAFAF00"
+          />
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_bonus_l3x"
-         android:title="@string/bonus_l3x"
-         android:defaultValue="0x00AFAF"
-         />
+          android:key="@string/key_bonus_l3x"
+          android:title="@string/bonus_l3x"
+          android:defaultValue="0x00AFAF"
+          />
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_bonus_w2x"
-         android:title="@string/bonus_w2x"
-         android:defaultValue="0xAF00AF"
-         />
+          android:key="@string/key_bonus_w2x"
+          android:title="@string/bonus_w2x"
+          android:defaultValue="0xAF00AF"
+          />
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_bonus_w3x"
-         android:title="@string/bonus_w3x"
-         android:defaultValue="0xAFAFAF"
-         />
+          android:key="@string/key_bonus_w3x"
+          android:title="@string/bonus_w3x"
+          android:defaultValue="0xAFAFAF"
+          />
 
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_clr_crosshairs"
-         android:title="@string/clr_crosshairs"
-         android:defaultValue="0x7070FF"
-         />
+          android:key="@string/key_clr_crosshairs"
+          android:title="@string/clr_crosshairs"
+          android:defaultValue="0x7070FF"
+          />
 
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_clr_bonushint"
-         android:title="@string/key_bonushint"
-         android:defaultValue="0x7F7F7F"
-         />
+          android:key="@string/key_clr_bonushint"
+          android:title="@string/key_bonushint"
+          android:defaultValue="0x7F7F7F"
+          />
 
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_tile_back"
-         android:title="@string/tile_back"
-         android:defaultValue="0xFFFF99"
-         />
+          android:key="@string/key_tile_back"
+          android:title="@string/tile_back"
+          android:defaultValue="0xFFFF99"
+          />
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_empty"
-         android:title="@string/empty"
-         android:defaultValue="0xFFFFFF"
-         />
+          android:key="@string/key_empty"
+          android:title="@string/empty"
+          android:defaultValue="0xFFFFFF"
+          />
 
       <org.eehouse.android.xw4.EditColorPreference
-         android:key="@string/key_background"
-         android:title="@string/background"
-         android:defaultValue="0xFFFFFF"
-         />
+          android:key="@string/key_background"
+          android:title="@string/background"
+          android:defaultValue="0xFFFFFF"
+          />
     </PreferenceScreen>
 
   </PreferenceScreen>
@@ -290,18 +290,18 @@
         android:defaultValue="false"
         />
 
-	<org.eehouse.android.xw4.XWConnAddrPreference
-       android:key="@string/key_addrs_pref"
-       android:title="@string/title_addrs_pref"
-	   />
+    <org.eehouse.android.xw4.XWConnAddrPreference
+        android:key="@string/key_addrs_pref"
+        android:title="@string/title_addrs_pref"
+        />
 
     <org.eehouse.android.xw4.PollListPreference
-       android:key="@string/key_connect_frequency"
-       android:title="@string/connect_frequency"
-       android:entries="@array/connect_frequencies"
-       android:entryValues="@array/connect_frequencies_values"
-       android:defaultValue="900"
-       />
+        android:key="@string/key_connect_frequency"
+        android:title="@string/connect_frequency"
+        android:entries="@array/connect_frequencies"
+        android:entryValues="@array/connect_frequencies_values"
+        android:defaultValue="900"
+        />
 
     <CheckBoxPreference android:key="@string/key_notify_sound"
                         android:title="@string/notify_sound"
@@ -321,12 +321,12 @@
                           android:title="@string/enable_pubroom_title"
                           android:summary="@string/enable_pubroom_summary"
                           android:defaultValue="false"
-	                      />
+                          />
       <CheckBoxPreference android:key="@string/key_invite_multi"
                           android:title="@string/invite_multi_title"
                           android:summary="@string/invite_multi_summary"
                           android:defaultValue="false"
-	                      />
+                          />
     </PreferenceScreen>
 
   </PreferenceScreen>
@@ -336,10 +336,10 @@
                     >
 
     <CheckBoxPreference android:key="@string/key_logging_on"
-			            android:title="@string/logging_on"
-			            android:summary="@string/logging_on_summary"
-			            android:defaultValue="false"
-			            />
+                        android:title="@string/logging_on"
+                        android:summary="@string/logging_on_summary"
+                        android:defaultValue="false"
+                        />
     <CheckBoxPreference android:key="@string/key_enable_debug"
                         android:title="@string/debug_features"
                         android:summary="@string/debug_features_summary"
@@ -347,9 +347,9 @@
                         />
 
     <org.eehouse.android.xw4.XWEditTextPreference 
-		android:key="@string/key_nag_intervals"
-		android:title="@string/nag_intervals"
-		/>
+        android:key="@string/key_nag_intervals"
+        android:title="@string/nag_intervals"
+        />
 
     <CheckBoxPreference android:key="@string/key_enable_dup_invite"
                         android:title="@string/enable_dupes_title"
@@ -372,39 +372,39 @@
                           android:defaultValue="false"
                           />
       <org.eehouse.android.xw4.XWListPreference
-		  android:key="@string/key_force_radio"
+          android:key="@string/key_force_radio"
           android:title="@string/force_radio_title"
-	      android:entries="@array/force_radio_names"
-	      android:entryValues="@array/force_radio_names"
-		  android:defaultValue="@string/radio_name_real"
-		  />
+          android:entries="@array/force_radio_names"
+          android:entryValues="@array/force_radio_names"
+          android:defaultValue="@string/radio_name_real"
+          />
 
       <CheckBoxPreference android:key="@string/key_show_sms"
-			              android:title="Show SMS sends, receives"
-			              android:defaultValue="false"
-			              />
+                          android:title="Show SMS sends, receives"
+                          android:defaultValue="false"
+                          />
     </PreferenceScreen>
 
     <PreferenceScreen android:title="@string/pref_group_relay_title"
                       android:summary="@string/pref_group_relay_summary"
                       >
       <org.eehouse.android.xw4.XWEditTextPreference 
-	      android:key="@string/key_relay_host"
-	      android:title="@string/relay_host"
-	      android:defaultValue="@string/default_host"
-	      />
+          android:key="@string/key_relay_host"
+          android:title="@string/relay_host"
+          android:defaultValue="@string/default_host"
+          />
       <org.eehouse.android.xw4.XWEditTextPreference
-	      android:key="@string/key_relay_port"
-	      android:title="@string/relay_port"
-	      android:defaultValue="10997"
-	      android:numeric="decimal"
-	      />
+          android:key="@string/key_relay_port"
+          android:title="@string/relay_port"
+          android:defaultValue="10997"
+          android:numeric="decimal"
+          />
       <org.eehouse.android.xw4.XWEditTextPreference
-	      android:key="@string/key_proxy_port"
-	      android:title="@string/proxy_port"
-	      android:defaultValue="10998"
-	      android:numeric="decimal"
-	      />
+          android:key="@string/key_proxy_port"
+          android:title="@string/proxy_port"
+          android:defaultValue="10998"
+          android:numeric="decimal"
+          />
       <CheckBoxPreference android:key="@string/key_enable_relay_toself"
                           android:title="@string/enable_relay_toself_title"
                           android:summary="@string/enable_relay_toself_summary"
@@ -416,21 +416,21 @@
                       android:summary="@string/pref_group_l10n_summary"
                       >
       <CheckBoxPreference android:key="@string/key_got_langdict"
-			              android:title="@string/got_langdict_title"
-			              android:summary="@string/got_langdict_summary"
-			              android:defaultValue="false"
-			              />
+                          android:title="@string/got_langdict_title"
+                          android:summary="@string/got_langdict_summary"
+                          android:defaultValue="false"
+                          />
 
       <org.eehouse.android.xw4.XWEditTextPreference 
-	      android:key="@string/key_xlations_locale"
-	      android:title="@string/xlations_locale"
-	      />
+          android:key="@string/key_xlations_locale"
+          android:title="@string/xlations_locale"
+          />
 
       <CheckBoxPreference android:key="@string/key_xlations_enabled"
                           android:title="@string/xlations_enabled_title"
                           android:summary="@string/xlations_enabled_summary"
                           android:defaultValue="false"
-	                      />
+                          />
 
     </PreferenceScreen>
 
@@ -438,7 +438,7 @@
                         android:title="@string/force_tablet_title"
                         android:summary="@string/force_tablet_summary"
                         android:defaultValue="false"
-	                    />
+                        />
 
     <!-- For broken devices like my Blaze 4G that report a download
          directory that doesn't exist, allow users to set it.  Mine:
@@ -450,16 +450,16 @@
         />
 
     <org.eehouse.android.xw4.XWEditTextPreference
-	   android:key="@string/key_dict_host"
-	   android:title="@string/dict_host"
-	   android:defaultValue="@string/dict_url"
-	   />
+        android:key="@string/key_dict_host"
+        android:title="@string/dict_host"
+        android:defaultValue="@string/dict_url"
+        />
 
     <org.eehouse.android.xw4.XWEditTextPreference
-	   android:key="@string/key_update_url"
-	   android:title="@string/expl_update_url"
-	   android:defaultValue="@string/default_update_url"
-	   />
+        android:key="@string/key_update_url"
+        android:title="@string/expl_update_url"
+        android:defaultValue="@string/default_update_url"
+        />
     <CheckBoxPreference android:key="@string/key_update_prerel"
                         android:title="@string/pref_item_update_title"
                         android:summary="@string/pref_item_update_summary"
@@ -467,12 +467,12 @@
                         />
 
     <EditTextPreference android:title="@string/git_rev_title"
-			            android:summary="@string/git_rev"
-			            android:enabled="false"
-			            />
+                        android:summary="@string/git_rev"
+                        android:enabled="false"
+                        />
     <org.eehouse.android.xw4.XWDevIDPreference 
         android:title="@string/devid_title"
-		android:enabled="false"
-		/>
+        android:enabled="false"
+        />
   </PreferenceScreen>
 </PreferenceScreen>
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java
index 99ff62cc1..4656a37c0 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -64,7 +64,9 @@ public class BTInviteDelegate extends InviteDelegate {
         intent.putExtra( INTENT_KEY_NMISSING, nMissing );
         if ( null != info ) {
             String lastDev = info.getLastDev( InviteMeans.BLUETOOTH );
-            intent.putExtra( INTENT_KEY_LASTDEV, lastDev );
+            if ( null != lastDev ) {
+                intent.putExtra( INTENT_KEY_LASTDEV, lastDev );
+            }
         }
         activity.startActivityForResult( intent, requestCode.ordinal() );
     }
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
index 00d1ca901..5cc0561e5 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
@@ -472,7 +472,6 @@ public class DBUtils {
         // care only that it's non-0.
         public int getMinPlayerCount() {
             if ( -1 == m_cachedCount ) {
-                DbgUtils.logf( "getMinPlayerCount(%H)", this );
                 int count = m_timestamps.size();
                 Map<InviteMeans, Set<String>> hashes
                     = new HashMap<InviteMeans, Set<String>>();
@@ -481,7 +480,6 @@ public class DBUtils {
                     InviteMeans means = m_means.get(ii);
                     Set<String> devs;
                     if ( ! hashes.containsKey( means ) ) {
-                        DbgUtils.logf( "creating new hash for means %s", means.toString() );
                         devs = new HashSet<String>();
                         hashes.put( means, devs );
                     }
@@ -491,7 +489,6 @@ public class DBUtils {
                         target = String.format( "%d", ++fakeCount );
                     }
                     devs.add( target );
-                    DbgUtils.logf( "added target %s for means %s", target, means.toString() );
                 }
 
                 // Now find the max
@@ -500,12 +497,9 @@ public class DBUtils {
                     if ( hashes.containsKey( means ) ) {
                         int siz = hashes.get( means ).size();
                         m_cachedCount += siz;
-                        DbgUtils.logf( "counting: means %s has unique count of %d",
-                                       means.toString(), siz );
                     }
                 }
             }
-            DbgUtils.logf( "getMinPlayerCount(%H) => %d", this, m_cachedCount );
             return m_cachedCount;
         }
 
@@ -2244,7 +2238,7 @@ public class DBUtils {
 
     public static void setIntFor( Context context, String key, int value )
     {
-        DbgUtils.logdf( "DBUtils.setIntFor(key=%s, val=%d)", key, value );
+        // DbgUtils.logdf( "DBUtils.setIntFor(key=%s, val=%d)", key, value );
         String asStr = String.format( "%d", value );
         setStringFor( context, key, asStr );
     }
@@ -2255,7 +2249,7 @@ public class DBUtils {
         if ( null != asStr ) {
             dflt = Integer.parseInt( asStr );
         }
-        DbgUtils.logdf( "DBUtils.getIntFor(key=%s)=>%d", key, dflt );
+        // DbgUtils.logdf( "DBUtils.getIntFor(key=%s)=>%d", key, dflt );
         return dflt;
     }
 
@@ -2272,7 +2266,7 @@ public class DBUtils {
         if ( null != asStr ) {
             dflt = Boolean.parseBoolean( asStr );
         }
-        DbgUtils.logdf( "DBUtils.getBoolFor(key=%s)=>%b", key, dflt );
+        // DbgUtils.logdf( "DBUtils.getBoolFor(key=%s)=>%b", key, dflt );
         return dflt;
     }
 
@@ -2288,7 +2282,7 @@ public class DBUtils {
             };
         String newVal = getModStringFor( context, key, proc );
         int asInt = Integer.parseInt( newVal );
-        DbgUtils.logf( "getIncrementIntFor(%s) => %d", key, asInt );
+        // DbgUtils.logf( "getIncrementIntFor(%s) => %d", key, asInt );
         return asInt;
     }
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
index 1319d4c18..1fe10ae8b 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
@@ -462,7 +462,7 @@ public class GameUtils {
     public static long makeNewMultiGame( Context context, NetLaunchInfo nli,
                                          MultiMsgSink sink, UtilCtxt util )
     {
-        DbgUtils.logf( "makeNewMultiGame(nli=%s)", nli.toString() );
+        DbgUtils.logdf( "makeNewMultiGame(nli=%s)", nli.toString() );
         CommsAddrRec addr = nli.makeAddrRec( context );
 
         return makeNewMultiGame( context, sink, util, DBUtils.GROUPID_UNSPEC, 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWService.java
index 7a131cdb3..a686cf579 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWService.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWService.java
@@ -58,7 +58,7 @@ public class XWService extends Service {
         if ( null != s_srcMgr ) {
             s_srcMgr.sendResult( event, args );
         } else {
-            DbgUtils.logf( "XWService.sendResult: dropping %s event", event.toString() );
+            DbgUtils.logdf( "XWService.sendResult: dropping %s event", event.toString() );
         }
     }
 
@@ -74,7 +74,7 @@ public class XWService extends Service {
                 s_seen.add( inviteID );
             }
         }
-        DbgUtils.logf( "XWService.checkNotDupe(%s) => %b", inviteID, !isDupe );
+        DbgUtils.logdf( "XWService.checkNotDupe(%s) => %b", inviteID, !isDupe );
         return !isDupe;
     }