Merge pull request #25 from ajorpheus/master

Nico Oelgart · web-flow · commit 287a63bb2e32 · 2017-04-19T21:39:04.000+02:00
Fix regex to parse callback URL &amp; save access token
diff --git a/put.io adder/PutioHelper.m b/put.io adder/PutioHelper.m
@@ -340,7 +340,7 @@ - (void)checkForUpdates
 - (void)saveAccessToken:(NSString *)url
 {
     NSError *error = nil;
-    NSString *pattern = @"^putio://callback#access_token=(.*)";
+    NSString *pattern = @"^putio://callback\\?#access_token=(.*)";
     NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:pattern options:0 error:&error];
     NSArray *matches = [regex matchesInString:url options:0 range:NSMakeRange(0, [url length])];
     
@@ -387,4 +387,4 @@ - (NSString*)transformedValue:(double)value
     return [str stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
 }
 
-@end
+@end

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ - (void)checkForUpdates`
`340`	`340`	`- (void)saveAccessToken:(NSString *)url`
`341`	`341`	`{`
`342`	`342`	`NSError *error = nil;`
`343`		`- NSString pattern = @"^putio://callback#access_token=(.)";`
	`343`	`+ NSString pattern = @"^putio://callback\\?#access_token=(.)";`
`344`	`344`	`NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:pattern options:0 error:&error];`
`345`	`345`	`NSArray *matches = [regex matchesInString:url options:0 range:NSMakeRange(0, [url length])];`
`346`	`346`
`@@ -387,4 +387,4 @@ - (NSString*)transformedValue:(double)value`
`387`	`387`	`return [str stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];`
`388`	`388`	`}`
`389`	`389`
`390`		`-@end`
	`390`	`+@end`