owncloud · Aitorbp · Feb 13, 2024 · Feb 5, 2024 · Feb 7, 2024 · Feb 7, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +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-12)
 * [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)
 * [Changelog for 4.0.0](#changelog-for-owncloud-android-client-400-2023-05-29)
@@ -18,12 +18,12 @@
 * [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)
+# Changelog for ownCloud Android Client [4.2.0] (2024-02-12)
 
-The following sections list the changes in ownCloud Android Client unreleased relevant to
+The following sections list the changes in ownCloud Android Client 4.2.0 relevant to
 ownCloud admins and users.
 
-[unreleased]: https://github.com/owncloud/android/compare/v4.1.1...master
+[4.2.0]: https://github.com/owncloud/android/compare/v4.1.1...v4.2.0
 
 ## Summary
 
@@ -38,6 +38,7 @@ ownCloud admins and users.
 * Bugfix - Handle Http 423 (resource locked): [#4282](https://github.com/owncloud/android/issues/4282)
 * Bugfix - Copy folder into descendant in different spaces: [#4293](https://github.com/owncloud/android/issues/4293)
 * Change - Android library as a module instead of submodule: [#3962](https://github.com/owncloud/android/issues/3962)
+* Change - Migration to Media3 from Exoplayer: [#4157](https://github.com/owncloud/android/issues/4157)
 * Enhancement - Koin DSL: [#3966](https://github.com/owncloud/android/pull/3966)
 * Enhancement - Unit tests for datasources classes - Part 1 & Fixes: [#4063](https://github.com/owncloud/android/issues/4063)
 * Enhancement - Unit tests for datasources classes - Part 3: [#4072](https://github.com/owncloud/android/issues/4072)
@@ -55,6 +56,7 @@ ownCloud admins and users.
 * Enhancement - Select user and navigate to file when opening via deep link: [#4194](https://github.com/owncloud/android/issues/4194)
 * Enhancement - New branding/MDM parameter to show sensitive auth info in logs: [#4249](https://github.com/owncloud/android/issues/4249)
 * Enhancement - Fix in the type handling of the content-type: [#4258](https://github.com/owncloud/android/issues/4258)
+* Enhancement - Prevent that two media files are playing at the same time: [#4263](https://github.com/owncloud/android/pull/4263)
 * Enhancement - Added icon for .docxf files: [#4267](https://github.com/owncloud/android/issues/4267)
 * Enhancement - Manage password policy in live mode: [#4269](https://github.com/owncloud/android/issues/4269)
 * Enhancement - New branding/MDM parameter to send `login_hint` and `user` params: [#4288](https://github.com/owncloud/android/issues/4288)
@@ -149,6 +151,15 @@ ownCloud admins and users.
    https://github.com/owncloud/android/issues/3962
    https://github.com/owncloud/android/pull/4183
 
+* Change - Migration to Media3 from Exoplayer: [#4157](https://github.com/owncloud/android/issues/4157)
+
+   Media3 is the new home for Exoplayer, which has become a part of this library.
+   Media3 provides a more advanced and optimized media playback experience for
+   users, with improvements in performance and compatibility.
+
+   https://github.com/owncloud/android/issues/4157
+   https://github.com/owncloud/android/pull/4177
+
 * Enhancement - Koin DSL: [#3966](https://github.com/owncloud/android/pull/3966)
 
    Koin DSL makes easier the dependency definition avoiding verbosity by allowing
@@ -291,6 +302,12 @@ ownCloud admins and users.
    https://github.com/owncloud/android/issues/4258
    https://github.com/owncloud/android/pull/4266
 
+* Enhancement - Prevent that two media files are playing at the same time: [#4263](https://github.com/owncloud/android/pull/4263)
+
+   The player handles the audio focus shifts, pausing one player if another starts.
+
+   https://github.com/owncloud/android/pull/4263
+
 * Enhancement - Added icon for .docxf files: [#4267](https://github.com/owncloud/android/issues/4267)
 
    An icon has been added for files that have a .docxf extension.

diff --git a/changelog/unreleased/3966 → changelog/4.2.0_2024-02-12/3966 b/changelog/unreleased/3966 → changelog/4.2.0_2024-02-12/3966
diff --git a/changelog/unreleased/4138 → changelog/4.2.0_2024-02-12/4138 b/changelog/unreleased/4138 → changelog/4.2.0_2024-02-12/4138
diff --git a/changelog/unreleased/4143 → changelog/4.2.0_2024-02-12/4143 b/changelog/unreleased/4143 → changelog/4.2.0_2024-02-12/4143
diff --git a/changelog/unreleased/4160 → changelog/4.2.0_2024-02-12/4160 b/changelog/unreleased/4160 → changelog/4.2.0_2024-02-12/4160
diff --git a/changelog/4.2.0_2024-02-12/4177 b/changelog/4.2.0_2024-02-12/4177
@@ -0,0 +1,8 @@
+Change: Migration to Media3 from Exoplayer
+
+Media3 is the new home for Exoplayer, which has become a part of this library.
+Media3 provides a more advanced and optimized media playback experience for users,
+with improvements in performance and compatibility.
+
+https://github.com/owncloud/android/issues/4157
+https://github.com/owncloud/android/pull/4177
diff --git a/changelog/unreleased/4179 → changelog/4.2.0_2024-02-12/4179 b/changelog/unreleased/4179 → changelog/4.2.0_2024-02-12/4179
diff --git a/changelog/unreleased/4183 → changelog/4.2.0_2024-02-12/4183 b/changelog/unreleased/4183 → changelog/4.2.0_2024-02-12/4183
diff --git a/changelog/unreleased/4187 → changelog/4.2.0_2024-02-12/4187 b/changelog/unreleased/4187 → changelog/4.2.0_2024-02-12/4187
diff --git a/changelog/unreleased/4191 → changelog/4.2.0_2024-02-12/4191 b/changelog/unreleased/4191 → changelog/4.2.0_2024-02-12/4191
diff --git a/changelog/unreleased/4199 → changelog/4.2.0_2024-02-12/4199 b/changelog/unreleased/4199 → changelog/4.2.0_2024-02-12/4199
diff --git a/changelog/unreleased/4204 → changelog/4.2.0_2024-02-12/4204 b/changelog/unreleased/4204 → changelog/4.2.0_2024-02-12/4204
diff --git a/changelog/unreleased/4205 → changelog/4.2.0_2024-02-12/4205 b/changelog/unreleased/4205 → changelog/4.2.0_2024-02-12/4205
diff --git a/changelog/unreleased/4209 → changelog/4.2.0_2024-02-12/4209 b/changelog/unreleased/4209 → changelog/4.2.0_2024-02-12/4209
diff --git a/changelog/unreleased/4212 → changelog/4.2.0_2024-02-12/4212 b/changelog/unreleased/4212 → changelog/4.2.0_2024-02-12/4212
diff --git a/changelog/unreleased/4214 → changelog/4.2.0_2024-02-12/4214 b/changelog/unreleased/4214 → changelog/4.2.0_2024-02-12/4214
diff --git a/changelog/unreleased/4215 → changelog/4.2.0_2024-02-12/4215 b/changelog/unreleased/4215 → changelog/4.2.0_2024-02-12/4215
diff --git a/changelog/unreleased/4237 → changelog/4.2.0_2024-02-12/4237 b/changelog/unreleased/4237 → changelog/4.2.0_2024-02-12/4237
diff --git a/changelog/unreleased/4238 → changelog/4.2.0_2024-02-12/4238 b/changelog/unreleased/4238 → changelog/4.2.0_2024-02-12/4238
diff --git a/changelog/unreleased/4241 → changelog/4.2.0_2024-02-12/4241 b/changelog/unreleased/4241 → changelog/4.2.0_2024-02-12/4241
diff --git a/changelog/unreleased/4257 → changelog/4.2.0_2024-02-12/4257 b/changelog/unreleased/4257 → changelog/4.2.0_2024-02-12/4257
diff --git a/changelog/unreleased/4260 → changelog/4.2.0_2024-02-12/4260 b/changelog/unreleased/4260 → changelog/4.2.0_2024-02-12/4260
diff --git a/changelog/4.2.0_2024-02-12/4263 b/changelog/4.2.0_2024-02-12/4263
@@ -0,0 +1,5 @@
+Enhancement: Prevent that two media files are playing at the same time
+
+The player handles the audio focus shifts, pausing one player if another starts.
+
+https://github.com/owncloud/android/pull/4263
diff --git a/changelog/unreleased/4265 → changelog/4.2.0_2024-02-12/4265 b/changelog/unreleased/4265 → changelog/4.2.0_2024-02-12/4265
diff --git a/changelog/unreleased/4266 → changelog/4.2.0_2024-02-12/4266 b/changelog/unreleased/4266 → changelog/4.2.0_2024-02-12/4266
diff --git a/changelog/unreleased/4276 → changelog/4.2.0_2024-02-12/4276 b/changelog/unreleased/4276 → changelog/4.2.0_2024-02-12/4276
diff --git a/changelog/unreleased/4277 → changelog/4.2.0_2024-02-12/4277 b/changelog/unreleased/4277 → changelog/4.2.0_2024-02-12/4277
diff --git a/changelog/unreleased/4283 → changelog/4.2.0_2024-02-12/4283 b/changelog/unreleased/4283 → changelog/4.2.0_2024-02-12/4283
diff --git a/changelog/unreleased/4285 → changelog/4.2.0_2024-02-12/4285 b/changelog/unreleased/4285 → changelog/4.2.0_2024-02-12/4285
diff --git a/changelog/unreleased/4287 → changelog/4.2.0_2024-02-12/4287 b/changelog/unreleased/4287 → changelog/4.2.0_2024-02-12/4287
diff --git a/changelog/unreleased/4291 → changelog/4.2.0_2024-02-12/4291 b/changelog/unreleased/4291 → changelog/4.2.0_2024-02-12/4291
diff --git a/changelog/unreleased/4294 → changelog/4.2.0_2024-02-12/4294 b/changelog/unreleased/4294 → changelog/4.2.0_2024-02-12/4294
diff --git a/changelog/unreleased/4295 → changelog/4.2.0_2024-02-12/4295 b/changelog/unreleased/4295 → changelog/4.2.0_2024-02-12/4295
diff --git a/changelog/unreleased/4297 → changelog/4.2.0_2024-02-12/4297 b/changelog/unreleased/4297 → changelog/4.2.0_2024-02-12/4297
diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle
@@ -96,8 +96,8 @@ android {
 
         testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner"
 
-        versionCode = 41000101
-        versionName = "4.2-beta.1"
+        versionCode = 42000000
+        versionName = "4.2.0"
 
         buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\""
         buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\""

diff --git a/owncloudApp/src/main/AndroidManifest.xml b/owncloudApp/src/main/AndroidManifest.xml
@@ -196,7 +196,6 @@
             android:icon="@drawable/copy_link"
             android:label="@string/copy_link" />
         <activity android:name=".ui.activity.FolderPickerActivity" />
-        <activity android:name=".ui.activity.UploadPathActivity" />
         <activity
             android:name=".presentation.sharing.ShareActivity"
             android:exported="false"
@@ -246,4 +245,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/...App/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt b/...App/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt
@@ -48,18 +48,13 @@ class ReleaseNotesViewModel(
             ReleaseNote(
                 title = R.string.release_notes_4_2_0_title_1,
                 subtitle = R.string.release_notes_4_2_0_subtitle_1,
-                type = ReleaseNoteType.ENHANCEMENT,
+                type = ReleaseNoteType.CHANGE,
             ),
             ReleaseNote(
                 title = R.string.release_notes_4_2_0_title_2,
                 subtitle = R.string.release_notes_4_2_0_subtitle_2,
                 type = ReleaseNoteType.ENHANCEMENT,
             ),
-            ReleaseNote(
-                title = R.string.release_notes_4_2_0_title_7,
-                subtitle = R.string.release_notes_4_2_0_subtitle_7,
-                type = ReleaseNoteType.ENHANCEMENT,
-            ),
             ReleaseNote(
                 title = R.string.release_notes_4_2_0_title_3,
                 subtitle = R.string.release_notes_4_2_0_subtitle_3,
@@ -78,6 +73,31 @@ class ReleaseNotesViewModel(
             ReleaseNote(
                 title = R.string.release_notes_4_2_0_title_6,
                 subtitle = R.string.release_notes_4_2_0_subtitle_6,
+                type = ReleaseNoteType.ENHANCEMENT,
+            ),
+            ReleaseNote(
+                title = R.string.release_notes_4_2_0_title_7,
+                subtitle = R.string.release_notes_4_2_0_subtitle_7,
+                type = ReleaseNoteType.ENHANCEMENT,
+            ),
+            ReleaseNote(
+                title = R.string.release_notes_4_2_0_title_8,
+                subtitle = R.string.release_notes_4_2_0_subtitle_8,
+                type = ReleaseNoteType.ENHANCEMENT,
+            ),
+            ReleaseNote(
+                title = R.string.release_notes_4_2_0_title_9,
+                subtitle = R.string.release_notes_4_2_0_subtitle_9,
+                type = ReleaseNoteType.CHANGE,
+            ),
+            ReleaseNote(
+                title = R.string.release_notes_4_2_0_title_10,
+                subtitle = R.string.release_notes_4_2_0_subtitle_10,
+                type = ReleaseNoteType.ENHANCEMENT,
+            ),
+            ReleaseNote(
+                title = R.string.release_notes_4_2_0_title_11,
+                subtitle = R.string.release_notes_4_2_0_subtitle_11,
                 type = ReleaseNoteType.BUGFIX,
             ),
         )

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java
@@ -28,7 +28,6 @@
 import android.view.MenuItem;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -65,13 +64,10 @@ protected void onCreate(Bundle savedInstanceState) {
         actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setTitle(R.string.manage_space_title);
 
-        TextView descriptionTextView = findViewById(R.id.general_description);
-        descriptionTextView.setText(getString(R.string.manage_space_description, getString(R.string.app_name)));
-
         Button clearDataButton = findViewById(R.id.clearDataButton);
         clearDataButton.setOnClickListener(v -> {
-            ClearDataAsyncTask clearDataTask = new ClearDataAsyncTask();
-            clearDataTask.execute();
+//            ClearDataAsyncTask clearDataTask = new ClearDataAsyncTask();
+//            clearDataTask.execute();
         });
     }
 

diff --git a/owncloudApp/src/main/res/layout/activity_manage_space.xml b/owncloudApp/src/main/res/layout/activity_manage_space.xml
@@ -40,6 +40,7 @@
         android:layout_margin="@dimen/standard_margin"
         android:contentDescription="@string/manage_space_clear_data"
         android:text="@string/manage_space_clear_data"
+        android:enabled="false"
         android:theme="@style/Button.Primary" />
 
-</LinearLayout>
+</LinearLayout>
diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml
@@ -618,7 +618,7 @@
     <string name="action_upload_clear">Clear</string>
 
     <string name="manage_space_title">Manage space</string>
-    <string name="manage_space_description">Settings, database and server certificates from %1$s\'s data will be deleted permanently. \n\nDownloaded files will be kept untouched.\n\nThis process can take some time.</string>
+    <string name="manage_space_description">This feature is not currently available. Next versions will include new features for automatic and manual removal of storage. Stay tuned!</string>
     <string name="manage_space_clear_data">Clear data</string>
     <string name="manage_space_error">Some files could not be deleted.</string>
 
@@ -727,20 +727,28 @@
     <string name="release_notes_proceed">Proceed</string>
     <string name="release_notes_icon">Release note icon</string>
 
-    <string name="release_notes_4_2_0_title_1">Opening files from outside the app using links</string>
-    <string name="release_notes_4_2_0_subtitle_1">A link that points to the app will open the app and then, resolve the file to preview it directly</string>
-    <string name="release_notes_4_2_0_title_2">"Share to" in oCIS accounts allows to upload to any space</string>
-    <string name="release_notes_4_2_0_subtitle_2">Shared files from other apps can be uploaded to any space and not only the Personal one in oCIS accounts</string>
-    <string name="release_notes_4_2_0_title_3">"Apply to all" for conflicts</string>
-    <string name="release_notes_4_2_0_subtitle_3">New dialog to fix all conflicts at once</string>
-    <string name="release_notes_4_2_0_title_4">Auto-refresh when a file is uploaded</string>
-    <string name="release_notes_4_2_0_subtitle_4">The file list will be now refreshed automatically while uploading to the target folder</string>
-    <string name="release_notes_4_2_0_title_5">Download log files</string>
-    <string name="release_notes_4_2_0_subtitle_5">New option to download a log file to the Downloads folder of the device</string>
-    <string name="release_notes_4_2_0_title_6">Minor bugfixes</string>
-    <string name="release_notes_4_2_0_subtitle_6">Some bugs were fixed to improve experience in the app</string>
+    <string name="release_notes_4_2_0_title_1">Latest version with support for Android 6</string>
+    <string name="release_notes_4_2_0_subtitle_1">Current release will be the last one that supports Android 6</string>
+    <string name="release_notes_4_2_0_title_2">Opening files from outside the app using links</string>
+    <string name="release_notes_4_2_0_subtitle_2">A link that points to the app will open the app and then, resolve the file to preview it directly. Links for shared files are not included yet</string>
+    <string name="release_notes_4_2_0_title_3">"Share to" in Infinite Scale accounts allows to upload to any space</string>
+    <string name="release_notes_4_2_0_subtitle_3">Shared files from other apps can be uploaded to any space and not only the Personal one in Infinite Scale accounts</string>
+    <string name="release_notes_4_2_0_title_4">"Apply to all" for conflicts</string>
+    <string name="release_notes_4_2_0_subtitle_4">New dialog to fix all conflicts at once</string>
+    <string name="release_notes_4_2_0_title_5">Auto-refresh when a file is uploaded</string>
+    <string name="release_notes_4_2_0_subtitle_5">The file list will be now refreshed automatically while uploading to the target folder</string>
+    <string name="release_notes_4_2_0_title_6">Download log files</string>
+    <string name="release_notes_4_2_0_subtitle_6">New option to download a log file to the Downloads folder of the device</string>
     <string name="release_notes_4_2_0_title_7">Auto uploads to spaces</string>
     <string name="release_notes_4_2_0_subtitle_7">Photos and videos from camera now saved inside spaces, not only in Personal</string>
+    <string name="release_notes_4_2_0_title_8">Manage password policy in live mode in Infinite Scale accounts</string>
+    <string name="release_notes_4_2_0_subtitle_8">Password policy for public links is handled in live mode with new items in the dialog</string>
+    <string name="release_notes_4_2_0_title_9">Video player improved</string>
+    <string name="release_notes_4_2_0_subtitle_9">A more advanced and optimized media playback experience for users, with improvements in performance and compatibility.</string>
+    <string name="release_notes_4_2_0_title_10">Prevent that two media files are playing at the same time</string>
+    <string name="release_notes_4_2_0_subtitle_10">The player handles the audio focus shifts, pausing one player if another starts</string>
+    <string name="release_notes_4_2_0_title_11">Minor bugfixes</string>
+    <string name="release_notes_4_2_0_subtitle_11">Some bugs were fixed to improve experience in the app</string>
 
     <!-- Open in web -->
     <string name="ic_action_open_in_web">Open in web</string>

diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/OCFileLoggingTree.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/OCFileLoggingTree.kt
@@ -58,13 +58,16 @@ class OCFileLoggingTree(
             it.list()?.let { logFiles ->
                 if (logFiles.isNotEmpty()) {
 
-                    val lastDateLogFileString = if (context != null) {
+                    var lastDateLogFileString = if (context != null) {
                         logFiles.last().substringAfterLast("${context.packageName}.").substringBeforeLast(".log")
                     } else {
                         logFiles.last().substringAfterLast("$filename.").substringBeforeLast(".log")
                     }
 
                     val dateFormat = SimpleDateFormat(LOG_FILE_TIME_FORMAT)
+                    if (lastDateLogFileString.matches("^\\d{4}-\\d{2}-\\d{2}$".toRegex())) {
+                        lastDateLogFileString = "${lastDateLogFileString}_00.00.00"
+                    }
                     val lastDayLogFileDate = dateFormat.parse(lastDateLogFileString)
                     val newDayLogFileDate = dateFormat.parse(fileNameTimestamp)