From 5e349b8e2ce0894a2aa7694f20e5d999e7349dfd Mon Sep 17 00:00:00 2001 From: 0x330a <92654767+0x330a@users.noreply.github.com> Date: Mon, 13 Nov 2023 17:40:51 +1100 Subject: [PATCH] refactor: move configs back to 14 days and use weight for column size in edit group member list --- .../org/thoughtcrime/securesms/database/Storage.kt | 4 ++-- .../thoughtcrime/securesms/groups/compose/EditGroup.kt | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 11fa5a5b9..65e7c992a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -950,7 +950,7 @@ open class Storage( members = groupMembers) ?: return Optional.absent() val newGroupRecipient = group.groupSessionId.hexString() - val configTtl = 1 * 24 * 60 * 60 * 1000L // TODO: just testing here, 1 day so we don't fill large space on network + val configTtl = 14 * 24 * 60 * 60 * 1000L // Test the sending val keyPush = groupKeys.pendingConfig() ?: return Optional.absent() @@ -1023,7 +1023,7 @@ open class Storage( groupKeys.free() groupInfo.free() groupMembers.free() - val groupRecipient = Recipient.from(context, Address.fromSerialized(newGroupRecipient), false) + val groupRecipient = Recipient.from(context, fromSerialized(newGroupRecipient), false) setRecipientApprovedMe(groupRecipient, true) setRecipientApproved(groupRecipient, true) pollerFactory.updatePollers() diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/compose/EditGroup.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/compose/EditGroup.kt index 77e759aa1..a1466bfbc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/compose/EditGroup.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/compose/EditGroup.kt @@ -188,14 +188,18 @@ fun EditGroupView( Column(modifier = Modifier .weight(1f) .align(CenterVertically)) { - Row(modifier = Modifier.fillMaxSize()) { + Row(modifier = Modifier.fillMaxWidth().weight(1f)) { // Needs - MemberName(name = member.memberName ?: member.memberSessionId, modifier = Modifier.align(CenterVertically)) + MemberName( + name = member.memberName ?: member.memberSessionId, + modifier = Modifier.align(CenterVertically).fillMaxSize() + ) } if (member.memberState !in listOf(MemberState.Member, MemberState.Admin)) { Text( text = member.memberState.toString(), - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.fillMaxWidth() + .weight(1f), ) } }