From 8a1ac685c813115bbfce1a29815c46f918c395d7 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Thu, 23 Aug 2018 20:57:51 +0200
Subject: [PATCH] fix activity transitions (this time for real)

---
 app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt    | 2 +-
 app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java  | 2 +-
 .../main/java/com/keylesspalace/tusky/fragment/SFragment.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
index 23e1cbeca..f7ff66b60 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
@@ -530,7 +530,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasSupportF
             val intent = ComposeActivity.IntentBuilder()
                     .mentionedUsernames(setOf(it.username))
                     .build(this)
-            startActivityWithSlideInAnimation(intent)
+            startActivity(intent)
         }
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index 0755a2b1c..4662fbbd6 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -1459,7 +1459,7 @@ public final class ComposeActivity
                 getIntent().getStringExtra(REPLYING_STATUS_CONTENT_EXTRA),
                 getIntent().getStringExtra(REPLYING_STATUS_AUTHOR_USERNAME_EXTRA),
                 statusVisibility);
-        finish();
+        finishWithoutSlideOutAnimation();
     }
 
     @Override
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
index e1a285e0e..417765b36 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
@@ -136,7 +136,7 @@ public abstract class SFragment extends BaseFragment {
                 .repyingStatusAuthor(actionableStatus.getAccount().getLocalUsername())
                 .replyingStatusContent(actionableStatus.getContent().toString())
                 .build(getContext());
-        startActivity(intent);
+        getActivity().startActivity(intent);
     }
 
     protected void more(final Status status, View view, final int position) {