Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-25217] (6_2_X) iOS: Fix parsing of unicode-characters #9387

Merged
merged 4 commits into from
Sep 5, 2017
Merged

[TIMOB-25217] (6_2_X) iOS: Fix parsing of unicode-characters #9387

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9581dd
[TIMOB-25217] Fix parsing of unicode-characters
hansemannn Sep 1, 2017
3f72642
[TIMOB-25217] Add missing line
hansemannn Sep 1, 2017
93ad0ac
Merge branch '6_2_X' into TIMOB-25217-6_2_X
vijaysingh-axway Sep 4, 2017
1da5ec7
Merge branch '6_2_X' into TIMOB-25217-6_2_X
ewieberappc Sep 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 14 additions & 6 deletions iphone/Classes/XHRBridge.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,20 @@ -(void)handleAppToTiRequest
NSString *module = [parts objectAtIndex:1];
NSString *method = [parts objectAtIndex:2];
NSString *prearg = [url query];
NSString *arguments = prearg==nil ? @"" : [prearg stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];


NSError *error = nil;
NSDictionary *event = [TiUtils jsonParse:arguments error:&error];

NSString *arguments = prearg==nil ? @"" : [prearg stringByRemovingPercentEncoding];

// Decode Ascii unicode-characters
NSString *decodevalue = [[NSString alloc] initWithData:[arguments dataUsingEncoding:NSUTF8StringEncoding]
encoding:NSNonLossyASCIIStringEncoding];

// Replace < and > characters with quotes
NSString *jsonString = [[decodevalue stringByReplacingOccurrencesOfString:@"<" withString:@"\""]
stringByReplacingOccurrencesOfString:@">"
withString:@"\""];

// Parse the JSON-string to a dictionary
NSDictionary *event = [TiUtils jsonParse:jsonString];

id<TiEvaluator> context = [[xhrBridge host] contextForToken:pageToken];
TiModule *tiModule = (TiModule*)[[xhrBridge host] moduleNamed:module context:context];
[tiModule setExecutionContext:context];
Expand Down