TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-25 21:07:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean

Browse Source
This commit is contained in:
Brice-W 2021-04-28 16:00:13 +10:00
parent 54ba848d09
commit ab68001b15
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
View File

@ -183,10 +183,8 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
List<Recipient> recipients = new LinkedList<>(); List<Recipient> recipients = new LinkedList<>();
for (Address member : members) { for (Address member : members) {
if (member.isContact()) {
recipients.add(Recipient.from(context, member, false)); recipients.add(Recipient.from(context, member, false));
} }
}
return recipients; return recipients;
} }

3
app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
View File

@ -41,8 +41,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
private val members = HashSet<String>() private val members = HashSet<String>()
private val allMembers: Set<String> private val allMembers: Set<String>
get() { get() {
return if (zombies.isNotEmpty()) (members + zombies) return members + zombies
else members
} }
private var hasNameChanged = false private var hasNameChanged = false
private var isSelfAdmin = false private var isSelfAdmin = false

4
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
View File

@ -522,11 +522,7 @@ private fun MessageReceiver.handleClosedGroupMemberLeft(message: ClosedGroupCont
// admin left the group of linked device left the group // admin left the group of linked device left the group
disableLocalGroupAndUnsubscribe(groupPublicKey, groupID, userPublicKey) disableLocalGroupAndUnsubscribe(groupPublicKey, groupID, userPublicKey)
} else { } else {
//val isCurrentUserAdmin = admins.contains(userPublicKey)
storage.updateMembers(groupID, updatedMemberList.map { Address.fromSerialized(it) }) storage.updateMembers(groupID, updatedMemberList.map { Address.fromSerialized(it) })
//if (isCurrentUserAdmin) {
// MessageSender.generateAndSendNewEncryptionKeyPair(groupPublicKey, updatedMemberList)
//}
// update zombie members // update zombie members
val zombies = storage.getZombieMember(groupID) val zombies = storage.getZombieMember(groupID)
storage.updateZombieMembers(groupID, zombies.plus(senderPublicKey).map { Address.fromSerialized(it) }) storage.updateZombieMembers(groupID, zombies.plus(senderPublicKey).map { Address.fromSerialized(it) })