Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-20 22:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

allow everybody the new phonies option

Browse source
This commit is contained in:
Eric House 2020-06-10 12:54:22 -07:00
parent 4508192a3a
commit 51a00cd829
7 changed files with 14 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/app/build.gradle
View file

@ -90,7 +90,7 @@ android {
buildConfigField "boolean", "LOG_LIFECYLE", "false"
buildConfigField "String", "KEY_FCMID", "\"FBMService_fcmid\""
buildConfigField "boolean", "ATTACH_SUPPORTED", "false"
buildConfigField "boolean", "OFFER_MQTT", "false"
buildConfigField "boolean", "OFFER_MQTT", "true"
}
xw4NoSMS {
@ -138,7 +138,6 @@ android {
buildConfigField "String", "KEY_FCMID", "\"FBMService_fcmid1\""
buildConfigField "String", "NFC_AID", "\"${NFC_AID_XW4d}\""
resValue "string", "nfc_aid", "$NFC_AID_XW4d"
buildConfigField "boolean", "OFFER_MQTT", "true"
externalNativeBuild.ndkBuild.cFlags += ['-DVARIANT_xw4d']
externalNativeBuild.ndkBuild.arguments += ['XW_BT_UUID=' + XWD_UUID]
}
@ -156,7 +155,6 @@ android {
buildConfigField "boolean", "REPORT_LOCKS", "true"
buildConfigField "String", "NFC_AID", "\"${NFC_AID_XW4d}\""
resValue "string", "nfc_aid", "$NFC_AID_XW4d"
buildConfigField "boolean", "OFFER_MQTT", "true"
externalNativeBuild.ndkBuild.cFlags += ['-DVARIANT_xw4dNoSMS']
externalNativeBuild.ndkBuild.arguments += ['XW_BT_UUID=' + XWD_UUID]
}

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

@ -543,6 +543,7 @@ public class XWPrefs {
setAddrTypes( context, result );
}
// Log.d( TAG, "getAddrTypes() => %s", result.toString( context, false) );
return result;
}

4
xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java
View file

@ -118,11 +118,11 @@ public class CommsAddrRec {
for ( CommsConnType value : values ) {
int ord = value.ordinal();
if ( 0 != (bits & (1 << (ord - 1)))) {
add( value );
addWithCheck( value );
}
}
} else if ( bits < values.length ) { // don't crash
add( values[bits] );
addWithCheck( values[bits] );
} else {
Log.e( TAG, "<init>: bad bits value: 0x%x", inBits );
}

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

@ -184,6 +184,7 @@
<item>@string/phonies_ignore</item>
<item>@string/phonies_warn</item>
<item>@string/phonies_disallow</item>
<item>@string/phonies_block</item>
</string-array>
<string-array name="robot_levels">

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

@ -355,6 +355,8 @@
<!-- Don't warn, but simply force to skip turn (give 0 points)
when user attempts to play word not in the wordlist. -->
<string name="phonies_disallow">Disallow phonies</string>
<!-- Don't allow phonies to be played -->
<string name="phonies_block">Block phonies</string>
<!-- Shown when using the Game configure screen to configure a
networked game and you try to make all players local. -->
<string name="str_reg_server_sans_remote">At least one player must

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

@ -374,13 +374,6 @@
android:defaultValue="false"
/>
<!-- Keep all dup-mode related stuff hidden -->
<CheckBoxPreference android:key="@string/key_unhide_dupmode"
android:title="@string/unhide_dupmode_title"
android:summary="@string/unhide_dupmode_summary"
android:defaultValue="false"
/>
<org.eehouse.android.xw4.XWEditTextPreference
android:key="@string/key_nag_intervals"
android:title="@string/nag_intervals"
@ -536,6 +529,13 @@
android:defaultValue="false"
/>
<!-- Keep all dup-mode related stuff hidden -->
<CheckBoxPreference android:key="@string/key_unhide_dupmode"
android:title="@string/unhide_dupmode_title"
android:summary="@string/unhide_dupmode_summary"
android:defaultValue="false"
/>
<EditTextPreference android:title="@string/git_rev_title"
android:summary="@string/git_rev"
android:enabled="false"

17
xwords4/android/app/src/xw4d/res/values/tmp_for_phony.xml
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingTranslation"
>
<!-- These are temporary, until the new feature's released -->
<string name="phonies_block">Block phonies</string>
<string-array name="phony_names">
<item>@string/phonies_ignore</item>
<item>@string/phonies_warn</item>
<item>@string/phonies_disallow</item>
<item>@string/phonies_block</item>
</string-array>
</resources>