Download button in file details view upgraded to sync file content in both directions

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / FileDetailFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 76a387f..01fc186 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -82,6 +82,8 @@ import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.operations.RemoveFileOperation;\r
 import com.owncloud.android.operations.RenameFileOperation;\r
+import com.owncloud.android.operations.SynchronizeFileOperation;\r
+import com.owncloud.android.ui.activity.ConflictsResolveActivity;\r
 import com.owncloud.android.ui.activity.FileDetailActivity;\r
 import com.owncloud.android.ui.activity.FileDisplayActivity;\r
 import com.owncloud.android.ui.activity.TransferServiceGetter;\r
@@ -119,7 +121,7 @@ public class FileDetailFragment extends SherlockFragment implements
     private Handler mHandler;\r
     private RemoteOperation mLastRemoteOperation;\r
 \r
-    private static final String TAG = "FileDetailFragment";\r
+    private static final String TAG = FileDetailFragment.class.getSimpleName();\r
     public static final String FTAG = "FileDetails"; \r
     public static final String FTAG_CONFIRMATION = "REMOVE_CONFIRMATION_FRAGMENT";\r
 \r
@@ -255,6 +257,7 @@ public class FileDetailFragment extends SherlockFragment implements
     \r
     @Override\r
     public void onClick(View v) {\r
+        FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());\r
         switch (v.getId()) {\r
             case R.id.fdDownloadBtn: {\r
                 //if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath())) {\r
@@ -289,26 +292,21 @@ public class FileDetailFragment extends SherlockFragment implements
                     }\r
                     \r
                 } else {\r
-                    // ISSUE 6: this button should be promoted to 'synchronize' if the file is DOWN, not just redownload\r
-                    Intent i = new Intent(getActivity(), FileDownloader.class);\r
-                    i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r
-                    i.putExtra(FileDownloader.EXTRA_FILE, mFile);\r
-                    /*i.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mFile.getRemotePath());\r
-                    i.putExtra(FileDownloader.EXTRA_FILE_PATH, mFile.getRemotePath());\r
-                    i.putExtra(FileDownloader.EXTRA_FILE_SIZE, mFile.getFileLength());*/\r
+                    mLastRemoteOperation = new SynchronizeFileOperation(mFile.getRemotePath(), fdsm, mAccount, true, false, getActivity());\r
+                    WebdavClient wc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getSherlockActivity().getApplicationContext());\r
+                    mLastRemoteOperation.execute(wc, this, mHandler);\r
                 \r
                     // update ui \r
-                    setButtonsForTransferring();\r
-                \r
-                    getActivity().startService(i);\r
-                    mContainerActivity.onFileStateChanged();    // this is not working; it is performed before the fileDownloadService registers it as 'in progress'\r
+                    boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+                    getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+                    setButtonsForTransferring(); // disable button immediately, although the synchronization does not result in a file transference\r
+                    \r
                 }\r
                 break;\r
             }\r
             case R.id.fdKeepInSync: {\r
                 CheckBox cb = (CheckBox) getView().findViewById(R.id.fdKeepInSync);\r
                 mFile.setKeepInSync(cb.isChecked());\r
-                FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getApplicationContext().getContentResolver());\r
                 fdsm.saveFile(mFile);\r
                 \r
                 /* NOT HERE\r
@@ -923,6 +921,9 @@ public class FileDetailFragment extends SherlockFragment implements
                 \r
             } else if (operation instanceof RenameFileOperation) {\r
                 onRenameFileOperationFinish((RenameFileOperation)operation, result);\r
+                \r
+            } else if (operation instanceof SynchronizeFileOperation) {\r
+                onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result);\r
             }\r
         }\r
     }\r
@@ -977,5 +978,39 @@ public class FileDetailFragment extends SherlockFragment implements
         }\r
     }\r
     \r
+    private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation, RemoteOperationResult result) {\r
+        boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+        getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+\r
+        if (!result.isSuccess()) {\r
+            if (result.getCode() == ResultCode.SYNC_CONFLICT) {\r
+                Intent i = new Intent(getActivity(), ConflictsResolveActivity.class);\r
+                //i.setFlags(i.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);\r
+                i.putExtra("remotepath", mFile.getRemotePath());\r
+                i.putExtra("localpath", mFile.getStoragePath());\r
+                i.putExtra("account", mAccount);\r
+                startActivity(i);\r
+                \r
+            } else {\r
+                Toast msg = Toast.makeText(getActivity(), R.string.sync_file_fail_msg, Toast.LENGTH_LONG); \r
+                msg.show();\r
+            }\r
+            \r
+        } else {\r
+            if (operation.transferWasRequested()) {\r
+                mContainerActivity.onFileStateChanged();    // this is not working; FileDownloader won't do NOTHING at all until this method finishes, so \r
+                                                            // checking the service to see if the file is downloading results in FALSE\r
+            } else {\r
+                Toast msg = Toast.makeText(getActivity(), R.string.sync_file_nothing_to_do_msg, Toast.LENGTH_LONG); \r
+                msg.show();\r
+                if (mFile.isDown()) {\r
+                    setButtonsForDown();\r
+                    \r
+                } else {\r
+                    setButtonsForRemote();\r
+                }\r
+            }\r
+        }\r
+    }\r
 \r
 }\r