diff --git a/CHANGELOG.md b/CHANGELOG.md index a8aca792a72..fcf6aab44c7 100644 --- 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.6.0](#changelog-for-owncloud-android-client-460-2025-07-22) * [Changelog for 4.5.1](#changelog-for-owncloud-android-client-451-2025-04-03) * [Changelog for 4.5.0](#changelog-for-owncloud-android-client-450-2025-03-24) @@ -27,6 +28,28 @@ * [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.6.0...master + +## Summary + +* Bugfix - Mini-fab for creating new document not always available: [#7277](https://github.com/owncloud/enterprise/issues/7277) + +## Details + +* Bugfix - Mini-fab for creating new document not always available: [#7277](https://github.com/owncloud/enterprise/issues/7277) + + The productName property has been made nullable to handle cases where it is not + present in the JSON response, allowing the mini-fab for creating new documents + to be properly shown. + + https://github.com/owncloud/enterprise/issues/7277 + https://github.com/owncloud/android/pull/4649 + # Changelog for ownCloud Android Client [4.6.0] (2025-07-22) The following sections list the changes in ownCloud Android Client 4.6.0 relevant to diff --git a/changelog/unreleased/4649 b/changelog/unreleased/4649 new file mode 100644 index 00000000000..cd3ab1d8f3a --- /dev/null +++ b/changelog/unreleased/4649 @@ -0,0 +1,7 @@ +Bugfix: Mini-fab for creating new document not always available + +The productName property has been made nullable to handle cases where it is not present +in the JSON response, allowing the mini-fab for creating new documents to be properly shown. + +https://github.com/owncloud/enterprise/issues/7277 +https://github.com/owncloud/android/pull/4649 diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/responses/AppRegistryResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/responses/AppRegistryResponse.kt index 2827d8522b8..9cbc08f998b 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/responses/AppRegistryResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/responses/AppRegistryResponse.kt @@ -53,6 +53,6 @@ data class AppRegistryMimeTypeResponse( data class AppRegistryProviderResponse( val name: String, @Json(name = "product_name") - val productName: String, + val productName: String?, val icon: String, ) diff --git a/owncloudData/src/main/java/com/owncloud/android/data/appregistry/datasources/implementation/OCRemoteAppRegistryDataSource.kt b/owncloudData/src/main/java/com/owncloud/android/data/appregistry/datasources/implementation/OCRemoteAppRegistryDataSource.kt index 4c122c60a96..2f455697fe2 100644 --- a/owncloudData/src/main/java/com/owncloud/android/data/appregistry/datasources/implementation/OCRemoteAppRegistryDataSource.kt +++ b/owncloudData/src/main/java/com/owncloud/android/data/appregistry/datasources/implementation/OCRemoteAppRegistryDataSource.kt @@ -3,8 +3,9 @@ * * @author Abel García de Prada * @author Juan Carlos Garrote Gascón + * @author Jorge Aguado Recio * - * Copyright (C) 2023 ownCloud GmbH. + * Copyright (C) 2025 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, @@ -75,7 +76,7 @@ class OCRemoteAppRegistryDataSource( appProviders = appRegistryMimeTypeResponse.appProviders.map { appRegistryProviderResponse -> AppRegistryProvider( name = appRegistryProviderResponse.name, - productName = appRegistryProviderResponse.productName, + productName = appRegistryProviderResponse.productName ?: "", icon = appRegistryProviderResponse.icon ) },