diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 28b6d0bbed883053b475a6f088a7bb16ec1a7217..bb89ae6fb23fa9f52d78a60a1c1d5b3c63859bb4 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -59,8 +59,7 @@ + android:launchMode="singleTop"> diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index cb532fcd2af01c6b8920cabd370529086e4db083..1b2605d9abc0624e35a27d26a81f34fa736b5982 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: