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

Adapt MXEventTimeline changes

Browse Source
This commit is contained in:
ismailgulek
2021-12-15 01:44:04 +03:00
parent 902d81490f
commit d211d6640c
12 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m
+1 -1
View File
@@ -1197,7 +1197,7 @@ static const CGFloat kLocalPreviewMargin = 20;
if (roomListener && mxCall.room)
{
MXWeakify(self);
[mxCall.room liveTimeline:^(MXEventTimeline *liveTimeline) {
[mxCall.room liveTimeline:^(id<MXEventTimeline> liveTimeline) {
MXStrongifyAndReturnIfNil(self);
[liveTimeline removeListener:self->roomListener];
Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.h
+1 -1
View File
@@ -117,7 +117,7 @@ typedef enum : NSUInteger
*/
@property (nonatomic, readonly) MXRoomMember *mxRoomMember;
@property (nonatomic, readonly) MXRoom *mxRoom;
@property (nonatomic, readonly) MXEventTimeline *mxRoomLiveTimeline;
@property (nonatomic, readonly) id<MXEventTimeline> mxRoomLiveTimeline;
/**
Enable mention option. NO by default
Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.m
+4 -4
View File
@@ -44,7 +44,7 @@
id roomDidFlushDataNotificationObserver;
// Cache for the room live timeline
MXEventTimeline *mxRoomLiveTimeline;
id<MXEventTimeline> mxRoomLiveTimeline;
}
@end
@@ -134,7 +134,7 @@
mxRoom = room;
MXWeakify(self);
[mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
[mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
MXStrongifyAndReturnIfNil(self);
self->mxRoomLiveTimeline = liveTimeline;
@@ -152,7 +152,7 @@
}];
}
- (MXEventTimeline *)mxRoomLiveTimeline
- (id<MXEventTimeline> )mxRoomLiveTimeline
{
// @TODO(async-state): Just here for dev
NSAssert(mxRoomLiveTimeline, @"[MXKRoomMemberDetailsViewController] Room live timeline must be preloaded before accessing to MXKRoomMemberDetailsViewController.mxRoomLiveTimeline");
@@ -569,7 +569,7 @@
if (membersListener && mxRoom)
{
MXWeakify(self);
[mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
[mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
MXStrongifyAndReturnIfNil(self);
[liveTimeline removeListener:self->membersListener];
Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.m
+2 -2
View File
@@ -70,7 +70,7 @@
if (roomListener)
{
MXWeakify(self);
[mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
[mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
MXStrongifyAndReturnIfNil(self);
[liveTimeline removeListener:self->roomListener];
@@ -139,7 +139,7 @@
{
// Register a listener to handle messages related to room name, topic...
MXWeakify(self);
[mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
[mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
MXStrongifyAndReturnIfNil(self);
self->roomListener = [liveTimeline listenToEventsOfTypes:@[kMXEventTypeStringRoomName, kMXEventTypeStringRoomTopic, kMXEventTypeStringRoomAliases, kMXEventTypeStringRoomAvatar, kMXEventTypeStringRoomPowerLevels, kMXEventTypeStringRoomCanonicalAlias, kMXEventTypeStringRoomJoinRules, kMXEventTypeStringRoomGuestAccess, kMXEventTypeStringRoomHistoryVisibility] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h
+1 -1
View File
@@ -138,7 +138,7 @@ extern NSString *const kMXKRoomDataSourceTimelineErrorErrorKey;
The timeline being managed. It can be the live timeline of the room
or a timeline from a past event, initialEventId.
*/
@property (nonatomic, readonly) MXEventTimeline *timeline;
@property (nonatomic, readonly) id<MXEventTimeline> timeline;
/**
Flag indicating if the data source manages, or will manage, a live timeline.
Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
+4 -6
View File
@@ -203,7 +203,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
@property (nonatomic, readwrite) MXRoom *room;
@property (nonatomic, readwrite) MXRoom *secondaryRoom;
@property (nonatomic, strong) MXEventTimeline *secondaryTimeline;
@property (nonatomic, strong) id<MXEventTimeline> secondaryTimeline;
@property (nonatomic, readwrite) NSString *threadId;
@end
@@ -258,7 +258,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
// Asynchronously preload data here so that the data will be ready later
// to synchronously respond to that request
[roomDataSource.room liveTimeline:^(MXEventTimeline *liveTimeline) {
[roomDataSource.room liveTimeline:^(id<MXEventTimeline> liveTimeline) {
onComplete(roomDataSource);
}];
}
@@ -642,7 +642,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
{
// LIVE
MXWeakify(self);
[_room liveTimeline:^(MXEventTimeline *liveTimeline) {
[_room liveTimeline:^(id<MXEventTimeline> liveTimeline) {
MXStrongifyAndReturnIfNil(self);
self->_timeline = liveTimeline;
@@ -704,7 +704,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
if (_secondaryRoom)
{
MXWeakify(self);
[_secondaryRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
[_secondaryRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
MXStrongifyAndReturnIfNil(self);
self->_secondaryTimeline = liveTimeline;
@@ -1458,7 +1458,6 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
paginationRequest = [_timeline paginate:numItems
direction:direction
onlyFromStore:onlyFromStore
threadId:_threadId
complete:^{
MXStrongifyAndReturnIfNil(self);
@@ -1526,7 +1525,6 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
secondaryPaginationRequest = [_secondaryTimeline paginate:numItems
direction:direction
onlyFromStore:onlyFromStore
threadId:_threadId
complete:^{
MXStrongifyAndReturnIfNil(self);
Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberListDataSource.m
+1 -1
View File
@@ -85,7 +85,7 @@ NSString *const kMXKRoomMemberCellIdentifier = @"kMXKRoomMemberCellIdentifier";
if (typingNotifListener)
{
MXWeakify(self);
[mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
[mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
MXStrongifyAndReturnIfNil(self);
[liveTimeline removeListener:self->typingNotifListener];
Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.m
+1 -1
View File
@@ -115,7 +115,7 @@
if (self->roomTopicListener && self.mxRoom)
{
MXWeakify(self);
[self.mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
[self.mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
MXStrongifyAndReturnIfNil(self);
[liveTimeline removeListener:self->roomTopicListener];