felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-23 18:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into aringenbach/5745_mandatory_secure_backup

Browse Source
This commit is contained in:
Arnaud Ringenbach
2022-03-21 15:28:23 +01:00
parent 42884e4350 f91a56295f
commit 42911ff2ee
109 changed files with 1413 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Application/AppCoordinator.swift
+2
View File
@@ -213,9 +213,11 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
case .homeSpace:
MXLog.verbose("Switch to home space")
self.navigateToSpace(with: nil)
Analytics.shared.activeSpace = nil
case .space(let spaceId):
MXLog.verbose("Switch to space with id: \(spaceId)")
self.navigateToSpace(with: spaceId)
Analytics.shared.activeSpace = userSessionsService.mainUserSession?.matrixSession.spaceService.getSpace(withId: spaceId)
}
}
Riot/Modules/Application/LegacyAppDelegate.m
+20
View File
@@ -1109,6 +1109,19 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
shouldNavigateToRoomWithId:(NSString *)roomId
threadId:(NSString *)threadId
{
if (roomId)
{
MXRoom *room = [self.mxSessions.firstObject roomWithRoomId:roomId];
if (room.summary.membership != MXMembershipJoin)
{
Analytics.shared.joinedRoomTrigger = AnalyticsJoinedRoomTriggerNotification;
}
else
{
Analytics.shared.viewRoomTrigger = AnalyticsViewRoomTriggerNotification;
}
}
_lastNavigatedRoomIdFromPush = roomId;
[self navigateToRoomById:roomId threadId:threadId];
}
@@ -2955,6 +2968,11 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
{
MXRoom *room = [mxSession roomWithRoomId:roomId];
if (room && room.summary.membership == MXMembershipJoin)
{
[Analytics.shared trackViewRoom:room];
}
// Indicates that spaces are not supported
if (room.summary.roomType == MXRoomTypeSpace)
{
@@ -3186,6 +3204,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
[mxSession createRoomWithParameters:roomCreationParameters success:^(MXRoom *room) {
// Open created room
Analytics.shared.viewRoomTrigger = AnalyticsViewRoomTriggerCreated;
[self showRoom:room.roomId andEventId:nil withMatrixSession:mxSession];
if (completion)
@@ -3220,6 +3239,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
if (directRoom)
{
// open it
Analytics.shared.viewRoomTrigger = AnalyticsViewRoomTriggerCreated;
[self showRoom:directRoom.roomId andEventId:nil withMatrixSession:mxSession];
if (completion)