Fixed. App crash when setting a path without slash

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / MoveActivity.java

diff --git a/src/com/owncloud/android/ui/activity/MoveActivity.java b/src/com/owncloud/android/ui/activity/MoveActivity.java
index 07f25bb..2d6824c 100644 (file)
--- a/src/com/owncloud/android/ui/activity/MoveActivity.java
+++ b/src/com/owncloud/android/ui/activity/MoveActivity.java
@@ -61,12 +61,13 @@ import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;

-import com.owncloud.android.utils.Log_OC;
+import com.owncloud.android.lib.common.utils.Log_OC;

 
 public class MoveActivity extends HookActivity implements FileFragment.ContainerActivity, 
     OnClickListener, SwipeRefreshLayout.OnRefreshListener {
 
     public static final String EXTRA_CURRENT_FOLDER = UploadFilesActivity.class.getCanonicalName() + ".EXTRA_CURRENT_FOLDER";
 
 public class MoveActivity extends HookActivity implements FileFragment.ContainerActivity, 
     OnClickListener, SwipeRefreshLayout.OnRefreshListener {
 
     public static final String EXTRA_CURRENT_FOLDER = UploadFilesActivity.class.getCanonicalName() + ".EXTRA_CURRENT_FOLDER";

+    public static final String EXTRA_TARGET_FILE = UploadFilesActivity.class.getCanonicalName() + "EXTRA_TARGET_FILE";

 
     public static final int RESULT_OK_AND_MOVE = 1;
     
 
     public static final int RESULT_OK_AND_MOVE = 1;
     


@@ -144,7 +145,7 @@ public class MoveActivity extends HookActivity implements FileFragment.Container
                 OCFileListFragment listOfFolders = getListOfFilesFragment(); 
                 listOfFolders.listDirectory(folder);   
                 
                 OCFileListFragment listOfFolders = getListOfFilesFragment(); 
                 listOfFolders.listDirectory(folder);   
                 

-                startSyncFolderOperation(folder);
+                startSyncFolderOperation(folder, false);

             }
             
             updateNavigationElementsInActionBar();
             }
             
             updateNavigationElementsInActionBar();


@@ -200,12 +201,12 @@ public class MoveActivity extends HookActivity implements FileFragment.Container
         setFile(directory);
         updateNavigationElementsInActionBar();
         // Sync Folder
         setFile(directory);
         updateNavigationElementsInActionBar();
         // Sync Folder

-        startSyncFolderOperation(directory);
+        startSyncFolderOperation(directory, false);

         
     }
 
     
         
     }
 
     

-    public void startSyncFolderOperation(OCFile folder) {
+    public void startSyncFolderOperation(OCFile folder, boolean ignoreETag) {

         long currentSyncTime = System.currentTimeMillis(); 
         
         mSyncInProgress = true;
         long currentSyncTime = System.currentTimeMillis(); 
         
         mSyncInProgress = true;


@@ -215,6 +216,7 @@ public class MoveActivity extends HookActivity implements FileFragment.Container
                                                                         currentSyncTime, 
                                                                         false,
                                                                         getFileOperationsHelper().isSharedSupported(),
                                                                         currentSyncTime, 
                                                                         false,
                                                                         getFileOperationsHelper().isSharedSupported(),

+                                                                        ignoreETag,

                                                                         getStorageManager(), 
                                                                         getAccount(), 
                                                                         getApplicationContext()
                                                                         getStorageManager(), 
                                                                         getAccount(), 
                                                                         getApplicationContext()


@@ -322,7 +324,7 @@ public class MoveActivity extends HookActivity implements FileFragment.Container
             listOfFiles.listDirectory(root);
             setFile(listOfFiles.getCurrentFile());
             updateNavigationElementsInActionBar();
             listOfFiles.listDirectory(root);
             setFile(listOfFiles.getCurrentFile());
             updateNavigationElementsInActionBar();

-            startSyncFolderOperation(root);
+            startSyncFolderOperation(root, false);

         }
     }
 
         }
     }
 


@@ -368,8 +370,12 @@ public class MoveActivity extends HookActivity implements FileFragment.Container
         if (v == mCancelBtn) {
             finish();
         } else if (v == mChooseBtn) {
         if (v == mCancelBtn) {
             finish();
         } else if (v == mChooseBtn) {

+            Intent i = getIntent();
+            OCFile targetFile = (OCFile) i.getParcelableExtra(MoveActivity.EXTRA_TARGET_FILE);
+

             Intent data = new Intent();
             data.putExtra(EXTRA_CURRENT_FOLDER, getCurrentFolder());
             Intent data = new Intent();
             data.putExtra(EXTRA_CURRENT_FOLDER, getCurrentFolder());

+            data.putExtra(EXTRA_TARGET_FILE, targetFile);

             setResult(RESULT_OK_AND_MOVE, data);
             finish();
         }
             setResult(RESULT_OK_AND_MOVE, data);
             finish();
         }


@@ -444,7 +450,7 @@ public class MoveActivity extends HookActivity implements FileFragment.Container
                         if (currentDir == null) {
                             // current folder was removed from the server 
                             Toast.makeText( MoveActivity.this, 
                         if (currentDir == null) {
                             // current folder was removed from the server 
                             Toast.makeText( MoveActivity.this, 

-                                            String.format(getString(R.string.sync_current_folder_was_removed), "PLACEHOLDER"), 
+                                            String.format(getString(R.string.sync_current_folder_was_removed), getCurrentFolder().getFileName()), 

                                             Toast.LENGTH_LONG)
                                 .show();
                             browseToRoot();
                                             Toast.LENGTH_LONG)
                                 .show();
                             browseToRoot();


@@ -555,7 +561,7 @@ public class MoveActivity extends HookActivity implements FileFragment.Container
         if (listOfFiles != null) {
             OCFile folder = listOfFiles.getCurrentFile();
             if (folder != null) {
         if (listOfFiles != null) {
             OCFile folder = listOfFiles.getCurrentFile();
             if (folder != null) {

-                startSyncFolderOperation(folder);
+                startSyncFolderOperation(folder, true);

             }
         }
     }
             }
         }
     }