Skip to content
This repository has been archived by the owner on Apr 1, 2024. It is now read-only.

CFURLCreateStringByAddingPercentEscapesの変更 (issue #95) #126

Merged
merged 6 commits into from Jul 24, 2017
Merged

CFURLCreateStringByAddingPercentEscapesの変更 (issue #95) #126

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
603a7e4
change CFURLCreateStringByAddingPercentEscapes to stringByAddingPerce…
vfa-thanhnh Jul 4, 2017
73f079c
Change characterset in returnEncodedString method
vfa-thanhnh Jul 5, 2017
10a422f
-Update to remove unnecessary space key
vfa-thanhnh Jul 10, 2017
59157c6
-Update to remove unnecessary space key
vfa-thanhnh Jul 10, 2017
2615bf2
Merge branch 'develop' into fix/change_deprecated_cfurlcreatestring
vfa-thanhnh Jul 20, 2017
5ed3802
Add tests for escape string in request, connection and fix escape str…
vfa-thanhnh Jul 21, 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
8 changes: 1 addition & 7 deletions NCMB/NCMBRequest/NCMBRequest.m
View file
Open in desktop
Expand Up @@ -78,13 +78,7 @@ +(NSString *)returnSessionToken {
}

+(NSString *)returnEncodedString:(NSString *)originalString {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

このメソッドのテストをNCMBTests/NCMBRequestSpec.mに追加してください。

CFStringRef escapedStrRef = CFURLCreateStringByAddingPercentEscapes(
NULL,
(__bridge CFStringRef)originalString,
NULL,
CFSTR(":/?#[]@!$&'()*+,;="),
kCFStringEncodingUTF8 );
NSString *escapedStr = CFBridgingRelease(escapedStrRef);
NSString * escapedStr = [originalString stringByAddingPercentEncodingWithAllowedCharacters:[[NSCharacterSet characterSetWithCharactersInString:@":/?#[]@!$&'()*+,;=\"<>\^`{|}"] invertedSet]];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*とescapedStrの間のspaceも削除してください

return escapedStr;
}

Expand Down
15 changes: 2 additions & 13 deletions NCMB/NCMBURLConnection/NCMBURLConnection.m
View file
Open in desktop
Expand Up @@ -107,17 +107,6 @@ - (id)initWithPath:(NSString*)path method:(NSString*)method data:(NSData*)data c
return self;
}

- (NSString*)percentEscape:(NSString*)str{
CFStringRef escapedStrRef = CFURLCreateStringByAddingPercentEscapes(
NULL,
(__bridge CFStringRef)str,
NULL,
(__bridge CFStringRef)@"!*();@+,%#\"",
kCFStringEncodingUTF8 );
NSString *escapedStr = CFBridgingRelease(escapedStrRef);
return escapedStr;
}


#pragma mark request

Expand All @@ -141,9 +130,9 @@ - (NSString*)returnEndPoint{
@return NSMutableURLRequest型リクエスト
*/
- (NSMutableURLRequest *)createRequest {
self.query = [self percentEscape:self.query];
self.query = [self.query stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
[self createSignature];
self.path = [self percentEscape:self.path];
self.path = [self.path stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLPathAllowedCharacterSet]];

//url生成
NSString *endPointStr = [self returnEndPoint];
Expand Down