From 97bc93aeb096e5810baa58137c5b4ad340c6c222 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 19 Dec 2017 12:50:19 +0100
Subject: [PATCH] do not use theme in uri activity

---
 src/main/AndroidManifest.xml                                   | 3 +--
 .../eu/siacs/conversations/ui/StartConversationActivity.java   | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 28b6d0bbe..bb89ae6fb 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -59,8 +59,7 @@
         <activity
             android:name=".ui.UriHandlerActivity"
             android:label="@string/title_activity_start_conversation"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index cb532fcd2..1b2605d9a 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -625,6 +625,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
             case R.id.action_scan_qr_code:
                 Intent intent = new Intent(this, UriHandlerActivity.class);
                 intent.setAction(UriHandlerActivity.ACTION_SCAN_QR_CODE);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
                 startActivity(intent);
                 return true;
             case R.id.action_hide_offline: