From 5028ae6e82e33c58c3924cf4c3b7051eef95f5e8 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 25 May 2019 00:49:32 +0200
Subject: [PATCH] use profile fast-animation only for the chat-profile, not for
 contact-profiles in groups

---
 res/anim/fade_in.xml                              |  9 ---------
 res/anim/fade_out.xml                             |  9 ---------
 .../securesms/ConversationActivity.java           |  3 ++-
 .../thoughtcrime/securesms/ProfileActivity.java   | 15 +++++++++++++--
 4 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 res/anim/fade_in.xml
 delete mode 100644 res/anim/fade_out.xml

diff --git a/res/anim/fade_in.xml b/res/anim/fade_in.xml
deleted file mode 100644
index 8c8557d88..000000000
--- a/res/anim/fade_in.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator">
-    <alpha
-        android:duration="150"
-        android:fromAlpha="0.3"
-        android:toAlpha="1.0" />
-</set>
\ No newline at end of file
diff --git a/res/anim/fade_out.xml b/res/anim/fade_out.xml
deleted file mode 100644
index 09beb8382..000000000
--- a/res/anim/fade_out.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator">
-    <alpha
-        android:duration="150"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.3" />
-</set>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 4fb479510..66ec00a7e 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -541,8 +541,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     if(chatId != DcChat.DC_CHAT_ID_DEADDROP) {
       Intent intent = new Intent(this, ProfileActivity.class);
       intent.putExtra(ProfileActivity.CHAT_ID_EXTRA, chatId);
+      intent.putExtra(ProfileActivity.FROM_CHAT, true);
       startActivity(intent);
-      overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+      overridePendingTransition(0, 0);
     }
   }
 
diff --git a/src/org/thoughtcrime/securesms/ProfileActivity.java b/src/org/thoughtcrime/securesms/ProfileActivity.java
index f4ae3fb13..250e012c6 100644
--- a/src/org/thoughtcrime/securesms/ProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/ProfileActivity.java
@@ -45,6 +45,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
   public static final String CHAT_ID_EXTRA    = "chat_id";
   public static final String CONTACT_ID_EXTRA = "contact_id";
   public static final String FORCE_TAB_EXTRA  = "force_tab";
+  public static final String FROM_CHAT        = "from_chat";
 
   public static final int TAB_SETTINGS = 10;
   public static final int TAB_GALLERY  = 20;
@@ -61,6 +62,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
   private int                  chatId;
   private boolean              chatIsGroup;
   private int                  contactId;
+  private boolean              fromChat;
 
   private ArrayList<Integer> tabs = new ArrayList<>();
   private Toolbar            toolbar;
@@ -146,11 +148,18 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
     dynamicLanguage.onResume(this);
   }
 
+  boolean backPressed = false;
+  @Override
+  public void onBackPressed() {
+    backPressed = true;
+    super.onBackPressed();
+  }
+
   @Override
   protected void onPause() {
     super.onPause();
-    if (isFinishing()) {
-      overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+    if (backPressed && fromChat) {
+      overridePendingTransition(0, 0);
     }
   }
 
@@ -169,6 +178,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
     chatId      = getIntent().getIntExtra(CHAT_ID_EXTRA, 0);
     contactId   = getIntent().getIntExtra(CONTACT_ID_EXTRA, 0);
     chatIsGroup = false;
+    fromChat    = getIntent().getBooleanExtra(FROM_CHAT, false);
 
     if (contactId!=0) {
       chatId = dcContext.getChatIdByContactId(contactId);
@@ -305,6 +315,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
 
     switch (item.getItemId()) {
       case android.R.id.home:
+        backPressed = true;
         finish();
         return true;
       case R.id.menu_mute_notifications: