From 0193e0291cff98843ce04aae3de05aa020e8d71d Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 11 Jul 2014 14:07:52 +0200
Subject: cleanup. removed old contacts activity. WARNING: this will temporarly
 disable muc invites

---
 AndroidManifest.xml | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e242c3e3..aef0cecf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -48,12 +48,22 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity 
+        <activity
             android:name="eu.siacs.conversations.ui.StartConversation"
+            android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_start_conversation"
-            android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
             android:logo="@drawable/ic_activity"
-            ></activity>
+            android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
+            android:windowSoftInputMode="stateHidden" >
+            <intent-filter>
+                <action android:name="android.intent.action.SENDTO" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="imto" />
+                <data android:host="jabber" />
+            </intent-filter>
+        </activity>
         <activity
             android:name="eu.siacs.conversations.ui.SettingsActivity"
             android:label="@string/title_activity_settings"
@@ -75,24 +85,6 @@
             android:label="@string/title_activity_contact_details"
             android:windowSoftInputMode="stateHidden" >
         </activity>
-        <activity
-            android:name="eu.siacs.conversations.ui.ContactsActivity"
-            android:label="@string/title_activity_contacts"
-            android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
-            android:windowSoftInputMode="stateHidden" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.gultsch.chat.ui.ConversationActivity" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.SENDTO" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="imto" />
-                <data android:host="jabber" />
-            </intent-filter>
-        </activity>
         <activity
             android:name="eu.siacs.conversations.ui.ShareWithActivity"
             android:label="@string/title_activity_conversations" >
-- 
cgit v1.2.3