#853

iOSClient/AppDelegate.m

@@ -1557,10 +1557,11 @@ PKPushRegistry *pushRegistry;
                         [tbc setSelectedIndex: k_tabBarApplicationIndexFile];
                     }
                     
-                    // GoTo home
                     [CATransaction begin];
                     [CATransaction setCompletionBlock:^{
                         
+                        NSString *fileNamePath = [NSString stringWithFormat:@"%@%@/%@", account.url, k_webDAV, path];
+
                         if ([path containsString:@"/"]) {
                             
                             // Push
@@ -1568,14 +1569,14 @@ PKPushRegistry *pushRegistry;
                             NSString *serverUrl = [CCUtility deletingLastPathComponentFromServerUrl:[NSString stringWithFormat:@"%@%@/%@", account.url, k_webDAV, [path stringByDeletingLastPathComponent]]];
                             
                             tableMetadata *metadata = [CCUtility createMetadataWithAccount:account.account date:[NSDate date] directory:NO fileID:[[NSUUID UUID] UUIDString] serverUrl:serverUrl fileName:directoryName etag:@"" size:0 status:k_metadataStatusNormal url:@""];
-                            [self.activeMain performSegueDirectoryWithControlPasscode:true metadata:metadata scrollToFileNamePath:path];
+                            [self.activeMain performSegueDirectoryWithControlPasscode:true metadata:metadata scrollToFileNamePath:fileNamePath];
                             
                         } else {
                             
                             // Reload folder
                             NSString *serverUrl = [NSString stringWithFormat:@"%@%@", account.url, k_webDAV];
                             
-                            self.activeMain.scrollToFileNamePath = path;
+                            self.activeMain.scrollToFileNamePath = fileNamePath;
                             [self.activeMain readFolder:serverUrl];
                         }
                         

iOSClient/Main/CCMain.m

@@ -3759,7 +3759,8 @@
     if (self.scrollToFileNamePath != nil && withScrollToFileName ) {
         for (NSString *key in sectionDataSource.allRecordsDataSource) {
             tableMetadata *metadata = [sectionDataSource.allRecordsDataSource objectForKey:key];
-            if ([metadata.fileName isEqualToString:self.scrollToFileNamePath]) {
+            NSString *metadataFileNamePath = [NSString stringWithFormat:@"%@/%@", metadata.serverUrl, metadata.fileName];
+            if ([metadataFileNamePath isEqualToString:self.scrollToFileNamePath]) {
                 for (NSString *key in sectionDataSource.fileIDIndexPath) {
                     if ([key isEqualToString:metadata.fileID]) {
                         NSIndexPath *indexPath = [sectionDataSource.fileIDIndexPath objectForKey:key];