Send Stickers: Pass widget id to widgets urls

#1860 This is mandatory for the sticker picker widget
element-hq · May 7, 2018 · 5ab475c · 5ab475c
1 parent 7a0afe1
commit 5ab475c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Riot/Utils/Widgets/Widget.m b/Riot/Utils/Widgets/Widget.m
@@ -70,9 +70,6 @@ - (MXHTTPOperation *)widgetUrl:(void (^)(NSString * _Nonnull))success failure:(v
             widgetUrl = [widgetUrl stringByReplacingOccurrencesOfString:@"$matrix_display_name" withString:displayName];
             widgetUrl = [widgetUrl stringByReplacingOccurrencesOfString:@"$matrix_avatar_url" withString:avatarUrl];
 
-            // And add the user scalar token
-            widgetUrl = [widgetUrl stringByAppendingString:[NSString stringWithFormat:@"&scalar_token=%@", scalarToken]];
-
             // Integrate widget data into widget url
             for (NSString *key in _data)
             {
@@ -100,6 +97,14 @@ - (MXHTTPOperation *)widgetUrl:(void (^)(NSString * _Nonnull))success failure:(v
                 }
             }
 
+            // Add the user scalar token
+            widgetUrl = [widgetUrl stringByAppendingString:[NSString stringWithFormat:@"%@scalar_token=%@",
+                                                            [widgetUrl containsString:@"?"] ? @"&" : @"?",
+                                                            scalarToken]];
+
+            // Add the widget id
+            widgetUrl = [widgetUrl stringByAppendingString:[NSString stringWithFormat:@"&widgetId=%@", _widgetId]];
+
             success(widgetUrl);
         }