From 3cf66f1c949074402a63faca01b748d1a368972c Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 25 Sep 2024 11:50:48 +0200 Subject: [PATCH 1/3] Simplify onBackPressed Signed-off-by: alperozturk --- .../ui/activity/FileDisplayActivity.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index a2bc0ab7a7ca..b7ddb9b5f48f 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1020,22 +1020,25 @@ private Boolean isRootDirectory() { @Override public void onBackPressed() { final boolean isDrawerOpen = isDrawerOpen(); - final boolean isSearchOpen = isSearchOpen(); - - final Fragment leftFragment = getLeftFragment(); + if (isDrawerOpen) { + super.onBackPressed(); + return; + } + final boolean isSearchOpen = isSearchOpen(); if (isSearchOpen) { resetSearchAction(); - } else if (isDrawerOpen) { - super.onBackPressed(); - } else if (leftFragment instanceof OCFileListFragment listOfFiles) { + return; + } - // all closed + final Fragment leftFragment = getLeftFragment(); + if (leftFragment instanceof OCFileListFragment listOfFiles) { OCFile currentDir = getCurrentDir(); if (isRoot(currentDir)) { finish(); return; } + browseUp(listOfFiles); } else { popBack(); From 8434a4887cf7df786c2d594c59c889a7a9ed2cc5 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 25 Sep 2024 11:55:21 +0200 Subject: [PATCH 2/3] remove variable assignments Signed-off-by: alperozturk --- .../ui/activity/FileDisplayActivity.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index b7ddb9b5f48f..15529897b647 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1019,27 +1019,22 @@ private Boolean isRootDirectory() { @SuppressFBWarnings("ITC_INHERITANCE_TYPE_CHECKING") @Override public void onBackPressed() { - final boolean isDrawerOpen = isDrawerOpen(); - if (isDrawerOpen) { + if (isDrawerOpen()) { super.onBackPressed(); return; } - final boolean isSearchOpen = isSearchOpen(); - if (isSearchOpen) { + if (isSearchOpen()) { resetSearchAction(); return; } - final Fragment leftFragment = getLeftFragment(); - if (leftFragment instanceof OCFileListFragment listOfFiles) { - OCFile currentDir = getCurrentDir(); - if (isRoot(currentDir)) { + if (getLeftFragment() instanceof OCFileListFragment listOfFiles) { + if (isRoot(getCurrentDir())) { finish(); - return; + } else { + browseUp(listOfFiles); } - - browseUp(listOfFiles); } else { popBack(); } From b057344e46d2254392553a96156e1d60c02371e8 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Tue, 1 Oct 2024 16:51:19 +0200 Subject: [PATCH 3/3] change check order Signed-off-by: alperozturk --- .../owncloud/android/ui/activity/FileDisplayActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index 15529897b647..67a00a3709ce 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1019,13 +1019,13 @@ private Boolean isRootDirectory() { @SuppressFBWarnings("ITC_INHERITANCE_TYPE_CHECKING") @Override public void onBackPressed() { - if (isDrawerOpen()) { - super.onBackPressed(); + if (isSearchOpen()) { + resetSearchAction(); return; } - if (isSearchOpen()) { - resetSearchAction(); + if (isDrawerOpen()) { + super.onBackPressed(); return; }