felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-01 05:36:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Email invitation: Managed third_party_invite field in m.room.member events to deduplicate 3pid invite and room member

Browse Source
This commit is contained in:
manuroe
2016-02-04 11:40:25 +01:00
parent 3696093b4f
commit 4e1e209b1d
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/ViewController/RoomParticipantsViewController.m
+26 -10
View File
@@ -323,14 +323,12 @@
- (void)addRoomMemberToParticipants:(MXRoomMember*)mxMember
{
// Remove previous occurrence of this member (if any)
if (mutableParticipants.count)
[self removeParticipantByKey:mxMember.userId];
// If any, remove 3pid invite corresponding to this room member
if (mxMember.thirdPartyInviteToken)
{
NSUInteger index = [mutableParticipants indexOfObject:mxMember.userId];
if (index != NSNotFound)
{
[mxkContactsById removeObjectForKey:mxMember.userId];
[mutableParticipants removeObjectAtIndex:index];
}
[self removeParticipantByKey:mxMember.thirdPartyInviteToken];
}
// Add this member after checking his status
@@ -370,10 +368,14 @@
- (void)addRoomRoomThirdPartyInviteToParticipants:(MXRoomThirdPartyInvite*)roomThirdPartyInvite
{
Contact *contact = [[Contact alloc] initMatrixContactWithDisplayName:roomThirdPartyInvite.displayname andMatrixID:nil];
mxkContactsById[roomThirdPartyInvite.token] = contact;
// If the homeserver has converted the 3pid invite into a room member, do no show it
if (![self.mxRoom.state memberWithThirdPartyInviteToken:roomThirdPartyInvite.token])
{
Contact *contact = [[Contact alloc] initMatrixContactWithDisplayName:roomThirdPartyInvite.displayname andMatrixID:nil];
mxkContactsById[roomThirdPartyInvite.token] = contact;
[self addContactToParticipants:contact withKey:roomThirdPartyInvite.token isAdmin:NO];
[self addContactToParticipants:contact withKey:roomThirdPartyInvite.token isAdmin:NO];
}
}
- (void)addContactToParticipants:(Contact*)theContact withKey:(NSString*)key isAdmin:(BOOL)isAdmin
@@ -445,6 +447,20 @@
[mutableParticipants insertObject:key atIndex:index];
}
// key is a room member user id or a room 3pid invite token
- (void)removeParticipantByKey:(NSString*)key
{
if (mutableParticipants.count)
{
NSUInteger index = [mutableParticipants indexOfObject:key];
if (index != NSNotFound)
{
[mxkContactsById removeObjectForKey:key];
[mutableParticipants removeObjectAtIndex:index];
}
}
}
- (void)addPendingActionMask
{
// Add a spinner above the tableview to avoid that the user tap on any other button