Saving new file to be uploaded for the first time with the correct reference to its parent folder

src/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -254,6 +254,20 @@ public class FileDataStorageManager {
     }
 
 
+    public void saveNewFile(OCFile newFile) {
+        String remoteParentPath = new File(newFile.getRemotePath()).getParent();
+        remoteParentPath = remoteParentPath.endsWith(OCFile.PATH_SEPARATOR) ?
+                remoteParentPath : remoteParentPath + OCFile.PATH_SEPARATOR;
+        OCFile parent = getFileByPath(remoteParentPath);
+        if (parent != null) {
+            newFile.setParentId(parent.getFileId());
+            saveFile(newFile);
+        } else {
+            throw new IllegalArgumentException("Saving a new file in an unexisting folder");
+        }
+    }
+
+
     /**
      * Inserts or updates the list of files contained in a given folder.
      * <p/>
@@ -2040,4 +2054,5 @@ public class FileDataStorageManager {
         }
         return capability;
     }
+
 }

src/com/owncloud/android/files/services/FileUploadService.java

@@ -455,7 +455,7 @@ public class FileUploadService extends Service implements OnDatatransferProgress
                             return Service.START_NOT_STICKY;
                         }
 
-                        mStorageManager.saveFile(files[i]);
+                        mStorageManager.saveNewFile(files[i]);
                         files[i] = mStorageManager.getFileByLocalPath(files[i].getStoragePath());
                     }
                 }
@@ -917,8 +917,8 @@ public class FileUploadService extends Service implements OnDatatransferProgress
 
                     /// perform the upload
                     if (grantResult.isSuccess()) {
-                        OCFile parent = mStorageManager.getFileByPath(remoteParentPath);
-                        mCurrentUpload.getFile().setParentId(parent.getFileId());
+                        /*OCFile parent = mStorageManager.getFileByPath(remoteParentPath);
+                        mCurrentUpload.getFile().setParentId(parent.getFileId());*/
                         uploadResult = mCurrentUpload.execute(mUploadClient);
                         if (uploadResult.isSuccess()) {
                             saveUploadedFile();