Fixed local path NULL when making favourite a file not down ; fixed change of local...

[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 69715e0..7ec8d7e 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -87,6 +87,7 @@ import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.TransferServiceGetter;\r
 import com.owncloud.android.ui.dialog.EditNameDialog;\r
 import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;\r
 import com.owncloud.android.ui.activity.TransferServiceGetter;\r
 import com.owncloud.android.ui.dialog.EditNameDialog;\r
 import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;\r

+import com.owncloud.android.utils.FileStorageUtils;\r

 import com.owncloud.android.utils.OwnCloudVersion;\r
 \r
 import com.owncloud.android.R;\r
 import com.owncloud.android.utils.OwnCloudVersion;\r
 \r
 import com.owncloud.android.R;\r


@@ -289,6 +290,7 @@ public class FileDetailFragment extends SherlockFragment implements
                     }\r
                     \r
                 } else {\r
                     }\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
                     Intent i = new Intent(getActivity(), FileDownloader.class);\r
                     i.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r
                     i.putExtra(FileDownloader.EXTRA_FILE, mFile);\r


@@ -321,7 +323,11 @@ public class FileDetailFragment extends SherlockFragment implements
                            (cb.isChecked()?\r
                                    FileObserverService.CMD_ADD_OBSERVED_FILE:\r
                                    FileObserverService.CMD_DEL_OBSERVED_FILE));\r
                            (cb.isChecked()?\r
                                    FileObserverService.CMD_ADD_OBSERVED_FILE:\r
                                    FileObserverService.CMD_DEL_OBSERVED_FILE));\r

-                intent.putExtra(FileObserverService.KEY_CMD_ARG, mFile.getStoragePath());\r
+                String localPath = mFile.getStoragePath();\r
+                if (localPath == null || localPath.length() <= 0) {\r
+                    localPath = FileStorageUtils.getDefaultSavePathFor(mAccount.name, mFile);\r
+                }\r
+                intent.putExtra(FileObserverService.KEY_CMD_ARG, localPath);\r

                 Log.e(TAG, "starting observer service");\r
                 getActivity().startService(intent);\r
                 \r
                 Log.e(TAG, "starting observer service");\r
                 getActivity().startService(intent);\r
                 \r