Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

communicate FCM deviceID to relay immediately

Browse source 
Don't wait for second connection! This makes new installs able to get a
game going much more reliably.
This commit is contained in:
Eric House 2019-11-30 20:24:43 -08:00
parent 2d81135487
commit 5fe46f275c
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
View file

@ -172,6 +172,7 @@ public class RelayService extends XWJIService
public static void fcmConfirmed( Context context, boolean working ) public static void fcmConfirmed( Context context, boolean working )
{ {
Log.d( TAG, "fcmConfirmed(working=%b)", working );
long newVal = working ? System.currentTimeMillis() : 0L; long newVal = working ? System.currentTimeMillis() : 0L;
if ( (s_lastFCM == 0) != working ) { if ( (s_lastFCM == 0) != working ) {
Log.i( TAG, "fcmConfirmed(): changing s_lastFCM to %d", Log.i( TAG, "fcmConfirmed(): changing s_lastFCM to %d",
@ -296,7 +297,7 @@ public class RelayService extends XWJIService
return result; return result;
} }
public static void devIDChanged() private static void devIDChanged()
{ {
s_registered = false; s_registered = false;
} }
@ -1052,8 +1053,8 @@ public class RelayService extends XWJIService
writeVLIString( out, devid ); writeVLIString( out, devid );
} }
Log.d( TAG, "registering devID \"%s\" (type=%s)", devid, Log.d( TAG, "registerWithRelay(): registering devID \"%s\" (type=%s)",
typ.toString() ); devid, typ.toString() );
out.writeShort( BuildConfig.CLIENT_VERS_RELAY ); out.writeShort( BuildConfig.CLIENT_VERS_RELAY );
writeVLIString( out, BuildConfig.GIT_REV ); writeVLIString( out, BuildConfig.GIT_REV );

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
View file

@ -92,7 +92,7 @@ public class XWPrefs {
public static boolean getToastFCM( Context context ) public static boolean getToastFCM( Context context )
{ {
return getPrefsBoolean( context, R.string.key_show_fcm, false ); return getPrefsBoolean( context, R.string.key_show_fcm, BuildConfig.DEBUG );
} }
public static boolean getSMSToSelfEnabled( Context context ) public static boolean getSMSToSelfEnabled( Context context )

2
xwords4/android/app/src/main/res/values/common_rsrc.xml
View file

@ -128,7 +128,7 @@
<string name="key_enable_dup_invite">key_enable_dup_invite</string> <string name="key_enable_dup_invite">key_enable_dup_invite</string>
<string name="key_enable_nfc_toself">key_enable_nfc_toself</string> <string name="key_enable_nfc_toself">key_enable_nfc_toself</string>
<string name="key_enable_sms_toself">key_enable_sms_toself</string> <string name="key_enable_sms_toself">key_enable_sms_toself</string>
<string name="key_show_fcm">key_show_fcm</string> <string name="key_show_fcm">key_show_fcm2</string>
<string name="key_nag_intervals">key_nag_intervals</string> <string name="key_nag_intervals">key_nag_intervals</string>
<string name="key_download_path">key_download_path</string> <string name="key_download_path">key_download_path</string>
<string name="key_got_langdict">key_got_langdict</string> <string name="key_got_langdict">key_got_langdict</string>

2
xwords4/android/app/src/main/res/xml/xwprefs.xml
View file

@ -410,7 +410,7 @@
<CheckBoxPreference android:key="@string/key_show_fcm" <CheckBoxPreference android:key="@string/key_show_fcm"
android:title="@string/show_fcm_title" android:title="@string/show_fcm_title"
android:defaultValue="false" android:defaultValue="@bool/DEBUG"
/> />
<org.eehouse.android.xw4.XWEditTextPreference <org.eehouse.android.xw4.XWEditTextPreference
android:key="@string/key_relay_host" android:key="@string/key_relay_host"

2
xwords4/android/app/src/xw4NoSMS/java/org/eehouse/android/xw4/FBMService.java
View file

@ -160,5 +160,7 @@ public class FBMService extends FirebaseMessagingService {
DBUtils.setStringFor( context, KEY_FCMID, token ); DBUtils.setStringFor( context, KEY_FCMID, token );
DevID.setFCMDevID( context, token ); DevID.setFCMDevID( context, token );
RelayService.fcmConfirmed( context, true );
} }
} }