From e057c0d39102c9d9545665c1f9c357e1a7633bfe Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 26 May 2026 15:55:57 +0300 Subject: [PATCH 1/2] wip Signed-off-by: alperozturk96 --- .../owncloud/android/ui/activity/FileDisplayActivity.kt | 9 ++++++++- .../owncloud/android/ui/fragment/OCFileListFragment.java | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index db6f451d3ef8..e0e4b9b67578 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -701,7 +701,14 @@ class FileDisplayActivity : Handler(Looper.getMainLooper()).post { (supportFragmentManager.findFragmentByTag(TAG_LIST_OF_FILES) as? OCFileListFragment)?.let { fragment -> leftFragment = fragment - setupHomeSearchToolbarWithSortAndListButtons() + if (file.isFolder) { + // TODO MAKE home is back button + // unify this logic + setupToolbar() + updateActionBarTitleAndHomeButtonByString(file.fileName) + } else { + setupHomeSearchToolbarWithSortAndListButtons() + } fragment.onItemClicked(file) } } diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index d31dd21f5fba..6b0d890e830e 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -1291,6 +1291,10 @@ private void listenSetupEncryptionDialogResult() { boolean result = bundle.getBoolean(SetupEncryptionDialogFragment.SUCCESS, false); if (!result) { Log_OC.d(TAG, "setup encryption dialog is dismissed"); + boolean cancelled = bundle.getBoolean(SetupEncryptionDialogFragment.RESULT_KEY_CANCELLED, false); + if (cancelled) { + browseToRoot(); + } return; } From d5ed2e13bba5bd902a9201ea722c6eff90a8c359 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 27 May 2026 08:38:39 +0300 Subject: [PATCH 2/2] wip Signed-off-by: alperozturk96 --- .../android/ui/activity/FileDisplayActivity.kt | 10 ++-------- .../android/ui/fragment/OCFileListFragment.java | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index e0e4b9b67578..a23f529f14fc 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -701,14 +701,8 @@ class FileDisplayActivity : Handler(Looper.getMainLooper()).post { (supportFragmentManager.findFragmentByTag(TAG_LIST_OF_FILES) as? OCFileListFragment)?.let { fragment -> leftFragment = fragment - if (file.isFolder) { - // TODO MAKE home is back button - // unify this logic - setupToolbar() - updateActionBarTitleAndHomeButtonByString(file.fileName) - } else { - setupHomeSearchToolbarWithSortAndListButtons() - } + fragment.setFileDepth(file) + updateActionBarTitleAndHomeButton(file) fragment.onItemClicked(file) } } diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index 6b0d890e830e..0473b99abf43 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -1257,7 +1257,7 @@ public void onItemClicked(OCFile file) { } } - private void setFileDepth(OCFile file) { + public void setFileDepth(OCFile file) { fileDepth = OCFileExtensionsKt.getDepth(file); }