Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 10:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when launching 'turn off contact joined' option via activity.

Browse Source
This commit is contained in:
Alex Hart
2023-12-08 11:35:48 -04:00
committed by Cody Henthorne
parent 6230a7553d
commit 06ee096746
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@@ -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"

3
app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java
View File

@@ -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();
});
}
}

2
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
View File

@@ -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;

2
app/src/main/res/values/styles.xml
View File

@@ -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>