From bed905c9b828604f318456c7e2d25f2fc4141ba6 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 9 Apr 2013 14:10:10 +0200 Subject: [PATCH] Fixed (tablet, landscape): when the 'playing audio' notification is clicked, the app shows the current playback details --- .../owncloud/android/ui/activity/FileDetailActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/owncloud/android/ui/activity/FileDetailActivity.java b/src/com/owncloud/android/ui/activity/FileDetailActivity.java index ba948d36e9..193373564d 100644 --- 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 } else { - backToDisplayActivity(); // the 'back' won't be effective until this.onStart() and this.onResume() are completed; + backToDisplayActivity(false); // the 'back' won't be effective until this.onStart() and this.onResume() are completed; } @@ -244,7 +244,7 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File switch(item.getItemId()){ case android.R.id.home: - backToDisplayActivity(); + backToDisplayActivity(true); returnValue = true; break; default: @@ -256,12 +256,12 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File - private void backToDisplayActivity() { + private void backToDisplayActivity(boolean moveToParent) { Intent intent = new Intent(this, FileDisplayActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); OCFile targetFile = null; if (mFile != null) { - targetFile = mStorageManager.getFileById(mFile.getParentId()); + targetFile = moveToParent ? mStorageManager.getFileById(mFile.getParentId()) : mFile; } intent.putExtra(FileDetailFragment.EXTRA_FILE, targetFile); intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, mAccount);