Merge pull request #4502 from owncloud/release/4.4.1

[RELEASE] 4.4.1

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Table of Contents
 
 * [Changelog for unreleased](#changelog-for-owncloud-android-client-unreleased-unreleased)
+* [Changelog for 4.4.1](#changelog-for-owncloud-android-client-441-2024-10-30)
 * [Changelog for 4.4.0](#changelog-for-owncloud-android-client-440-2024-09-30)
 * [Changelog for 4.3.1](#changelog-for-owncloud-android-client-431-2024-07-22)
 * [Changelog for 4.3.0](#changelog-for-owncloud-android-client-430-2024-07-01)
@@ -29,12 +30,13 @@
 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.4.0...master
+[unreleased]: https://github.com/owncloud/android/compare/v4.4.1...master
 
 ## Summary
 
 * Change - Replace auto-uploads with automatic uploads: [#4252](https://github.com/owncloud/android/issues/4252)
 * Enhancement - Add status message when (un)setting av. offline from preview: [#4382](https://github.com/owncloud/android/issues/4382)
+* Enhancement - Added text labels for BottomNavigationView: [#4484](https://github.com/owncloud/android/issues/4484)
 
 ## Details
 
@@ -55,6 +57,36 @@ ownCloud admins and users.
    https://github.com/owncloud/android/issues/4382
    https://github.com/owncloud/android/pull/4482
 
+* Enhancement - Added text labels for BottomNavigationView: [#4484](https://github.com/owncloud/android/issues/4484)
+
+   Text labels have been added below the icons, and the active indicator feature is
+   implemented using the default itemActiveIndicatorStyle for better navigation
+   experience.
+
+   https://github.com/owncloud/android/issues/4484
+   https://github.com/owncloud/android/pull/4498
+
+# Changelog for ownCloud Android Client [4.4.1] (2024-10-30)
+
+The following sections list the changes in ownCloud Android Client 4.4.1 relevant to
+ownCloud admins and users.
+
+[4.4.1]: https://github.com/owncloud/android/compare/v4.4.0...v4.4.1
+
+## Summary
+
+* Bugfix - File size becomes 0 after a local update: [#4495](https://github.com/owncloud/android/issues/4495)
+
+## Details
+
+* Bugfix - File size becomes 0 after a local update: [#4495](https://github.com/owncloud/android/issues/4495)
+
+   The local copy of a file is not removed after a local update anymore. Therefore,
+   the file size has been fixed.
+
+   https://github.com/owncloud/android/issues/4495
+   https://github.com/owncloud/android/pull/4502
+
 # Changelog for ownCloud Android Client [4.4.0] (2024-09-30)
 
 The following sections list the changes in ownCloud Android Client 4.4.0 relevant to

changelog/4.4.1_2024-10-30/4502

@@ -0,0 +1,6 @@
+Bugfix: File size becomes 0 after a local update
+
+The local copy of a file is not removed after a local update anymore. Therefore, the file size has been fixed.
+
+https://github.com/owncloud/android/issues/4495
+https://github.com/owncloud/android/pull/4502

owncloudApp/build.gradle

@@ -96,8 +96,8 @@ android {
 
         testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner"
 
-        versionCode = 44000000
-        versionName = "4.4.0"
+        versionCode = 44000100
+        versionName = "4.4.1"
 
         buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\""
         buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\""

owncloudApp/src/main/java/com/owncloud/android/usecases/transfers/uploads/UploadFileInConflictUseCase.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) 2024 ownCloud GmbH.
  * <p>
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -111,6 +112,7 @@ class UploadFileInConflictUseCase(
             UploadFileFromFileSystemWorker.KEY_PARAM_LAST_MODIFIED to lastModifiedInSeconds,
             UploadFileFromFileSystemWorker.KEY_PARAM_UPLOAD_PATH to uploadPath,
             UploadFileFromFileSystemWorker.KEY_PARAM_UPLOAD_ID to uploadIdInStorageManager,
+            UploadFileFromFileSystemWorker.KEY_PARAM_REMOVE_LOCAL to false
         )
 
         val constraints = Constraints.Builder()

owncloudApp/src/main/java/com/owncloud/android/workers/UploadFileFromFileSystemWorker.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) 2024 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,
@@ -81,6 +82,7 @@ class UploadFileFromFileSystemWorker(
     private lateinit var behavior: UploadBehavior
     private lateinit var uploadPath: String
     private lateinit var mimetype: String
+    private var removeLocal: Boolean = true
     private var uploadIdInStorageManager: Long = -1
     private lateinit var ocTransfer: OCTransfer
     private var fileSize: Long = 0
@@ -131,6 +133,7 @@ class UploadFileFromFileSystemWorker(
         val paramBehavior = workerParameters.inputData.getString(KEY_PARAM_BEHAVIOR)
         val paramFileSystemUri = workerParameters.inputData.getString(KEY_PARAM_LOCAL_PATH)
         val paramUploadId = workerParameters.inputData.getLong(KEY_PARAM_UPLOAD_ID, -1)
+        val paramRemoveLocal = workerParameters.inputData.getBoolean(KEY_PARAM_REMOVE_LOCAL, true)
 
         account = AccountUtils.getOwnCloudAccountByName(appContext, paramAccountName) ?: return false
         fileSystemPath = paramFileSystemUri.takeUnless { it.isNullOrBlank() } ?: return false
@@ -139,6 +142,7 @@ class UploadFileFromFileSystemWorker(
         lastModified = paramLastModified ?: return false
         uploadIdInStorageManager = paramUploadId.takeUnless { it == -1L } ?: return false
         ocTransfer = retrieveUploadInfoFromDatabase() ?: return false
+        removeLocal = paramRemoveLocal
 
         return true
     }
@@ -250,7 +254,7 @@ class UploadFileFromFileSystemWorker(
 
         val result = executeRemoteOperation { uploadFileOperation.execute(client) }
 
-        if (result == Unit) {
+        if (result == Unit && removeLocal) {
             removeLocalFile() // Removed file from tmp folder
         }
     }
@@ -289,7 +293,7 @@ class UploadFileFromFileSystemWorker(
         )
 
         // Step 4: Remove tmp file folder after uploading
-        if (result == Unit) {
+        if (result == Unit && removeLocal) {
             removeLocalFile()
         }
     }
@@ -401,5 +405,6 @@ class UploadFileFromFileSystemWorker(
         const val KEY_PARAM_LAST_MODIFIED = "KEY_PARAM_LAST_MODIFIED"
         const val KEY_PARAM_UPLOAD_PATH = "KEY_PARAM_UPLOAD_PATH"
         const val KEY_PARAM_UPLOAD_ID = "KEY_PARAM_UPLOAD_ID"
+        const val KEY_PARAM_REMOVE_LOCAL = "KEY_REMOVE_LOCAL"
     }
 }