Fixed (tablet, landscape): when the 'playing audio' notification is clicked, the...

[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 ba948d3..1933735 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDetailActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
@@ -116,7 +116,7 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
             \r
             \r
         }  else {\r
             \r
             \r
         }  else {\r

-            backToDisplayActivity();   // the 'back' won't be effective until this.onStart() and this.onResume() are completed;\r
+            backToDisplayActivity(false);   // the 'back' won't be effective until this.onStart() and this.onResume() are completed;\r

         }\r
         \r
         \r
         }\r
         \r
         \r


@@ -244,7 +244,7 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
         \r
         switch(item.getItemId()){\r
         case android.R.id.home:\r
         \r
         switch(item.getItemId()){\r
         case android.R.id.home:\r

-            backToDisplayActivity();\r
+            backToDisplayActivity(true);\r

             returnValue = true;\r
             break;\r
         default:\r
             returnValue = true;\r
             break;\r
         default:\r


@@ -256,12 +256,12 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
 \r
 \r
 \r
 \r
 \r
 \r

-    private void backToDisplayActivity() {\r
+    private void backToDisplayActivity(boolean moveToParent) {\r

         Intent intent = new Intent(this, FileDisplayActivity.class);\r
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
         OCFile targetFile = null;\r
         if (mFile != null) {\r
         Intent intent = new Intent(this, FileDisplayActivity.class);\r
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
         OCFile targetFile = null;\r
         if (mFile != null) {\r

-            targetFile = mStorageManager.getFileById(mFile.getParentId());\r
+            targetFile = moveToParent ? mStorageManager.getFileById(mFile.getParentId()) : mFile;\r

         }\r
         intent.putExtra(FileDetailFragment.EXTRA_FILE, targetFile);\r
         intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, mAccount);\r
         }\r
         intent.putExtra(FileDetailFragment.EXTRA_FILE, targetFile);\r
         intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, mAccount);\r