From 06ee096746dd6262397545f837111aec63b5f5ca Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 8 Dec 2023 11:35:48 -0400
Subject: [PATCH] Fix crash when launching 'turn off contact joined' option via
 activity.

---
 app/src/main/AndroidManifest.xml                               | 2 +-
 .../contacts/TurnOffContactJoinedNotificationsActivity.java    | 3 +--
 .../securesms/conversationlist/ConversationListFragment.java   | 2 +-
 app/src/main/res/values/styles.xml                             | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7f2da4bc5..4351c489a5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1006,7 +1006,7 @@
         android:exported="false"/>
 
     <activity android:name=".contacts.TurnOffContactJoinedNotificationsActivity"
-              android:theme="@style/Theme.AppCompat.Dialog.Alert"
+              android:theme="@style/TextSecure.DialogActivity"
               android:exported="false"/>
 
     <activity android:name=".contactshare.ContactShareEditActivity"
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java
index adb6ae567f..b4a21ad87d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java
@@ -47,8 +47,8 @@ public class TurnOffContactJoinedNotificationsActivity extends AppCompatActivity
         })
         .setNegativeButton(android.R.string.cancel, ((dialog, which) -> {
           dialog.dismiss();
-          finish();
         }))
+        .setOnDismissListener(dialog -> finish())
         .show();
   }
 
@@ -65,7 +65,6 @@ public class TurnOffContactJoinedNotificationsActivity extends AppCompatActivity
       return null;
     }, unused -> {
       dialog.dismiss();
-      finish();
     });
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index e65603934f..d0a9336cfb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -90,8 +90,8 @@ import org.thoughtcrime.securesms.MuteDialog;
 import org.thoughtcrime.securesms.NewConversationActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.badges.models.Badge;
-import org.thoughtcrime.securesms.badges.self.expired.MonthlyDonationCanceledBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.badges.self.expired.ExpiredOneTimeBadgeBottomSheetDialogFragment;
+import org.thoughtcrime.securesms.badges.self.expired.MonthlyDonationCanceledBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.components.Material3SearchToolbar;
 import org.thoughtcrime.securesms.components.RatingManager;
 import org.thoughtcrime.securesms.components.SignalProgressDialog;
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a3c0099ee5..0f70240353 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -30,7 +30,7 @@
         <item name="android:windowBackground">@android:color/black</item>
     </style>
 
-    <style name="TextSecure.DialogActivity" parent="Theme.AppCompat.Light">
+    <style name="TextSecure.DialogActivity" parent="Signal.DayNight">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>