From 96ad615a73f3f05807c8b05d536caa5d2ed2e59f Mon Sep 17 00:00:00 2001 From: Eric House Date: Fri, 25 Jan 2019 09:24:21 -0800 Subject: [PATCH] remove debug toast that can't work from that class --- .../src/main/java/org/eehouse/android/xw4/XWPrefs.java | 5 ----- xwords4/android/app/src/main/res/values/common_rsrc.xml | 1 - xwords4/android/app/src/main/res/values/strings.xml | 1 - xwords4/android/app/src/main/res/xml/xwprefs.xml | 4 ---- .../src/xw4/java/org/eehouse/android/xw4/FBMService.java | 9 --------- 5 files changed, 20 deletions(-) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java index 6011a22b7..98f3cf5c1 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java @@ -71,11 +71,6 @@ public class XWPrefs { return getPrefsBoolean( context, R.string.key_ignore_fcm, false ); } - public static boolean getToastFCM( Context context ) - { - return getPrefsBoolean( context, R.string.key_show_fcm, false ); - } - public static boolean getSMSToSelfEnabled( Context context ) { return getPrefsBoolean( context, R.string.key_enable_sms_toself, false ); diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml index e1a4b34e2..d658db6ce 100644 --- a/xwords4/android/app/src/main/res/values/common_rsrc.xml +++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml @@ -127,7 +127,6 @@ key_enable_sms_toself key_enable_smsproto key_ignore_fcm - key_show_fcm key_nag_intervals key_download_path key_got_langdict diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index b1baaacbc..c83e3df64 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -2644,7 +2644,6 @@ Mimic life without a google account Show SMS sends, receives - Show FCM receives diff --git a/xwords4/android/app/src/main/res/xml/xwprefs.xml b/xwords4/android/app/src/main/res/xml/xwprefs.xml index 9045fe6b5..61b110a6d 100644 --- a/xwords4/android/app/src/main/res/xml/xwprefs.xml +++ b/xwords4/android/app/src/main/res/xml/xwprefs.xml @@ -398,10 +398,6 @@ android:summary="@string/ignore_fcm_summary" android:defaultValue="false" /> - data = message.getData(); Log.d( TAG, "onMessageReceived(data=%s)", data ); - boolean toastFCM = XWPrefs.getToastFCM( this ); String value = data.get( "msgs64" ); if ( null != value ) { @@ -68,10 +67,6 @@ public class FBMService extends FirebaseMessagingService { try { JSONArray msgs64 = new JSONArray( value ); String[] strs64 = new String[msgs64.length()]; - if ( toastFCM ) { - DbgUtils.showf( this, "onMessage(): got %d msgs", - strs64.length ); - } for ( int ii = 0; ii < strs64.length; ++ii ) { strs64[ii] = msgs64.optString(ii); @@ -95,9 +90,6 @@ public class FBMService extends FirebaseMessagingService { value = data.get( "getMoves" ); if ( null != value && Boolean.parseBoolean( value ) ) { RelayService.timerFired( this ); - if ( toastFCM ) { - DbgUtils.showf( this, "onMessage(): got 'getMoves'" ); - } } value = data.get( "msg" ); @@ -126,7 +118,6 @@ public class FBMService extends FirebaseMessagingService { getTokenAsync( context ); } - Log.d( TAG, "getFCMDevID() => %s", result ); return result; }