From c1528d0944d11788727fde1994760c17818cf76f Mon Sep 17 00:00:00 2001 From: Miguel Alatzar Date: Thu, 27 Feb 2020 20:39:53 -0700 Subject: [PATCH] Add set_online query param (#3940) --- .../NotificationReplyBroadcastReceiver.java | 15 +++++++++------ ...RNNotificationEventHandler+HandleReplyAction.m | 7 ++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java b/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java index 8f1248e65..786c36b02 100644 --- a/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java +++ b/android/app/src/main/java/com/mattermost/rnbeta/NotificationReplyBroadcastReceiver.java @@ -63,7 +63,6 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver { String token = map.getString("password"); String serverUrl = map.getString("service"); - Log.i("ReactNative", String.format("URL=%s", serverUrl)); replyToMessage(serverUrl, token, notificationId, message); } } @@ -88,12 +87,16 @@ public class NotificationReplyBroadcastReceiver extends BroadcastReceiver { final MediaType JSON = MediaType.parse("application/json; charset=utf-8"); String json = buildReplyPost(channelId, rootId, message.toString()); RequestBody body = RequestBody.create(JSON, json); + + String postsEndpoint = "/api/v4/posts?set_online=false"; + String url = String.format("%s%s", serverUrl.replaceAll("/$", ""), postsEndpoint); + Log.i("ReactNative", String.format("Reply URL=%s", url)); Request request = new Request.Builder() - .header("Authorization", String.format("Bearer %s", token)) - .header("Content-Type", "application/json") - .url(String.format("%s/api/v4/posts", serverUrl.replaceAll("/$", ""))) - .post(body) - .build(); + .header("Authorization", String.format("Bearer %s", token)) + .header("Content-Type", "application/json") + .url(url) + .post(body) + .build(); client.newCall(request).enqueue(new okhttp3.Callback() { @Override diff --git a/ios/Mattermost/RNNotificationEventHandler+HandleReplyAction.m b/ios/Mattermost/RNNotificationEventHandler+HandleReplyAction.m index cace133ab..e06975c75 100644 --- a/ios/Mattermost/RNNotificationEventHandler+HandleReplyAction.m +++ b/ios/Mattermost/RNNotificationEventHandler+HandleReplyAction.m @@ -71,9 +71,10 @@ NSString *const ReplyActionID = @"REPLY_ACTION"; [self handleReplyFailure:channelId completionHandler:notificationCompletionHandler]; return; } - - NSString *urlString = [NSString stringWithFormat:@"%@/api/v4/posts", serverUrl]; - NSURL *url = [NSURL URLWithString:urlString]; + + NSString *urlString = [serverUrl stringByReplacingOccurrencesOfString:@"/$" withString:@"" options:NSRegularExpressionSearch range:NSMakeRange(0, [serverUrl length])]; + NSString *postsEndpoint = @"/api/v4/posts?set_online=false"; + NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@%@", urlString, postsEndpoint]]; NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url]; [request setHTTPMethod:@"POST"]; [request setValue:[NSString stringWithFormat:@"Bearer %@", sessionToken] forHTTPHeaderField:@"Authorization"];