From be778df42f4772577dcce8f143bab709c3581be5 Mon Sep 17 00:00:00 2001
From: Aitorbp <aitor.ballesteros.pavon@gmail.com>
Date: Mon, 5 Feb 2024 12:27:25 +0000
Subject: [PATCH] Changed unreleased folder, version number and released notes

---
 .../{unreleased => 4.2.0_2024-02-05}/3966     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4138     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4143     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4160     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4179     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4183     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4187     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4191     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4199     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4204     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4205     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4209     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4212     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4214     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4215     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4237     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4238     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4241     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4257     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4260     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4265     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4266     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4276     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4277     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4283     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4285     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4287     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4291     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4294     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4295     |  0
 .../{unreleased => 4.2.0_2024-02-05}/4297     |  0
 owncloudApp/build.gradle                      |  4 +--
 owncloudApp/src/main/res/values/strings.xml   | 30 ++++++++++---------
 33 files changed, 18 insertions(+), 16 deletions(-)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/3966 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4138 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4143 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4160 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4179 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4183 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4187 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4191 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4199 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4204 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4205 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4209 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4212 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4214 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4215 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4237 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4238 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4241 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4257 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4260 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4265 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4266 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4276 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4277 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4283 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4285 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4287 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4291 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4294 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4295 (100%)
 rename changelog/{unreleased => 4.2.0_2024-02-05}/4297 (100%)

diff --git a/changelog/unreleased/3966 b/changelog/4.2.0_2024-02-05/3966
similarity index 100%
rename from changelog/unreleased/3966
rename to changelog/4.2.0_2024-02-05/3966
diff --git a/changelog/unreleased/4138 b/changelog/4.2.0_2024-02-05/4138
similarity index 100%
rename from changelog/unreleased/4138
rename to changelog/4.2.0_2024-02-05/4138
diff --git a/changelog/unreleased/4143 b/changelog/4.2.0_2024-02-05/4143
similarity index 100%
rename from changelog/unreleased/4143
rename to changelog/4.2.0_2024-02-05/4143
diff --git a/changelog/unreleased/4160 b/changelog/4.2.0_2024-02-05/4160
similarity index 100%
rename from changelog/unreleased/4160
rename to changelog/4.2.0_2024-02-05/4160
diff --git a/changelog/unreleased/4179 b/changelog/4.2.0_2024-02-05/4179
similarity index 100%
rename from changelog/unreleased/4179
rename to changelog/4.2.0_2024-02-05/4179
diff --git a/changelog/unreleased/4183 b/changelog/4.2.0_2024-02-05/4183
similarity index 100%
rename from changelog/unreleased/4183
rename to changelog/4.2.0_2024-02-05/4183
diff --git a/changelog/unreleased/4187 b/changelog/4.2.0_2024-02-05/4187
similarity index 100%
rename from changelog/unreleased/4187
rename to changelog/4.2.0_2024-02-05/4187
diff --git a/changelog/unreleased/4191 b/changelog/4.2.0_2024-02-05/4191
similarity index 100%
rename from changelog/unreleased/4191
rename to changelog/4.2.0_2024-02-05/4191
diff --git a/changelog/unreleased/4199 b/changelog/4.2.0_2024-02-05/4199
similarity index 100%
rename from changelog/unreleased/4199
rename to changelog/4.2.0_2024-02-05/4199
diff --git a/changelog/unreleased/4204 b/changelog/4.2.0_2024-02-05/4204
similarity index 100%
rename from changelog/unreleased/4204
rename to changelog/4.2.0_2024-02-05/4204
diff --git a/changelog/unreleased/4205 b/changelog/4.2.0_2024-02-05/4205
similarity index 100%
rename from changelog/unreleased/4205
rename to changelog/4.2.0_2024-02-05/4205
diff --git a/changelog/unreleased/4209 b/changelog/4.2.0_2024-02-05/4209
similarity index 100%
rename from changelog/unreleased/4209
rename to changelog/4.2.0_2024-02-05/4209
diff --git a/changelog/unreleased/4212 b/changelog/4.2.0_2024-02-05/4212
similarity index 100%
rename from changelog/unreleased/4212
rename to changelog/4.2.0_2024-02-05/4212
diff --git a/changelog/unreleased/4214 b/changelog/4.2.0_2024-02-05/4214
similarity index 100%
rename from changelog/unreleased/4214
rename to changelog/4.2.0_2024-02-05/4214
diff --git a/changelog/unreleased/4215 b/changelog/4.2.0_2024-02-05/4215
similarity index 100%
rename from changelog/unreleased/4215
rename to changelog/4.2.0_2024-02-05/4215
diff --git a/changelog/unreleased/4237 b/changelog/4.2.0_2024-02-05/4237
similarity index 100%
rename from changelog/unreleased/4237
rename to changelog/4.2.0_2024-02-05/4237
diff --git a/changelog/unreleased/4238 b/changelog/4.2.0_2024-02-05/4238
similarity index 100%
rename from changelog/unreleased/4238
rename to changelog/4.2.0_2024-02-05/4238
diff --git a/changelog/unreleased/4241 b/changelog/4.2.0_2024-02-05/4241
similarity index 100%
rename from changelog/unreleased/4241
rename to changelog/4.2.0_2024-02-05/4241
diff --git a/changelog/unreleased/4257 b/changelog/4.2.0_2024-02-05/4257
similarity index 100%
rename from changelog/unreleased/4257
rename to changelog/4.2.0_2024-02-05/4257
diff --git a/changelog/unreleased/4260 b/changelog/4.2.0_2024-02-05/4260
similarity index 100%
rename from changelog/unreleased/4260
rename to changelog/4.2.0_2024-02-05/4260
diff --git a/changelog/unreleased/4265 b/changelog/4.2.0_2024-02-05/4265
similarity index 100%
rename from changelog/unreleased/4265
rename to changelog/4.2.0_2024-02-05/4265
diff --git a/changelog/unreleased/4266 b/changelog/4.2.0_2024-02-05/4266
similarity index 100%
rename from changelog/unreleased/4266
rename to changelog/4.2.0_2024-02-05/4266
diff --git a/changelog/unreleased/4276 b/changelog/4.2.0_2024-02-05/4276
similarity index 100%
rename from changelog/unreleased/4276
rename to changelog/4.2.0_2024-02-05/4276
diff --git a/changelog/unreleased/4277 b/changelog/4.2.0_2024-02-05/4277
similarity index 100%
rename from changelog/unreleased/4277
rename to changelog/4.2.0_2024-02-05/4277
diff --git a/changelog/unreleased/4283 b/changelog/4.2.0_2024-02-05/4283
similarity index 100%
rename from changelog/unreleased/4283
rename to changelog/4.2.0_2024-02-05/4283
diff --git a/changelog/unreleased/4285 b/changelog/4.2.0_2024-02-05/4285
similarity index 100%
rename from changelog/unreleased/4285
rename to changelog/4.2.0_2024-02-05/4285
diff --git a/changelog/unreleased/4287 b/changelog/4.2.0_2024-02-05/4287
similarity index 100%
rename from changelog/unreleased/4287
rename to changelog/4.2.0_2024-02-05/4287
diff --git a/changelog/unreleased/4291 b/changelog/4.2.0_2024-02-05/4291
similarity index 100%
rename from changelog/unreleased/4291
rename to changelog/4.2.0_2024-02-05/4291
diff --git a/changelog/unreleased/4294 b/changelog/4.2.0_2024-02-05/4294
similarity index 100%
rename from changelog/unreleased/4294
rename to changelog/4.2.0_2024-02-05/4294
diff --git a/changelog/unreleased/4295 b/changelog/4.2.0_2024-02-05/4295
similarity index 100%
rename from changelog/unreleased/4295
rename to changelog/4.2.0_2024-02-05/4295
diff --git a/changelog/unreleased/4297 b/changelog/4.2.0_2024-02-05/4297
similarity index 100%
rename from changelog/unreleased/4297
rename to changelog/4.2.0_2024-02-05/4297
diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle
index 5f25f6de6a02..2127bab73567 100644
--- 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/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml
index dfc8d6b6281b..a180035477e0 100644
--- a/owncloudApp/src/main/res/values/strings.xml
+++ b/owncloudApp/src/main/res/values/strings.xml
@@ -727,20 +727,22 @@
     <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_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_1">Latest version with support for Android 6.0</string>
+    <string name="release_notes_4_2_0_subtitle_1">The 4.2.0 version of the app will be the last one that supports Android 6.0</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</string>
+    <string name="release_notes_4_2_0_title_3">"Share to" in oCIS 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 oCIS 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">Minor bugfixes</string>
+    <string name="release_notes_4_2_0_subtitle_7">Some bugs were fixed to improve experience in the app</string>
+    <string name="release_notes_4_2_0_title_8">Auto uploads to spaces</string>
+    <string name="release_notes_4_2_0_subtitle_8">Photos and videos from camera now saved inside spaces, not only in Personal</string>
 
     <!-- Open in web -->
     <string name="ic_action_open_in_web">Open in web</string>