Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Jitsi: Create jitsi widget with v2 style but stay compatible with v1

Browse source 
We use `webAppUrl`and `jitsiServerURL` from the app plist for the url start (used only by web) and the default jitsi server
This commit is contained in:
manuroe 2020-04-24 12:24:11 +02:00
parent 735f51d4ba
commit aaba08e4ce
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Riot/Managers/Widgets/WidgetManager.m
View file

@ -18,6 +18,7 @@
#import "WidgetManager.h"
#import "Riot-Swift.h"
#import "JitsiWidgetData.h"
#import <MatrixKit/MatrixKit.h>
@ -289,18 +290,40 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
NSString *confId = [room.roomId substringWithRange:NSMakeRange(1, [room.roomId rangeOfString:@":"].location - 1)];
confId = [confId stringByAppendingString:widgetSessionId];
// 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)
// Build widget url
// Riot-iOS does not directly use it but extracts params from it (see `[JitsiViewController openWidget:withVideo:]`)
NSString *url = [NSString stringWithFormat:@"%@/widgets/jitsi.html?confId=%@&isAudioConf=%@&displayName=$matrix_display_name&avatarUrl=$matrix_avatar_url&email=$matrix_user_id@", config.apiUrl, confId, video ? @"false" : @"true"];
// This url can be used as is inside a web container (like iframe for Riot-web)
// Build it from the riot-web app
NSString *appUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"webAppUrl"];
// We mix v1 and v2 param for backward compability
NSString *v1Params = [NSString stringWithFormat:@"confId=%@&isAudioConf=%@&displayName=$matrix_display_name&avatarUrl=$matrix_avatar_url&email=$matrix_user_id", confId, video ? @"false" : @"true"];
NSString *v2Params = [NSString stringWithFormat:@"conferenceDomain=$domain&conferenceId=$conferenceId&isAudioOnly=$isAudioOnly&displayName=$matrix_display_name&avatarUrl=$matrix_avatar_url&userId=$matrix_user_id"];
NSString *url = [NSString stringWithFormat:@"%@/widgets/jitsi.html?%@#%@", appUrlString, v1Params, v2Params];
// Build widget data
// We mix v1 and v2 widget data for backward compability
NSString *preferredJitsiServerUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"jitsiServerURL"];
NSURL *preferredJitsiServerUrl = [NSURL URLWithString:preferredJitsiServerUrlString];
JitsiWidgetData *jitsiWidgetData = [JitsiWidgetData new];
jitsiWidgetData.domain = preferredJitsiServerUrl.host;
jitsiWidgetData.conferenceId = confId;
jitsiWidgetData.isAudioOnly = !video;
NSDictionary *v2WidgetData = jitsiWidgetData.JSONDictionary;
NSMutableDictionary *v1AndV2WidgetData = [v2WidgetData mutableCopy];
v1AndV2WidgetData[@"widgetSessionId"] = widgetSessionId;
return [self createWidget:widgetId
withContent:@{
@"url": url,
@"type": kWidgetTypeJitsiV1,
@"data": @{
@"widgetSessionId": widgetSessionId
}
@"data": v1AndV2WidgetData
}
inRoom:room
success:success