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

BF: Jitsi: Crash if the user display name has several components (#1616)

Browse Source
This commit is contained in:
manuroe
2017-10-25 16:46:03 +02:00
parent b9876ab991
commit 643e2256af
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Utils/Widgets/Widget.m
+12 -5
View File
@@ -43,11 +43,18 @@
// Format the url string with user data
if (_url)
{
_url = [_url stringByReplacingOccurrencesOfString:@"$matrix_user_id" withString:mxSession.myUser.userId];
_url = [_url stringByReplacingOccurrencesOfString:@"$matrix_display_name"
withString:mxSession.myUser.displayname ? mxSession.myUser.displayname : mxSession.myUser.userId];
_url = [_url stringByReplacingOccurrencesOfString:@"$matrix_avatar_url"
withString:mxSession.myUser.avatarUrl ? mxSession.myUser.avatarUrl : @""];
NSString *userId = mxSession.myUser.userId;
NSString *displayName = mxSession.myUser.displayname ? mxSession.myUser.displayname : mxSession.myUser.userId;
NSString *avatarUrl = mxSession.myUser.avatarUrl ? mxSession.myUser.avatarUrl : @"";
// Escape everything to build a valid URL string
userId = [userId stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
displayName = [displayName stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
avatarUrl = [avatarUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
_url = [_url stringByReplacingOccurrencesOfString:@"$matrix_user_id" withString:userId];
_url = [_url stringByReplacingOccurrencesOfString:@"$matrix_display_name" withString:displayName];
_url = [_url stringByReplacingOccurrencesOfString:@"$matrix_avatar_url" withString:avatarUrl];
// And their scalar token
NSString *scalarToken = [[WidgetManager sharedManager] scalarTokenForMXSession:mxSession];