From 3122759c91eb9bbfcea3cd56b2136e331b422e2f Mon Sep 17 00:00:00 2001
From: "daniel.boehrs" <daniel.boehrs@open-xchange.com>
Date: Mon, 17 Dec 2018 13:13:50 +0100
Subject: [PATCH] Fixed transitions #147

---
 src/org/thoughtcrime/securesms/ConversationFragment.java | 2 ++
 src/org/thoughtcrime/securesms/MediaPreviewActivity.java | 1 +
 src/org/thoughtcrime/securesms/ShareActivity.java        | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index d5746261d..550d83bc4 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -78,6 +78,7 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Set;
 
 import static org.thoughtcrime.securesms.ShareActivity.EXTRA_FORWARD;
@@ -431,6 +432,7 @@ public class ConversationFragment extends Fragment
       }
     }*/
     startActivity(composeIntent);
+    Objects.requireNonNull(getActivity()).overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
   }
 
   private void handleResendMessage(final DcMsg message) {
diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
index cabbb9c1f..0a38ad4f7 100644
--- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -255,6 +255,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
       composeIntent.putExtra(Intent.EXTRA_STREAM, mediaItem.uri);
       composeIntent.setType(mediaItem.type);
       startActivity(composeIntent);
+      overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
     }
   }
 
diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index b556a94b8..2500b9e48 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -150,6 +150,12 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
+  @Override
+  public void finish() {
+    super.finish();
+    overridePendingTransition(R.anim.fade_scale_in, R.anim.slide_to_right);
+  }
+
   private void initializeToolbar() {
     Toolbar toolbar = findViewById(R.id.toolbar);
     setSupportActionBar(toolbar);