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

add missing prefs

Browse source
This commit is contained in:
Eric House 2021-02-17 20:21:58 -08:00
parent 3a33deceef
commit a13e33688a
2 changed files with 57 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
View file

@ -232,10 +232,9 @@ public class MQTTUtils extends Thread implements IMqttActionListener, MqttCallba
mMsgThread = new MsgThread();
String host = XWPrefs.getPrefsString( context, R.string.key_mqtt_host );
Log.d( TAG, "host: %s", host );
int port = XWPrefs.getPrefsInt( context, R.string.key_mqtt_port, 1883 );
String url = String.format( java.util.Locale.US, "tcp://%s:%d", host, port );
Log.d( TAG, "using url: %s", url );
Log.d( TAG, "Using url: %s", url );
mClient = new MqttAsyncClient( url, mDevID, new MemoryPersistence() );
mClient.setCallback( this );
}

90
xwords4/android/app/src/main/res/xml/prefs_dbg_net.xml
View file

@ -5,50 +5,72 @@
<PreferenceCategory app:title="@string/pref_group_relay_title"
>
<org.eehouse.android.xw4.XWEditTextPreference
android:key="@string/key_nag_intervals"
android:title="@string/nag_intervals"
<org.eehouse.android.xw4.XWListPreference
android:key="@string/key_relay_poll"
android:title="@string/relay_poll_title"
android:entries="@array/relay_poll_names"
android:entryValues="@array/relay_poll_names"
android:defaultValue="@string/relay_poll_name_both"
/>
<CheckBoxPreference android:key="@string/key_enable_pending_count"
android:title="@string/enable_pending_count_title"
android:summary="@string/enable_pending_count_summary"
<CheckBoxPreference android:key="@string/key_show_fcm"
android:title="@string/show_fcm_title"
android:defaultValue="@bool/DEBUG"
/>
<!-- For broken devices like my Blaze 4G that report a download
directory that doesn't exist, allow users to set it. Mine:
/sdcard/external_sd/download
-->
<org.eehouse.android.xw4.XWEditTextPreference
android:key="@string/key_download_path"
android:title="@string/download_path_title"
android:hint="@string/download_path_hint"
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_dict_host4"
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"
/>
<CheckBoxPreference android:key="@string/key_update_prerel"
android:title="@string/pref_item_update_title"
android:summary="@string/pref_item_update_summary"
<CheckBoxPreference android:key="@string/key_relay_via_http_first"
android:title="@string/relay_via_http_first"
android:summary="@string/relay_via_http_first_summary"
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_relay_url"
android:title="@string/expl_relay_url"
android:defaultValue="@string/default_relay_url"
/>
<org.eehouse.android.xw4.XWEditTextPreference
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"
/>
<org.eehouse.android.xw4.XWEditTextPreference
android:key="@string/key_mqtt_host"
android:title="@string/mqtt_host"
android:defaultValue="@string/default_host"
/>
<org.eehouse.android.xw4.XWEditTextPreference
android:key="@string/key_mqtt_port"
android:title="@string/mqtt_port"
android:defaultValue="1883"
android:numeric="decimal"
/>
<org.eehouse.android.xw4.XWListPreference
android:key="@string/key_mqtt_qos"
android:title="@string/mqtt_qos"
android:entries="@array/mqtt_qos_values"
android:entryValues="@array/mqtt_qos_values"
android:defaultValue="2"
/>
<org.eehouse.android.xw4.XWEditTextPreference
android:key="@string/key_mqtt_url2"
android:title="@string/expl_mqtt_url"
android:defaultValue="@string/default_mqtt_url2"
/>
</PreferenceCategory>
</PreferenceScreen>