oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

refactor: move configs back to 14 days and use weight for column size in edit group member list

This commit is contained in:
0x330a 2023-11-13 17:40:51 +11:00
parent 705f12e821
commit 5e349b8e2c
No known key found for this signature in database
GPG Key ID: 267811D6E6A2698C
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
View File

@ -950,7 +950,7 @@ open class Storage(
members = groupMembers) ?: return Optional.absent() members = groupMembers) ?: return Optional.absent()
val newGroupRecipient = group.groupSessionId.hexString() 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 // Test the sending
val keyPush = groupKeys.pendingConfig() ?: return Optional.absent() val keyPush = groupKeys.pendingConfig() ?: return Optional.absent()
@ -1023,7 +1023,7 @@ open class Storage(
groupKeys.free() groupKeys.free()
groupInfo.free() groupInfo.free()
groupMembers.free() groupMembers.free()
val groupRecipient = Recipient.from(context, Address.fromSerialized(newGroupRecipient), false) val groupRecipient = Recipient.from(context, fromSerialized(newGroupRecipient), false)
setRecipientApprovedMe(groupRecipient, true) setRecipientApprovedMe(groupRecipient, true)
setRecipientApproved(groupRecipient, true) setRecipientApproved(groupRecipient, true)
pollerFactory.updatePollers() pollerFactory.updatePollers()

10
app/src/main/java/org/thoughtcrime/securesms/groups/compose/EditGroup.kt
View File

@ -188,14 +188,18 @@ fun EditGroupView(
Column(modifier = Modifier Column(modifier = Modifier
.weight(1f) .weight(1f)
.align(CenterVertically)) { .align(CenterVertically)) {
Row(modifier = Modifier.fillMaxSize()) { Row(modifier = Modifier.fillMaxWidth().weight(1f)) {
// Needs // 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)) { if (member.memberState !in listOf(MemberState.Member, MemberState.Admin)) {
Text( Text(
text = member.memberState.toString(), text = member.memberState.toString(),
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth()
.weight(1f),
) )
} }
} }