Fixed crash got when instant upload is tried to an account where the InstantUpload...

diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
index 3c07238..8ac58bb 100644 (file)
--- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
+++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
@@ -123,7 +123,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
         Intent i = new Intent(context, FileUploader.class);
         i.putExtra(FileUploader.KEY_ACCOUNT, account);
         i.putExtra(FileUploader.KEY_LOCAL_FILE, file_path);
         Intent i = new Intent(context, FileUploader.class);
         i.putExtra(FileUploader.KEY_ACCOUNT, account);
         i.putExtra(FileUploader.KEY_LOCAL_FILE, file_path);

-        i.putExtra(FileUploader.KEY_REMOTE_FILE, INSTANT_UPLOAD_DIR + "/" + file_name);
+        i.putExtra(FileUploader.KEY_REMOTE_FILE, INSTANT_UPLOAD_DIR + file_name);

         i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);
         i.putExtra(FileUploader.KEY_MIME_TYPE, mime_type);
         i.putExtra(FileUploader.KEY_INSTANT_UPLOAD, true);
         i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);
         i.putExtra(FileUploader.KEY_MIME_TYPE, mime_type);
         i.putExtra(FileUploader.KEY_INSTANT_UPLOAD, true);

diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index da352ed..a1237f5 100644 (file)
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@ -69,7 +69,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
     private ServiceHandler mServiceHandler;
     private IBinder mBinder;
     private WebdavClient mUploadClient = null;
     private ServiceHandler mServiceHandler;
     private IBinder mBinder;
     private WebdavClient mUploadClient = null;

-    private Account mLastAccount = null, mLastAccountWhereInstantFolderWasCreated = null;
+    private Account mLastAccount = null;

     private FileDataStorageManager mStorageManager;
 
     private ConcurrentMap<String, UploadFileOperation> mPendingUploads = new ConcurrentHashMap<String, UploadFileOperation>();
     private FileDataStorageManager mStorageManager;
 
     private ConcurrentMap<String, UploadFileOperation> mPendingUploads = new ConcurrentHashMap<String, UploadFileOperation>();


@@ -180,15 +180,22 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         UploadFileOperation newUpload = null;
         OCFile file = null;
         FileDataStorageManager storageManager = new FileDataStorageManager(account, getContentResolver());
         UploadFileOperation newUpload = null;
         OCFile file = null;
         FileDataStorageManager storageManager = new FileDataStorageManager(account, getContentResolver());

+        boolean fixed = false;
+        if (isInstant) {
+            fixed = checkAndFixInstantUploadDirectory(storageManager);
+        }

         try {
             for (int i=0; i < localPaths.length; i++) {
                 uploadKey = buildRemoteName(account, remotePaths[i]);
         try {
             for (int i=0; i < localPaths.length; i++) {
                 uploadKey = buildRemoteName(account, remotePaths[i]);

-                file = obtainNewOCFileToUpload(remotePaths[i], localPaths[i], ((mimeTypes!=null)?mimeTypes[i]:(String)null), forceOverwrite, storageManager);
+                file = obtainNewOCFileToUpload(remotePaths[i], localPaths[i], ((mimeTypes!=null)?mimeTypes[i]:(String)null), isInstant, forceOverwrite, storageManager);

                 if (chunked) {
                     newUpload = new ChunkedUploadFileOperation(account, file, isInstant, forceOverwrite);
                 } else {
                     newUpload = new UploadFileOperation(account, file, isInstant, forceOverwrite);
                 }
                 if (chunked) {
                     newUpload = new ChunkedUploadFileOperation(account, file, isInstant, forceOverwrite);
                 } else {
                     newUpload = new UploadFileOperation(account, file, isInstant, forceOverwrite);
                 }

+                if (fixed && i==0) {
+                    newUpload.setRemoteFolderToBeCreated();
+                }

                 mPendingUploads.putIfAbsent(uploadKey, newUpload);
                 newUpload.addDatatransferProgressListener(this);
                 requestedUploads.add(uploadKey);
                 mPendingUploads.putIfAbsent(uploadKey, newUpload);
                 newUpload.addDatatransferProgressListener(this);
                 requestedUploads.add(uploadKey);


@@ -197,6 +204,15 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         } catch (IllegalArgumentException e) {
             Log.e(TAG, "Not enough information provided in intent: " + e.getMessage());
             return START_NOT_STICKY;
         } catch (IllegalArgumentException e) {
             Log.e(TAG, "Not enough information provided in intent: " + e.getMessage());
             return START_NOT_STICKY;

+            
+        } catch (IllegalStateException e) {
+            Log.e(TAG, "Bad information provided in intent: " + e.getMessage());
+            return START_NOT_STICKY;
+            
+        } catch (Exception e) {
+            Log.e(TAG, "Unexpected exception while processing upload intent", e);
+            return START_NOT_STICKY;
+            

         }
         
         if (requestedUploads.size() > 0) {
         }
         
         if (requestedUploads.size() > 0) {


@@ -315,12 +331,12 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
                 mUploadClient = OwnCloudClientUtils.createOwnCloudClient(mLastAccount, getApplicationContext());
             }
             
                 mUploadClient = OwnCloudClientUtils.createOwnCloudClient(mLastAccount, getApplicationContext());
             }
             

-            /// create remote folder for instant uploads, "if necessary" (would be great that HEAD to a folder worked as with files, we should check; but it's not WebDAV standard, anyway
-            if (mCurrentUpload.isInstant() && !mLastAccountWhereInstantFolderWasCreated.equals(mCurrentUpload.getAccount())) {
-                mLastAccountWhereInstantFolderWasCreated = mCurrentUpload.getAccount();
-                createRemoteFolderForInstantUploads(mUploadClient, mStorageManager);
+            /// create remote folder for instant uploads
+            if (mCurrentUpload.isRemoteFolderToBeCreated()) {
+                mUploadClient.createDirectory(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR);    // ignoring result; fail could just mean that it already exists, but local database is not synchronized; the upload will be tried anyway

             }
             }

-        
+
+            

             /// perform the upload
             RemoteOperationResult uploadResult = null;
             try {
             /// perform the upload
             RemoteOperationResult uploadResult = null;
             try {


@@ -345,26 +361,6 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
     }
 
     /**
     }
 
     /**

-     * Create remote folder for instant uploads if necessary.
-     * 
-     * @param client            WebdavClient to the ownCloud server.
-     * @param storageManager    Interface to the local database caching the data in the server.
-     * @return                  'True' if the folder exists when the methods finishes.
-     */
-    private boolean createRemoteFolderForInstantUploads(WebdavClient client, FileDataStorageManager storageManager) {
-        boolean result = true;
-        OCFile instantUploadDir = storageManager.getFileByPath(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR);
-        if (instantUploadDir == null) {
-            result = client.createDirectory(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR);    // fail could just mean that it already exists, but local database is not synchronized; the upload will be started anyway
-            OCFile newDir = new OCFile(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR);
-            newDir.setMimetype("DIR");
-            newDir.setParentId(storageManager.getFileByPath(OCFile.PATH_SEPARATOR).getFileId());
-            storageManager.saveFile(newDir);
-        }
-        return result;
-    }
-
-    /**

      * Saves a new OC File after a successful upload.
      * 
      * @param file              OCFile describing the uploaded file
      * Saves a new OC File after a successful upload.
      * 
      * @param file              OCFile describing the uploaded file


@@ -377,7 +373,21 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
     }
     
     
     }
     
     

-    private OCFile obtainNewOCFileToUpload(String remotePath, String localPath, String mimeType, boolean forceOverwrite, FileDataStorageManager storageManager) {
+    private boolean checkAndFixInstantUploadDirectory(FileDataStorageManager storageManager) {
+        OCFile instantUploadDir = storageManager.getFileByPath(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR);
+        if (instantUploadDir == null) {
+            // first instant upload in the account, or never account not synchronized after the remote InstantUpload folder was created
+            OCFile newDir = new OCFile(InstantUploadBroadcastReceiver.INSTANT_UPLOAD_DIR);
+            newDir.setMimetype("DIR");
+            newDir.setParentId(storageManager.getFileByPath(OCFile.PATH_SEPARATOR).getFileId());
+            storageManager.saveFile(newDir);
+            return true;
+        }
+        return false;
+    }
+
+    
+    private OCFile obtainNewOCFileToUpload(String remotePath, String localPath, String mimeType, boolean isInstant, boolean forceOverwrite, FileDataStorageManager storageManager) {

         OCFile newFile = new OCFile(remotePath);
         newFile.setStoragePath(localPath);
         newFile.setLastSyncDate(0);
         OCFile newFile = new OCFile(remotePath);
         newFile.setStoragePath(localPath);
         newFile.setLastSyncDate(0);


@@ -407,9 +417,12 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
         // parent dir
         String parentPath = new File(remotePath).getParent();
         parentPath = parentPath.endsWith("/")?parentPath:parentPath+"/" ;
         // parent dir
         String parentPath = new File(remotePath).getParent();
         parentPath = parentPath.endsWith("/")?parentPath:parentPath+"/" ;

-        long parentDirId = storageManager.getFileByPath(parentPath).getFileId();
+        OCFile parentDir = storageManager.getFileByPath(parentPath);
+        if (parentDir == null) {
+            throw new IllegalStateException("Can not upload a file to a non existing remote location: " + parentPath);
+        }
+        long parentDirId = parentDir.getFileId();

         newFile.setParentId(parentDirId);
         newFile.setParentId(parentDirId);

-        

         return newFile;
     }
     
         return newFile;
     }
     

diff --git a/src/com/owncloud/android/operations/OperationCancelledException.java b/src/com/owncloud/android/operations/OperationCancelledException.java
index 938d559..2045627 100644 (file)
--- a/src/com/owncloud/android/operations/OperationCancelledException.java
+++ b/src/com/owncloud/android/operations/OperationCancelledException.java
@@ -2,4 +2,9 @@ package com.owncloud.android.operations;
 
 public class OperationCancelledException extends Exception {
 
 
 public class OperationCancelledException extends Exception {
 

+    /**
+     * Generated serial version - to avoid Java warning
+     */
+    private static final long serialVersionUID = -6350981497740424983L;
+

 }
 }

diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java
index 1a7938f..b001733 100644 (file)
--- a/src/com/owncloud/android/operations/UploadFileOperation.java
+++ b/src/com/owncloud/android/operations/UploadFileOperation.java
@@ -52,11 +52,11 @@ public class UploadFileOperation extends RemoteOperation {
     private OCFile mFile;
     private String mRemotePath = null;
     private boolean mIsInstant = false;
     private OCFile mFile;
     private String mRemotePath = null;
     private boolean mIsInstant = false;

+    private boolean mRemoteFolderToBeCreated = false;

     private boolean mForceOverwrite = false;
     PutMethod mPutMethod = null;
     private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
     private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
     private boolean mForceOverwrite = false;
     PutMethod mPutMethod = null;
     private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
     private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);

-

     
     public UploadFileOperation( Account account,
                                 OCFile file,
     
     public UploadFileOperation( Account account,
                                 OCFile file,


@@ -102,11 +102,19 @@ public class UploadFileOperation extends RemoteOperation {
     public boolean isInstant() {
         return mIsInstant;
     }
     public boolean isInstant() {
         return mIsInstant;
     }

+
+    public boolean isRemoteFolderToBeCreated() {
+        return mRemoteFolderToBeCreated;
+    }

     
     

+    public void setRemoteFolderToBeCreated() {
+        mRemoteFolderToBeCreated = true;
+    }
+

     public boolean getForceOverwrite() {
         return mForceOverwrite;
     }
     public boolean getForceOverwrite() {
         return mForceOverwrite;
     }

-
+    

     
     public Set<OnDatatransferProgressListener> getDataTransferListeners() {
         return mDataTransferListeners;
     
     public Set<OnDatatransferProgressListener> getDataTransferListeners() {
         return mDataTransferListeners;


@@ -221,4 +229,5 @@ public class UploadFileOperation extends RemoteOperation {
         }
     }
 
         }
     }
 

+

 }
 }