Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix multi-invite group create dialog.

Browse Source
This commit is contained in:
Cody Henthorne
2024-02-27 09:45:39 -05:00
committed by Alex Hart
parent e1067e30de
commit e18e4454e4
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
View File

@@ -16,6 +16,7 @@ import org.thoughtcrime.securesms.glide.GiftBadgeModel
import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.ScreenDensity import org.thoughtcrime.securesms.util.ScreenDensity
import org.thoughtcrime.securesms.util.ThemeUtil import org.thoughtcrime.securesms.util.ThemeUtil
import org.thoughtcrime.securesms.util.visible
class BadgeImageView @JvmOverloads constructor( class BadgeImageView @JvmOverloads constructor(
context: Context, context: Context,
@@ -99,6 +100,10 @@ class BadgeImageView @JvmOverloads constructor(
} }
} }
fun isShowingBadge(): Boolean {
return drawable != null
}
private fun clearDrawable() { private fun clearDrawable() {
if (drawable != null) { if (drawable != null) {
setImageDrawable(null) setImageDrawable(null)

1
app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
View File

@@ -257,6 +257,7 @@ final class GroupMemberListAdapter extends RecyclerView.Adapter<GroupMemberListA
if (this.badge != null) { if (this.badge != null) {
this.badge.setBadgeFromRecipient(recipient); this.badge.setBadgeFromRecipient(recipient);
this.badge.setClickable(false); this.badge.setClickable(false);
this.badge.setVisibility(this.badge.isShowingBadge() ? View.VISIBLE : View.GONE);
} }
if (this.about != null) { if (this.about != null) {

3
app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupInviteSentDialog.java
View File

@@ -31,9 +31,6 @@ public final class GroupInviteSentDialog {
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context) AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context)
.setTitle(context.getResources().getQuantityString(R.plurals.GroupManagement_invitation_sent, size, size)) .setTitle(context.getResources().getQuantityString(R.plurals.GroupManagement_invitation_sent, size, size))
// TODO: GV2 Need a URL for learn more
// .setNegativeButton(R.string.GroupManagement_learn_more, (dialog, which) -> {
// })
.setPositiveButton(android.R.string.ok, null); .setPositiveButton(android.R.string.ok, null);
if (size == 1) { if (size == 1) {
builder.setMessage(context.getString(R.string.GroupManagement_invite_single_user, recipients.get(0).getDisplayNameOrUsername(context))); builder.setMessage(context.getString(R.string.GroupManagement_invite_single_user, recipients.get(0).getDisplayNameOrUsername(context)));