aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-12-16 23:35:06 +0100
committerChristian Schneppe <christian@pix-art.de>2017-12-16 23:35:06 +0100
commit8f0a1c8cd8593fa4288e849886aa253dea7e8eb6 (patch)
tree285eb012d2bdcf2d0b49e7a429779698492e2b8a /src/main/AndroidManifest.xml
parent20f15c02a630d7abb6935418136bd5c6ab109231 (diff)
remove NFC handling + let edit account handle own jids
Diffstat (limited to 'src/main/AndroidManifest.xml')
-rw-r--r--src/main/AndroidManifest.xml23
1 files changed, 8 insertions, 15 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 7ad78246d..4af768d4f 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -86,6 +86,7 @@
<activity
android:name=".ui.UriHandlerActivity"
android:label="@string/title_activity_start_conversation"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar">
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -95,13 +96,6 @@
<data android:scheme="xmpp" />
</intent-filter>
- <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>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
@@ -113,21 +107,20 @@
<data android:pathPrefix="/i/" />
<data android:pathPrefix="/j/" />
</intent-filter>
- </activity>
- <activity
- android:name=".ui.StartConversationActivity"
- android:label="@string/title_activity_start_conversation"
- android:configChanges="orientation|screenSize"
- android:launchMode="singleTop">
<intent-filter>
- <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+ <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=".ui.StartConversationActivity"
+ android:label="@string/title_activity_start_conversation"
+ android:configChanges="orientation|screenSize"
+ android:launchMode="singleTop">
</activity>
<activity
android:name=".ui.WelcomeActivity"