aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-03-21 22:14:52 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-03-21 22:14:52 +0100
commita9e34d34926d7df3fb01143d6733b481c31c292d (patch)
tree964a4baba3106f775692d4aec7c674f04be38cfb /res
parent079712060c2a61515867e97ffb98c7c4e88e0d5a (diff)
tryed to fix more otr bugs. new resource setting
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml19
-rw-r--r--res/xml/preferences.xml16
2 files changed, 14 insertions, 21 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b8135cdea..2210fbb88 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,17 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <array name="conversation_encryption_type_entries">
- <item>None</item>
- <item>OpenPGP</item>
- <item>Off the record</item>
- </array>
- <array name="conversation_encryption_type_values">
- <item>none</item>
- <item>pgp</item>
- <item>otr</item>
- </array>
- <array name="manage_account_options">
- <item>Delete</item>
- <item>Disable</item>
+ <array name="resources">
+ <item>Mobile</item>
+ <item>Phone</item>
+ <item>Tablet</item>
+ <item>Conversations</item>
+ <item>Android</item>
</array>
</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 904ea07e0..49b3e5803 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
<PreferenceCategory
- android:title="Security and Privacy Options">
- <ListPreference
- android:key="default_conversation_encryption_type"
- android:title="Default conversation encryption"
- android:dialogTitle="Default conversation encryption"
- android:entries="@array/conversation_encryption_type_entries"
- android:entryValues="@array/conversation_encryption_type_values"
- android:defaultValue="none"/>
+ android:title="General">
<CheckBoxPreference
android:key="grant_new_contacts"
android:title="Grant presence updates"
android:summary="Preemptivly grant and ask for presence subscription for contacts you created"
android:defaultValue="true"
/>
+ <ListPreference
+ android:key="resource"
+ android:title="XMPP Resource"
+ android:summary="The name this client identifies itself"
+ android:entries="@array/resources"
+ android:entryValues="@array/resources"
+ android:defaultValue="Mobile"/>
</PreferenceCategory>
<PreferenceCategory
android:title="Notification Settings">