Added basic menu options to the preview fragment: open, delete, see details

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

diff --git a/src/com/owncloud/android/ui/activity/FileDetailActivity.java b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
index 5bf6bd2..a36c972 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDetailActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
@@ -40,8 +40,10 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
+import com.owncloud.android.ui.fragment.FileFragment;\r
 import com.owncloud.android.ui.fragment.FilePreviewFragment;\r
 \r
+import com.owncloud.android.AccountUtils;\r
 import com.owncloud.android.R;\r
 \r
 /**\r
@@ -57,6 +59,10 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
 \r
     public static final String TAG = FileDetailActivity.class.getSimpleName();\r
     \r
+    public static final String EXTRA_MODE = "MODE";\r
+    public static final int MODE_DETAILS = 0;\r
+    public static final int MODE_PREVIEW = 1;\r
+    \r
     private boolean mConfigurationChangedToLandscape = false;\r
     private FileDownloaderBinder mDownloaderBinder = null;\r
     private ServiceConnection mDownloadConnection, mUploadConnection = null;\r
@@ -99,8 +105,10 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
     private void createChildFragment() {\r
         OCFile file = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r
         Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);\r
+        int mode = getIntent().getIntExtra(EXTRA_MODE, MODE_PREVIEW); \r
+        \r
         Fragment newFragment = null;\r
-        if (FilePreviewFragment.canBePreviewed(file)) {\r
+        if (FilePreviewFragment.canBePreviewed(file) && mode == MODE_PREVIEW) {\r
             newFragment = new FilePreviewFragment(file, account);\r
             \r
         } else {\r
@@ -243,5 +251,13 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
     public FileUploaderBinder getFileUploaderBinder() {\r
         return mUploaderBinder;\r
     }\r
+\r
+\r
+    @Override\r
+    public void showFragmentWithDetails(OCFile file) {\r
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+        transaction.replace(R.id.fragment, new FileDetailFragment(file, (Account) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT)), FileDetailFragment.FTAG); \r
+        transaction.commit();\r
+    }\r
     \r
 }\r