Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for interactive notifications (fixes #625) #1777

Merged
merged 4 commits into from
Feb 26, 2018
Merged

Add support for interactive notifications (fixes #625) #1777

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a90ff0
Add support for interactive notifications
joeywatts Feb 20, 2018
125aecb
Fix quick reply on encrypted notifications
joeywatts Feb 20, 2018
21ec4c6
Use RoomDataSource to send message, send failure notification on error
joeywatts Feb 23, 2018
31e3501
Correctly acquire RoomDataSource instance
joeywatts Feb 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 72 additions & 1 deletion Riot/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,8 +1067,24 @@ - (void)registerUserNotificationSettings
{
if (!isPushRegistered)
{
NSMutableSet* notificationCategories = [NSMutableSet set];
if ([[UIMutableUserNotificationAction class] instancesRespondToSelector:@selector(behavior)])
{
UIMutableUserNotificationAction* quickReply = [[UIMutableUserNotificationAction alloc] init];
quickReply.title = NSLocalizedStringFromTable(@"room_message_short_placeholder", @"Vector", nil);
quickReply.identifier = @"inline-reply";
quickReply.activationMode = UIUserNotificationActivationModeBackground;
quickReply.authenticationRequired = true;
quickReply.behavior = UIUserNotificationActionBehaviorTextInput;

UIMutableUserNotificationCategory* quickReplyCategory = [[UIMutableUserNotificationCategory alloc] init];
quickReplyCategory.identifier = @"QUICK_REPLY";
[quickReplyCategory setActions:[NSArray arrayWithObjects:quickReply, nil] forContext:UIUserNotificationActionContextDefault];
[notificationCategories addObject:quickReplyCategory];
}

// Registration on iOS 8 and later
UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:(UIUserNotificationTypeBadge | UIUserNotificationTypeSound |UIUserNotificationTypeAlert) categories:nil];
UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:(UIUserNotificationTypeBadge | UIUserNotificationTypeSound |UIUserNotificationTypeAlert) categories:notificationCategories];
[[UIApplication sharedApplication] registerUserNotificationSettings:settings];
}
}
Expand Down Expand Up @@ -1097,6 +1113,55 @@ - (void)application:(UIApplication *)application didRegisterUserNotificationSett
}
}

- (void)application:(UIApplication *)application handleActionWithIdentifier:(NSString *)identifier forLocalNotification:(UILocalNotification *)notification withResponseInfo:(NSDictionary *)responseInfo completionHandler:(void (^)())completionHandler
{
if ([identifier isEqualToString: @"inline-reply"])
{
NSString* roomId = notification.userInfo[@"room_id"];
if (roomId.length)
{
NSArray* mxAccounts = [MXKAccountManager sharedManager].activeAccounts;
MXKRoomDataSource* roomDataSource = nil;
for (MXKAccount* account in mxAccounts)
{
MXKRoomDataSourceManager* manager = [MXKRoomDataSourceManager sharedManagerForMatrixSession:account.mxSession];
if (manager)
{
roomDataSource = [manager roomDataSourceForRoom:roomId create:false];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need create:YES to make sure we will have an instance of MXKRoomDataSource.
But we cannot call it in this loop because we will have instance even if the MXSession does not know the room.

So we need to come back to the previous lookup with room = [account.mxSession roomWithRoomId:roomId];. Something like

            MXKRoomDataSource* roomDataSource = nil;
            for (MXKAccount* account in mxAccounts)
            {
                MXRoom *room = [account.mxSession roomWithRoomId:roomId];
                if (room)
                {
                    MXKRoomDataSourceManager* manager = [MXKRoomDataSourceManager sharedManagerForMatrixSession:account.mxSession];
                    if (manager)
                    {
                        roomDataSource = [manager roomDataSourceForRoom:roomId create:YES];
                    }
                    break;
                }
            }

if (roomDataSource)
{
break;
}
}
}
if (roomDataSource == nil)
{
NSLog(@"[AppDelegate][Push] handleActionWithIdentifier: room data source with id %@ not found", roomId);
}
else
{
NSString* responseText = [responseInfo objectForKey:UIUserNotificationActionResponseTypedTextKey];
if (responseText != nil && responseText.length != 0)
{
NSLog(@"[AppDelegate][Push] handleActionWithIdentifier: sending message to room: %@", roomId);
[roomDataSource sendTextMessage:responseText success:^(NSString* eventId) {} failure:^(NSError* error) {
UILocalNotification* failureNotification = [[UILocalNotification alloc] init];
failureNotification.alertBody = NSLocalizedStringFromTable(@"room_event_failed_to_send", @"Vector", nil);
failureNotification.userInfo = notification.userInfo;
[[UIApplication sharedApplication] scheduleLocalNotification: failureNotification];
NSLog(@"[AppDelegate][Push] handleActionWithIdentifier: error sending text message: %@", error);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How to deal better with the error? Is it possible to display it to the end user?
My concern is e2e rooms where sending can fail because there are new devices in a room. The sending fails because the user has not validated those new devices yet.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I encountered that issue in my testing... Couldn’t figure out how to properly notify the user. How about another local notification that indicates there was an error sending the message?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good idea. The user should be able to go the room when clicking on this notification.

Then, the app will automatically propose them to resend the message. This failure flow seems not too bad.

}];
}
}
}
}
else
{
NSLog(@"[AppDelegate][Push] handleActionWithIdentifier: unhandled identifier %@", identifier);
}
completionHandler();
}

- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification
{
NSLog(@"[AppDelegate][Push] didReceiveLocalNotification: applicationState: %@", @(application.applicationState));
Expand Down Expand Up @@ -1350,6 +1415,12 @@ - (void)handleLocalNotificationsForAccount:(MXKAccount*)account
@"user_id": account.mxCredentials.userId
};

BOOL isNotificationContentShown = !event.isEncrypted || account.showDecryptedContentInNotifications;
if ((event.eventType == MXEventTypeRoomMessage || event.eventType == MXEventTypeRoomEncrypted) && isNotificationContentShown)
{
eventNotification.category = @"QUICK_REPLY";
}

// Set sound name based on the value provided in action of MXPushRule
for (MXPushRuleAction *action in rule.actions)
{
Expand Down