diff --git a/changelog/unreleased/4879 b/changelog/unreleased/4879 new file mode 100644 index 00000000000..04ad4ce15cd --- /dev/null +++ b/changelog/unreleased/4879 @@ -0,0 +1,7 @@ +Bugfix: Crash from Google Play Console in FileDetailsFragment + +To prevent crashes, the navigation logic when navigating back has been +improved, especially in cases where the observed file is null. + +https://github.com/owncloud/android/issues/4737 +https://github.com/owncloud/android/pull/4879 diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt index 4025e742cc3..3ca53ce215c 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt @@ -6,7 +6,7 @@ * @author Aitor Ballesteros Pavón * @author Jorge Aguado Recio * - * Copyright (C) 2025 ownCloud GmbH. + * Copyright (C) 2026 ownCloud GmbH. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -610,7 +610,7 @@ class FileDetailsFragment : FileFragment() { file = ocFileWithSyncInfo.file updateDetails(ocFileWithSyncInfo) } else { - requireActivity().onBackPressed() + requireActivity().onBackPressedDispatcher.onBackPressed() } } } diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index f42851c0e6d..ceb765ec411 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -12,7 +12,7 @@ * @author Jorge Aguado Recio * * Copyright (C) 2011 Bartek Przybylski - * Copyright (C) 2025 ownCloud GmbH. + * Copyright (C) 2026 ownCloud GmbH. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -543,7 +543,7 @@ class FileDisplayActivity : FileActivity(), if (second != null) { val tr = supportFragmentManager.beginTransaction() tr.remove(second) - tr.commitNow() + tr.commit() } updateFragmentsVisibility(false) updateToolbar(null)