aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-13 18:09:40 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-13 18:09:40 +0200
commit7dfe4ae0823238da216088f80de40b9ff6b1446d (patch)
tree59bbc5457190b465ff9b5f653cec139198f37faa /res
parent27d5966ac356fd10365d848332b127b0b8f417da (diff)
some code cleanup. added setting to auto accept files. socks5 connections are now threaded
Diffstat (limited to '')
-rw-r--r--res/values/arrays.xml12
-rw-r--r--res/xml/preferences.xml7
2 files changed, 19 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 2210fbb8..09fd3cc7 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -7,4 +7,16 @@
<item>Conversations</item>
<item>Android</item>
</array>
+ <string-array name="filesizes">
+ <item>never</item>
+ <item>256 KB</item>
+ <item>512 KB</item>
+ <item>1 MB</item>
+ </string-array>
+ <string-array name="filesizes_values">
+ <item>0</item>
+ <item>262144</item>
+ <item>524288</item>
+ <item>1048576</item>
+ </string-array>
</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 0e746a3e..4a500d70 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -15,6 +15,13 @@
android:entries="@array/resources"
android:entryValues="@array/resources"
android:defaultValue="Mobile"/>
+ <ListPreference
+ android:key="auto_accept_file_size"
+ android:title="Accept files"
+ android:summary="Automatically accept files smaller than"
+ android:entries="@array/filesizes"
+ android:entryValues="@array/filesizes_values"
+ android:defaultValue="524288"/>
</PreferenceCategory>
<PreferenceCategory
android:title="Notification Settings">