Fixed bug: show the selected image in the gallery, instead of always the first in...

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

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index c8f23f0..bff3869 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -92,6 +92,7 @@ import com.owncloud.android.ui.fragment.FileDetailFragment;
 import com.owncloud.android.ui.fragment.FileFragment;\r
 import com.owncloud.android.ui.fragment.FilePreviewFragment;\r
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 import com.owncloud.android.ui.fragment.FileFragment;\r
 import com.owncloud.android.ui.fragment.FilePreviewFragment;\r
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r

+import com.owncloud.android.ui.preview.PreviewImageActivity;\r

 \r
 import com.owncloud.android.R;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 import com.owncloud.android.R;\r
 import eu.alefzero.webdav.WebdavClient;\r


@@ -1053,25 +1054,37 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @Override\r
     public void onFileClick(OCFile file) {\r
 \r
     @Override\r
     public void onFileClick(OCFile file) {\r
 \r

-        // If we are on a large device -> update fragment\r
-        if (mDualPane) {\r
-            // buttons in the details view are problematic when trying to reuse an existing fragment; create always a new one solves some of them, BUT no all; downloads are 'dangerous'\r
-            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
-            if (file != null && FilePreviewFragment.canBePreviewed(file)) {\r
-                if (file.isDown()) {\r
-                    transaction.replace(R.id.file_details_container, new FilePreviewFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
-                } else {\r
-                    transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
-                    mWaitingToPreview = file;\r
-                    requestForDownload();\r
-                }\r
+        if (file != null && FilePreviewFragment.canBePreviewed(file)) {\r
+            if (file.isDown()) {\r
+                // preview it\r
+                startPreview(file);\r
+                \r

             } else {\r
             } else {\r

-                transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
+                // automatic download, preview on finish\r
+                startDownloadForPreview(file);\r
+                \r

             }\r
             }\r

-            //transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);\r
+        } else {\r
+            // details view\r
+            startDetails(file);\r
+        }\r
+    }\r
+    \r
+    private void startPreview(OCFile file) {\r
+        if (mDualPane && \r
+                !file.isImage() // this is a trick to get a quick-to-implement 'full screen' preview for images in landscape\r
+                ) {\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            transaction.replace(R.id.file_details_container, new FilePreviewFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r

             transaction.commit();\r
             \r
             transaction.commit();\r
             \r

-        } else {    // small or medium screen device -> new Activity\r
+        } else if (file.isImage()) {\r
+            Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            startActivity(showDetailsIntent);\r
+            \r
+        } else {\r

             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r


@@ -1079,7 +1092,37 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }\r
     }\r
     \r
         }\r
     }\r
     \r

+    private void startDownloadForPreview(OCFile file) {\r
+        if (mDualPane) {\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
+            transaction.commit();\r
+            mWaitingToPreview = file;\r
+            requestForDownload();\r
+            \r
+        } else {\r
+            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            startActivity(showDetailsIntent);\r
+        }\r
+    }\r
+\r

     \r
     \r

+    private void startDetails(OCFile file) {\r
+        if (mDualPane && !file.isImage()) {\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
+            transaction.commit();\r
+        } else {\r
+            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            startActivity(showDetailsIntent);\r
+        }\r
+    }\r
+\r
+\r

     /**\r
      * {@inheritDoc}\r
      */\r
     /**\r
      * {@inheritDoc}\r
      */\r