Skip to content

Commit faeb671

Browse files
authored
Merge pull request #4649 from owncloud/fix/bycs_without_document_editing
[FIX] Mini-fab for creating a new document not always available
2 parents 503cc81 + 88ea0c0 commit faeb671

4 files changed

Lines changed: 34 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Table of Contents
22

3+
* [Changelog for unreleased](#changelog-for-owncloud-android-client-unreleased-unreleased)
34
* [Changelog for 4.6.0](#changelog-for-owncloud-android-client-460-2025-07-22)
45
* [Changelog for 4.5.1](#changelog-for-owncloud-android-client-451-2025-04-03)
56
* [Changelog for 4.5.0](#changelog-for-owncloud-android-client-450-2025-03-24)
@@ -27,6 +28,28 @@
2728
* [Changelog for 2.18.1](#changelog-for-owncloud-android-client-2181-2021-07-20)
2829
* [Changelog for 2.18.0](#changelog-for-owncloud-android-client-2180-2021-05-24)
2930
* [Changelog for 2.17 versions and below](#changelog-for-217-versions-and-below)
31+
# Changelog for ownCloud Android Client [unreleased] (UNRELEASED)
32+
33+
The following sections list the changes in ownCloud Android Client unreleased relevant to
34+
ownCloud admins and users.
35+
36+
[unreleased]: https://github.com/owncloud/android/compare/v4.6.0...master
37+
38+
## Summary
39+
40+
* Bugfix - Mini-fab for creating new document not always available: [#7277](https://github.com/owncloud/enterprise/issues/7277)
41+
42+
## Details
43+
44+
* Bugfix - Mini-fab for creating new document not always available: [#7277](https://github.com/owncloud/enterprise/issues/7277)
45+
46+
The productName property has been made nullable to handle cases where it is not
47+
present in the JSON response, allowing the mini-fab for creating new documents
48+
to be properly shown.
49+
50+
https://github.com/owncloud/enterprise/issues/7277
51+
https://github.com/owncloud/android/pull/4649
52+
3053
# Changelog for ownCloud Android Client [4.6.0] (2025-07-22)
3154

3255
The following sections list the changes in ownCloud Android Client 4.6.0 relevant to

changelog/unreleased/4649

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Bugfix: Mini-fab for creating new document not always available
2+
3+
The productName property has been made nullable to handle cases where it is not present
4+
in the JSON response, allowing the mini-fab for creating new documents to be properly shown.
5+
6+
https://github.com/owncloud/enterprise/issues/7277
7+
https://github.com/owncloud/android/pull/4649

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/appregistry/responses/AppRegistryResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ data class AppRegistryMimeTypeResponse(
5353
data class AppRegistryProviderResponse(
5454
val name: String,
5555
@Json(name = "product_name")
56-
val productName: String,
56+
val productName: String?,
5757
val icon: String,
5858
)

owncloudData/src/main/java/com/owncloud/android/data/appregistry/datasources/implementation/OCRemoteAppRegistryDataSource.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
*
44
* @author Abel García de Prada
55
* @author Juan Carlos Garrote Gascón
6+
* @author Jorge Aguado Recio
67
*
7-
* Copyright (C) 2023 ownCloud GmbH.
8+
* Copyright (C) 2025 ownCloud GmbH.
89
*
910
* This program is free software: you can redistribute it and/or modify
1011
* it under the terms of the GNU General Public License version 2,
@@ -75,7 +76,7 @@ class OCRemoteAppRegistryDataSource(
7576
appProviders = appRegistryMimeTypeResponse.appProviders.map { appRegistryProviderResponse ->
7677
AppRegistryProvider(
7778
name = appRegistryProviderResponse.name,
78-
productName = appRegistryProviderResponse.productName,
79+
productName = appRegistryProviderResponse.productName ?: "",
7980
icon = appRegistryProviderResponse.icon
8081
)
8182
},

0 commit comments

Comments
 (0)