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

Merge pull request #1497 from vector-im/widget_manager

Browse Source 
Widget: Define same app settings for modular as in https://riot.im/ap…
This commit is contained in:
manuroe
2017-09-06 18:16:09 +02:00
committed by GitHub
parent b52e878368 4aafb7cbe9
commit 7c1d10eb55
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Riot-Defaults.plist
+4
View File
@@ -24,6 +24,10 @@
<string>https://riot.im/beta</string>
<key>webAppUrl</key>
<string>https://riot.im/app</string>
<key>integrationsUiUrl</key>
<string>https://scalar.vector.im/</string>
<key>integrationsRestUrl</key>
<string>https://scalar.vector.im/api</string>
<key>apnsDeviceToken</key>
<string></string>
<key>showAllEventsInRoomHistory</key>
Riot/Utils/Widgets/WidgetManager.m
+3 -2
View File
@@ -181,10 +181,11 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
NSString *confId = [room.roomId substringWithRange:NSMakeRange(1, [room.roomId rangeOfString:@":"].location - 1)];
confId = [confId stringByAppendingString:widgetSessionId];
// TODO: This url may come from modular API
// TODO: This url should come from modular API
// Note: this url can be used as is inside a web container (like iframe for Riot-web)
// Riot-iOS does not directly use it but extracts params from it (see `[JitsiViewController openWidget:withVideo:]`)
NSString *url = [NSString stringWithFormat:@"https://scalar-staging.riot.im/scalar/api/widgets/jitsi.html?confId=%@&isAudioConf=%@&displayName=$matrix_display_name&avatarUrl=$matrix_avatar_url&email=$matrix_user_id@", confId, video ? @"false" : @"true"];
NSString *modularRestUrl = [[NSUserDefaults standardUserDefaults] objectForKey:@"integrationsRestUrl"];
NSString *url = [NSString stringWithFormat:@"%@/widgets/jitsi.html?confId=%@&isAudioConf=%@&displayName=$matrix_display_name&avatarUrl=$matrix_avatar_url&email=$matrix_user_id@", modularRestUrl, confId, video ? @"false" : @"true"];
NSString *hash = [NSString stringWithFormat:@"%p", room.mxSession];
successBlockForWidgetCreation[hash][widgetId] = success;