From 03c3def8c6d5ef73bf05967ac0f5034451a04187 Mon Sep 17 00:00:00 2001 From: Miltiadis Vasilakis Date: Fri, 15 Feb 2013 16:09:23 +0200 Subject: [PATCH] Fix bug in login redirect and url handling --- pithos-macos/PithosAccount.m | 3 ++- pithos-macos/pithos_macosAppDelegate.m | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pithos-macos/PithosAccount.m b/pithos-macos/PithosAccount.m index c5c9070..e833d01 100644 --- a/pithos-macos/PithosAccount.m +++ b/pithos-macos/PithosAccount.m @@ -38,6 +38,7 @@ #import "PithosAccount.h" #import "PithosSyncDaemon.h" #import "ASIPithos.h" +#import "ASIPithosRequest.h" #import "PithosAccountNode.h" #import "PithosSharingAccountsNode.h" #import "pithos_macosAppDelegate.h" @@ -379,7 +380,7 @@ self.serverURL = aServerURL; NSProcessInfo *processInfo = [NSProcessInfo processInfo]; NSString *loginURL = [NSString stringWithFormat:@"%@?next=pithos://%d/%@&force=", - self.loginURLPrefix, [processInfo processIdentifier], self.name]; + self.loginURLPrefix, [processInfo processIdentifier], [ASIPithosRequest encodeToPercentEscape:self.name]]; DLog(@"Account: %@\nloginURL: %@", self, loginURL); [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:loginURL]]; } diff --git a/pithos-macos/pithos_macosAppDelegate.m b/pithos-macos/pithos_macosAppDelegate.m index 90656b6..72b75da 100644 --- a/pithos-macos/pithos_macosAppDelegate.m +++ b/pithos-macos/pithos_macosAppDelegate.m @@ -148,7 +148,7 @@ currentPithosAccount, pithosAccounts, pithosAccountsDictionary, syncPithosAccoun NSURL *url = [NSURL URLWithString:[[event paramDescriptorForKeyword:keyDirectObject] stringValue]]; NSString *host = [url host]; NSString *query = [url query]; - PithosAccount *pithosAccount = [pithosAccountsDictionary objectForKey:[url lastPathComponent]]; + PithosAccount *pithosAccount = [pithosAccountsDictionary objectForKey:[ASIPithosRequest decodeFromPercentEscape:[url lastPathComponent]]]; NSProcessInfo *processInfo = [NSProcessInfo processInfo]; if ([host isEqualToString:[NSString stringWithFormat:@"%d", [processInfo processIdentifier]]] && pithosAccount && query) { // user= -- 1.7.10.4