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

Converting existing rooms to/from DMs

Browse Source 
#715

Use the new method added in MXSession API `directJoinedRoomWithUserId:`: returns the first joined direct chat listed in account data for this user.
This commit is contained in:
giomfo
2016-11-03 18:12:08 +01:00
parent 058a58feaa
commit cdb14582da
3 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/ViewController/ContactDetailsViewController.m
+20 -8
View File
@@ -65,7 +65,7 @@
/**
List of the direct chats (room ids) with this contact.
*/
NSArray<NSString*> *directChatsArray;
NSMutableArray<NSString*> *directChatsArray;
NSInteger directChatsIndex;
/**
@@ -111,6 +111,7 @@
}
actionsArray = [[NSMutableArray alloc] init];
directChatsArray = [[NSMutableArray alloc] init];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
@@ -517,7 +518,7 @@
NSInteger sectionCount = 0;
[actionsArray removeAllObjects];
directChatsArray = nil;
[directChatsArray removeAllObjects];
actionsIndex = directChatsIndex = -1;
@@ -553,8 +554,6 @@
actionsIndex = sectionCount++;
}
// Retrieve the existing direct chats
directChatsArray = self.mainSession.directRooms[matrixId];
directChatsIndex = sectionCount++;
}
// Else check whether the contact has been instantiated with an email or a matrix id
@@ -564,11 +563,25 @@
}
else if ([MXTools isMatrixUserIdentifier:_contact.displayName])
{
// Retrieve the existing direct chats
directChatsArray = self.mainSession.directRooms[_contact.displayName];
matrixId = _contact.displayName;
directChatsIndex = sectionCount++;
}
if (matrixId.length)
{
// Retrieve the existing direct chats
NSArray *directRoomIds = self.mainSession.directRooms[matrixId];
// Check whether the room is still existing
for (NSString* directRoomId in directRoomIds)
{
if ([self.mainSession roomWithRoomId:directRoomId])
{
[directChatsArray addObject:directRoomId];
}
}
}
return sectionCount;
}
@@ -936,8 +949,7 @@
NSString *matrixId = self.firstMatrixId;
NSString *directRoomId = self.mainSession.directRooms[matrixId].firstObject;
MXRoom* directRoom = [self.mainSession roomWithRoomId:directRoomId];
MXRoom* directRoom = [self.mainSession directJoinedRoomWithUserId:matrixId];
// Place the call directly if the room exists
if (directRoom)
Vector/ViewController/RoomMemberDetailsViewController.m
+13 -4
View File
@@ -53,7 +53,7 @@
/**
List of the direct chats (room ids) with this member.
*/
NSArray<NSString*> *directChatsArray;
NSMutableArray<NSString*> *directChatsArray;
NSInteger directChatsIndex;
/**
@@ -88,6 +88,7 @@
adminActionsArray = [[NSMutableArray alloc] init];
otherActionsArray = [[NSMutableArray alloc] init];
directChatsArray = [[NSMutableArray alloc] init];
// Setup `MXKViewControllerHandling` properties
self.defaultBarTintColor = kVectorNavBarTintColor;
@@ -351,7 +352,7 @@
[adminActionsArray removeAllObjects];
[otherActionsArray removeAllObjects];
directChatsArray = nil;
[directChatsArray removeAllObjects];
// Consider the case of the user himself
if ([self.mxRoomMember.userId isEqualToString:self.mainSession.myUser.userId])
@@ -487,11 +488,19 @@
}
// Retrieve the existing direct chats
directChatsArray = self.mainSession.directRooms[self.mxRoomMember.userId];
NSArray *directRoomIds = self.mainSession.directRooms[self.mxRoomMember.userId];
// Check whether the room is still existing
for (NSString* directRoomId in directRoomIds)
{
if ([self.mainSession roomWithRoomId:directRoomId])
{
[directChatsArray addObject:directRoomId];
}
}
adminToolsIndex = otherActionsIndex = directChatsIndex = -1;
if (otherActionsArray.count)
{
otherActionsIndex = sectionCount++;