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

Merge branch 'develop' into spaces

Browse Source 
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
This commit is contained in:
Gil Eluard
2021-08-03 21:22:43 +02:00
parent f474efdc08 3e227f20ea
commit 28015fcd29
54 changed files with 589 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/NotificationSettings/RoomNotificationsSettingsService.swift
+8 -2
View File
@@ -264,11 +264,17 @@ fileprivate extension MXRoom {
}
var overridePushRule: MXPushRule? {
getRoomRule(from: mxSession.notificationCenter.rules.global.override)
guard let overrideRules = mxSession.notificationCenter.rules.global.override else {
return nil
}
return getRoomRule(from: overrideRules)
}
var roomPushRule: MXPushRule? {
getRoomRule(from: mxSession.notificationCenter.rules.global.room)
guard let roomRules = mxSession.notificationCenter.rules.global.room else {
return nil
}
return getRoomRule(from: roomRules)
}
var notificationState: RoomNotificationState {