From a9e34d34926d7df3fb01143d6733b481c31c292d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Fri, 21 Mar 2014 22:14:52 +0100
Subject: tryed to fix more otr bugs. new resource setting

---
 res/xml/preferences.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'res/xml/preferences.xml')

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">
-- 
cgit v1.2.3