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

Move AppSettings in MatrixKit.

Browse Source
This commit is contained in:
giomfo
2015-04-15 10:14:14 +02:00
parent f5ded32823
commit 915e1b55a5
10 changed files with 58 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrixConsole/API/MatrixSDKHandler.m
+26 -27
View File
@@ -16,7 +16,6 @@
#import "MatrixSDKHandler.h"
#import "AppDelegate.h"
#import "AppSettings.h"
#import "MXFileStore.h"
#import "MXTools.h"
@@ -149,31 +148,31 @@ static MatrixSDKHandler *sharedHandler = nil;
[self.mxSession setStore:_mxFileStore success:^{
typeof(self) self = weakSelf;
self.status = MatrixSDKHandlerStatusStoreDataReady;
// Check here whether the app user wants to display all the events
if ([[AppSettings sharedSettings] displayAllEvents]) {
// Use a filter to retrieve all the events (except kMXEventTypeStringPresence which are not related to a specific room)
self.eventsFilterForMessages = @[
kMXEventTypeStringRoomName,
kMXEventTypeStringRoomTopic,
kMXEventTypeStringRoomMember,
kMXEventTypeStringRoomCreate,
kMXEventTypeStringRoomJoinRules,
kMXEventTypeStringRoomPowerLevels,
kMXEventTypeStringRoomAliases,
kMXEventTypeStringRoomMessage,
kMXEventTypeStringRoomMessageFeedback,
kMXEventTypeStringRoomRedaction
];
}
else {
// Display only a subset of events
self.eventsFilterForMessages = @[
kMXEventTypeStringRoomName,
kMXEventTypeStringRoomTopic,
kMXEventTypeStringRoomMember,
kMXEventTypeStringRoomMessage
];
}
// // Check here whether the app user wants to display all the events
// if ([[AppSettings sharedSettings] displayAllEvents]) {
// // Use a filter to retrieve all the events (except kMXEventTypeStringPresence which are not related to a specific room)
// self.eventsFilterForMessages = @[
// kMXEventTypeStringRoomName,
// kMXEventTypeStringRoomTopic,
// kMXEventTypeStringRoomMember,
// kMXEventTypeStringRoomCreate,
// kMXEventTypeStringRoomJoinRules,
// kMXEventTypeStringRoomPowerLevels,
// kMXEventTypeStringRoomAliases,
// kMXEventTypeStringRoomMessage,
// kMXEventTypeStringRoomMessageFeedback,
// kMXEventTypeStringRoomRedaction
// ];
// }
// else {
// // Display only a subset of events
// self.eventsFilterForMessages = @[
// kMXEventTypeStringRoomName,
// kMXEventTypeStringRoomTopic,
// kMXEventTypeStringRoomMember,
// kMXEventTypeStringRoomMessage
// ];
// }
// Complete session registration by launching live stream
[self launchInitialServerSync];
@@ -233,7 +232,7 @@ static MatrixSDKHandler *sharedHandler = nil;
}];
// Check whether the app user wants notifications on new events
if ([[AppSettings sharedSettings] enableInAppNotifications]) {
if ([[MXKAppSettings sharedSettings] enableInAppNotifications]) {
[self enableInAppNotifications:YES];
}
} failure:^(NSError *error) {