#174

Nextcloud.xcodeproj/project.pbxproj

@@ -3309,10 +3309,10 @@
 				F70F02A81C889183008DAB36 /* Libraries external */,
 				F75EDFA41E8C106900E6F369 /* Analytics */,
 				F7A582D71A24DAB500E903D7 /* AppDelegate.h */,
-				F7C1CDCE1E6DFAD1005D92BE /* CCStandardImages.h */,
 				F7A582D61A24DAB500E903D7 /* AppDelegate.m */,
 				F7C8C1901B482CEA0048180E /* CCGlobal.h */,
 				F7C8C1911B482CEA0048180E /* CCGlobal.m */,
+				F7C1CDCE1E6DFAD1005D92BE /* CCStandardImages.h */,
 				F78088E51DD3A1DB005C5A7C /* cryptocloud.xcdatamodeld */,
 				F7F67BB81A24D27800EE80DA /* Images.xcassets */,
 				F7C1CDD91E6DFC6F005D92BE /* Brand */,

Nextcloud.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:/Users/marinofaggiana/Desktop/CryptoCloud/Nextcloud.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>

iOSClient/AppDelegate.m

@@ -1239,23 +1239,12 @@
         metadataNet = [CCCoreData getTableAutomaticUploadForAccount:self.activeAccount selector:selectorUploadAutomatic];
         if (metadataNet) {
 
-            // For UploadAutomatic create the folder for Photos & if request the subfolders
-            NSString *folderPhotos = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
-            BOOL useSubFolder = [CCCoreData getCameraUploadCreateSubfolderActiveAccount:app.activeAccount];
-
             PHFetchResult *result = [PHAsset fetchAssetsWithLocalIdentifiers:@[metadataNet.assetLocalIdentifier] options:nil];
 
             if (result.count) {
                 
-                if(![self createFolderSubFolderAutomaticUploadFolderPhotos:folderPhotos useSubFolder:useSubFolder assets:[[NSArray alloc] initWithObjects:result[0], nil] selector:selectorUploadAutomatic]) {
-                    
-                    [CCCoreData unlockTableAutomaticUploadForAccount:_activeAccount assetLocalIdentifier:metadataNet.assetLocalIdentifier];
-                    
-                    break;
-                }
-                
                 [[CCNetworking sharedNetworking] uploadFileFromAssetLocalIdentifier:metadataNet.assetLocalIdentifier fileName:metadataNet.fileName serverUrl:metadataNet.serverUrl cryptated:metadataNet.cryptated session:metadataNet.session taskStatus:metadataNet.taskStatus selector:metadataNet.selector selectorPost:metadataNet.selectorPost errorCode:metadataNet.errorCode delegate:app.activeMain];
-                
+                                    
             } else {
                 
                 [CCCoreData addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionUpload selector:selectorUploadAutomatic note:@"Internal error image/video not found [0]" type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_activeAccount activeUrl:_activeUrl];

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -1136,14 +1136,11 @@
         NSLog(@"Convert url %@", url);
     }
     
-    // selectorUploadAutomaticAll : create the folder for Photos & if request the subfolders
-    if (assetsFull) {
-        
-        if(![app createFolderSubFolderAutomaticUploadFolderPhotos:folderPhotos useSubFolder:useSubFolder assets:newItemsPHAssetToUpload selector:selectorUploadAutomaticAll]) {
+    // Create the folder for Photos & if request the subfolders
+    if(![app createFolderSubFolderAutomaticUploadFolderPhotos:folderPhotos useSubFolder:useSubFolder assets:newItemsPHAssetToUpload selector:selectorUploadAutomaticAll]) {
             
-            [self endLoadingAssets];
-            return;
-        }
+        [self endLoadingAssets];
+        return;
     }
     
     for (PHAsset *asset in newItemsPHAssetToUpload) {