Merge pull request #4323 from owncloud/fix/crashes_google_play_4.2.0

[FIX] Some crashes in 4.2.0 (Play Store)
owncloud · Feb 21, 2024 · bc9b34a · bc9b34a
2 parents 25de31e + daa1b43
commit bc9b34a
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Table of Contents
 
+* [Changelog for unreleased](#changelog-for-owncloud-android-client-unreleased-unreleased)
 * [Changelog for 4.2.0](#changelog-for-owncloud-android-client-420-2024-02-05)
 * [Changelog for 4.1.1](#changelog-for-owncloud-android-client-411-2023-10-18)
 * [Changelog for 4.1.0](#changelog-for-owncloud-android-client-410-2023-08-23)
@@ -18,6 +19,26 @@
 * [Changelog for 2.18.1](#changelog-for-owncloud-android-client-2181-2021-07-20)
 * [Changelog for 2.18.0](#changelog-for-owncloud-android-client-2180-2021-05-24)
 * [Changelog for 2.17 versions and below](#changelog-for-217-versions-and-below)
+# Changelog for ownCloud Android Client [unreleased] (UNRELEASED)
+
+The following sections list the changes in ownCloud Android Client unreleased relevant to
+ownCloud admins and users.
+
+[unreleased]: https://github.com/owncloud/android/compare/v4.2.0...master
+
+## Summary
+
+* Bugfix - Some crashes in 4.2.0: [#4318](https://github.com/owncloud/android/issues/4318)
+
+## Details
+
+* Bugfix - Some crashes in 4.2.0: [#4318](https://github.com/owncloud/android/issues/4318)
+
+   Several crashes reported by Play Console in version 4.2.0 have been fixed.
+
+   https://github.com/owncloud/android/issues/4318
+   https://github.com/owncloud/android/pull/4323
+
 # Changelog for ownCloud Android Client [4.2.0] (2024-02-05)
 
 The following sections list the changes in ownCloud Android Client 4.2.0 relevant to

diff --git a/changelog/unreleased/4323 b/changelog/unreleased/4323
@@ -0,0 +1,6 @@
+Bugfix: Some crashes in 4.2.0
+
+Several crashes reported by Play Console in version 4.2.0 have been fixed.
+
+https://github.com/owncloud/android/issues/4318
+https://github.com/owncloud/android/pull/4323
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
@@ -213,6 +213,9 @@ protected boolean isRedirectingToSetupAccount() {
 
     public FileDataStorageManager getStorageManager() {
         if (mStorageManager == null) {
+            if (getAccount() == null) {
+                swapToDefaultAccount();
+            }
             return mStorageManager = new FileDataStorageManager(getAccount());
         } else {
             return mStorageManager;

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
@@ -238,6 +238,9 @@ open class FolderPickerActivity : FileActivity(),
 
     private fun initAndShowListOfFilesFragment(spaceId: String? = null) {
         val safeInitialFolder = if (file == null) {
+            if (account == null) {
+                account = AccountUtils.getCurrentOwnCloudAccount(applicationContext)
+            }
             val fileDataStorageManager = FileDataStorageManager(account)
             fileDataStorageManager.getFileByPath(OCFile.ROOT_PATH, spaceId)
         } else {

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -220,7 +220,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mReceiveExternalFilesViewModel = get(ReceiveExternalFilesViewModel.class);
         subscribeToViewModels();
-        mReceiveExternalFilesViewModel.getPersonalSpaceForAccount(getAccount().name);
 
         initPickerListener();