From c70f1f5d754b7080e7f6d1bb82f9cef8ec2ba034 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 21 Mar 2023 16:20:23 -0300
Subject: [PATCH] Fix call screen transition.

---
 app/src/main/AndroidManifest.xml                         | 6 ++++++
 .../components/settings/conversation/CallInfoActivity.kt | 9 +++++++++
 .../conversation/ConversationSettingsActivity.kt         | 3 ++-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/CallInfoActivity.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 989a5376d1..88fa654743 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -441,6 +441,12 @@
             android:windowSoftInputMode="stateAlwaysHidden">
         </activity>
 
+        <activity android:name=".components.settings.conversation.CallInfoActivity"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
+            android:theme="@style/Signal.DayNight.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
         <activity android:name=".badges.gifts.flow.GiftFlowActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
             android:theme="@style/Signal.DayNight.NoActionBar"
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/CallInfoActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/CallInfoActivity.kt
new file mode 100644
index 0000000000..2c82cc3621
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/CallInfoActivity.kt
@@ -0,0 +1,9 @@
+package org.thoughtcrime.securesms.components.settings.conversation
+
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
+import org.thoughtcrime.securesms.util.DynamicTheme
+
+class CallInfoActivity : ConversationSettingsActivity(), ConversationSettingsFragment.Callback {
+
+  override val dynamicTheme: DynamicTheme = DynamicNoActionBarTheme()
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsActivity.kt
index e25fba49d0..5a65060f90 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsActivity.kt
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.DynamicConversationSettingsTheme
 import org.thoughtcrime.securesms.util.DynamicTheme
 
-class ConversationSettingsActivity : DSLSettingsActivity(), ConversationSettingsFragment.Callback {
+open class ConversationSettingsActivity : DSLSettingsActivity(), ConversationSettingsFragment.Callback {
 
   override val dynamicTheme: DynamicTheme = DynamicConversationSettingsTheme()
 
@@ -96,6 +96,7 @@ class ConversationSettingsActivity : DSLSettingsActivity(), ConversationSettings
       val startBundle = startBundleBuilder.build().toBundle()
 
       return getIntent(context)
+        .setClass(context, CallInfoActivity::class.java)
         .putExtra(ARG_START_BUNDLE, startBundle)
     }