diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 20 |
2 files changed, 20 insertions, 4 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 322f9e7a0..f56ed4df1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -100,7 +100,9 @@ <string name="pref_general">General</string> <string name="pref_xmpp_resource">XMPP resource</string> <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string> - <string name="pref_accept_files">Accept files</string> + <string name="pref_accept_files_wifi">Accept files in WiFi connections</string> + <string name="pref_accept_files_mobile">Accept files in mobile connections</string> + <string name="pref_accept_files_mobileroaming">Accept files in mobile roaming connections</string> <string name="pref_accept_files_summary">Automatically accept files smaller than…</string> <string name="pref_attachments">Attachments</string> <string name="pref_return_to_previous">Quick Sharing</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 8c0ca30cd..a3f15ba1a 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -88,12 +88,26 @@ android:key="attachments" android:title="@string/pref_attachments"> <ListPreference - android:defaultValue="1048576" + android:defaultValue="10485760" android:entries="@array/filesizes" android:entryValues="@array/filesizes_values" - android:key="auto_accept_file_size" + android:key="auto_accept_file_size_wifi" android:summary="@string/pref_accept_files_summary" - android:title="@string/pref_accept_files" /> + android:title="@string/pref_accept_files_wifi" /> + <ListPreference + android:defaultValue="262144" + android:entries="@array/filesizes" + android:entryValues="@array/filesizes_values" + android:key="auto_accept_file_size_mobile" + android:summary="@string/pref_accept_files_summary" + android:title="@string/pref_accept_files_mobile" /> + <ListPreference + android:defaultValue="1" + android:entries="@array/filesizes" + android:entryValues="@array/filesizes_values" + android:key="auto_accept_file_size_roaming" + android:summary="@string/pref_accept_files_summary" + android:title="@string/pref_accept_files_mobileroaming" /> <ListPreference android:defaultValue="auto" android:entries="@array/picture_compression_entries" |