Commit 18e82fe0 authored by Felix Paul Kühne's avatar Felix Paul Kühne

fix ftp streaming off connected servers for files using non-ASCII names or for...

fix ftp streaming off connected servers for files using non-ASCII names or for paths containing spaces by properly escaping the url (close #10469)
parent 935bd004
...@@ -337,8 +337,8 @@ ...@@ -337,8 +337,8 @@
UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", @"") message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", @""), properObjectName] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil]; UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"FILE_NOT_SUPPORTED", @"") message:[NSString stringWithFormat:NSLocalizedString(@"FILE_NOT_SUPPORTED_LONG", @""), properObjectName] delegate:self cancelButtonTitle:NSLocalizedString(@"BUTTON_CANCEL", @"") otherButtonTitles:nil];
[alert show]; [alert show];
} else } else
[self _openURLStringAndDismiss:[_FTPListDirRequest.fullURLString stringByAppendingString:properObjectName]]; [self _streamFTPFile:properObjectName];
} }
} }
[tableView deselectRowAtIndexPath:indexPath animated:NO]; [tableView deselectRowAtIndexPath:indexPath animated:NO];
} }
...@@ -463,10 +463,12 @@ ...@@ -463,10 +463,12 @@
} }
#pragma mark - communication with playback engine #pragma mark - communication with playback engine
- (void)_openURLStringAndDismiss:(NSString *)url - (void)_streamFTPFile:(NSString *)fileName
{ {
NSURL *URLToPlay = [NSURL URLWithString:[[@"ftp" stringByAppendingFormat:@"://%@%@/%@/%@", [self _credentials], _ftpServerAddress, _ftpServerPath, fileName] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
VLCAppDelegate* appDelegate = [UIApplication sharedApplication].delegate; VLCAppDelegate* appDelegate = [UIApplication sharedApplication].delegate;
[appDelegate openMovieFromURL:[NSURL URLWithString:url]]; [appDelegate openMovieFromURL:URLToPlay];
} }
#pragma mark - Search Display Controller Delegate #pragma mark - Search Display Controller Delegate
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment