From 391ffa5b1dd239159bf4f130078fd96d728eb761 Mon Sep 17 00:00:00 2001
From: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
Date: Thu, 22 Jun 2023 17:11:55 +0200
Subject: [PATCH 1/2] Fix back arrow appearing as hamburger icon

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
---
 .../ui/fragment/OCFileListFragment.java       | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

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 32c2d5338903..508523a3c1f0 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
@@ -1519,7 +1519,7 @@ protected void setTitle() {
                     setTitle(R.string.drawer_item_shared);
                     break;
                 default:
-                    setTitle(themeUtils.getDefaultDisplayNameForRootFolder(getContext()));
+                    setTitle(themeUtils.getDefaultDisplayNameForRootFolder(getContext()), false);
                     break;
             }
         }
@@ -1586,7 +1586,7 @@ public void onMessageEvent(ChangeMenuEvent changeMenuEvent) {
                 ((FileDisplayActivity) activity).initSyncBroadcastReceiver();
             }
 
-            setTitle(themeUtils.getDefaultDisplayNameForRootFolder(getContext()));
+            setTitle(themeUtils.getDefaultDisplayNameForRootFolder(getContext()), false);
             activity.getIntent().removeExtra(OCFileListFragment.SEARCH_EVENT);
         }
 
@@ -1832,18 +1832,30 @@ public void onMessageEvent(FileLockEvent event) {
         }
     }
 
+    /**
+     * Theme default action bar according to provided parameters.
+     * Replaces back arrow with hamburger menu icon.
+     *
+     * @param title string res id of title to be shown in action bar
+     */
     protected void setTitle(@StringRes final int title) {
-        setTitle(getContext().getString(title));
+        setTitle(requireContext().getString(title), true);
     }
 
-    protected void setTitle(final String title) {
-        getActivity().runOnUiThread(() -> {
+    /**
+     * Theme default action bar according to provided parameters.
+     *
+     * @param title title to be shown in action bar
+     * @param showBackAsMenu iff true replace back arrow with hamburger menu icon
+     */
+    protected void setTitle(final String title, Boolean showBackAsMenu) {
+        requireActivity().runOnUiThread(() -> {
             if (getActivity() != null) {
                 final ActionBar actionBar = ((FileDisplayActivity) getActivity()).getSupportActionBar();
                 final Context context = getContext();
 
                 if (actionBar != null && context != null) {
-                    viewThemeUtils.files.themeActionBar(context, actionBar, title, true);
+                    viewThemeUtils.files.themeActionBar(context, actionBar, title, showBackAsMenu);
                 }
             }
         });

From 55bd8cbd9c614383cdec684135307d108f0e6386 Mon Sep 17 00:00:00 2001
From: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
Date: Fri, 23 Jun 2023 16:55:21 +0200
Subject: [PATCH 2/2] Fix back icon when returning from build-in pdf viewer

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
---
 .../com/owncloud/android/ui/activity/FileDisplayActivity.java   | 2 ++
 1 file changed, 2 insertions(+)

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 dcbfde829a8c..0a4c8a8e2464 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
@@ -1080,6 +1080,8 @@ public void onBackPressed() {
             }
         } else if (leftFragment instanceof PreviewTextStringFragment) {
             createMinFragments(null);
+        } else if (leftFragment instanceof PreviewPdfFragment) {
+            super.onBackPressed();
         } else {
             // pop back
             resetScrolling(true);