Refactor loadUri methods and fix RecentDocumentDialogFragment navigation

Co-authored-by: TomTasche <128734+TomTasche@users.noreply.github.com>

Author: Copilot

app/src/main/java/at/tomtasche/reader/ui/activity/MainActivity.java

@@ -28,7 +28,6 @@
 import android.widget.CompoundButton;
 import android.widget.LinearLayout;
 
-import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
@@ -197,26 +196,6 @@ public void onClick(View view) {
         }
 
         addMenuProvider(this, this);
-
-        // Set up back button handling
-        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
-            @Override
-            public void handleOnBackPressed() {
-                if (fullscreen) {
-                    leaveFullscreen();
-                    return;
-                }
-
-                // If document is currently displayed and was opened internally, go back to landing
-                if (documentContainer.getVisibility() == View.VISIBLE && documentOpenedInternally) {
-                    showLandingScreen();
-                } else {
-                    // For external launches or when already on landing screen, use default behavior (close app)
-                    setEnabled(false);
-                    getOnBackPressedDispatcher().onBackPressed();
-                }
-            }
-        });
     }
 
     @Override
@@ -385,6 +364,18 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
     }
 
     public void loadUri(Uri uri) {
+        loadUriInternal(uri, false);
+    }
+    
+    public void loadUriFromInternalNavigation(Uri uri) {
+        loadUriInternal(uri, true);
+    }
+    
+    private void loadUriInternal(Uri uri, boolean isInternal) {
+        if (isInternal) {
+            documentOpenedInternally = true;
+        }
+        
         lastSaveUri = null;
         lastUri = uri;
 
@@ -581,6 +572,22 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         return super.onKeyDown(keyCode, event);
     }
 
+    @Override
+    public void onBackPressed() {
+        if (fullscreen) {
+            leaveFullscreen();
+            return;
+        }
+
+        // If document is currently displayed and was opened internally, go back to landing
+        if (documentContainer.getVisibility() == View.VISIBLE && documentOpenedInternally) {
+            showLandingScreen();
+        } else {
+            // For external launches or when already on landing screen, use default behavior (close app)
+            super.onBackPressed();
+        }
+    }
+
     public void findDocument() {
         final Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
         intent.addCategory(Intent.CATEGORY_OPENABLE);

app/src/main/java/at/tomtasche/reader/ui/widget/RecentDocumentDialogFragment.java

@@ -102,7 +102,7 @@ public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
         dismiss();
 
         MainActivity activity = ((MainActivity) getActivity());
-        activity.loadUri(Uri.parse(uri));
+        activity.loadUriFromInternalNavigation(Uri.parse(uri));
     }
 
     @Override