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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Stefan Ceriu
2022-02-16 12:45:06 +02:00
parent 581aed5c84 4140fd8a94
commit 92f633cccb
10 changed files with 60 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/MXKRoomViewController.m
+8 -3
View File
@@ -3312,7 +3312,7 @@
roomDataSource.partialTextMessage = inputToolbarView.textMessage;
}
[self handleTypingNotification:typing];
[self handleTypingState:typing];
}
- (void)roomInputToolbarView:(MXKRoomInputToolbarView*)toolbarView heightDidChanged:(CGFloat)height completion:(void (^)(BOOL finished))completion
@@ -3433,7 +3433,7 @@
}
# pragma mark - Typing notification
- (void)handleTypingNotification:(BOOL)typing
- (void)handleTypingState:(BOOL)typing
{
NSUInteger notificationTimeoutMS = -1;
if (typing)
@@ -3495,6 +3495,11 @@
lastTypingDate = nil;
}
[self sendTypingNotification:typing timeout:notificationTimeoutMS];
}
- (void)sendTypingNotification:(BOOL)typing timeout:(NSUInteger)notificationTimeoutMS
{
MXWeakify(self);
// Send typing notification to server
@@ -3525,7 +3530,7 @@
// Check whether a new typing event has been observed
BOOL typing = (lastTypingDate != nil);
// Post a new typing notification
[self handleTypingNotification:typing];
[self handleTypingState:typing];
}