From ad092928f7ea3405a3099ed6efda9f106f10c3cb Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Fri, 30 Apr 2021 15:46:51 +0200
Subject: [PATCH 1/5] Bump version to 1.5.18-beta1

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 93627bf2..5157cecc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
 		androidVersionCode = getVersionCode()
-		androidVersionName = '1.6.0-SNAPSHOT'
+		androidVersionName = '1.5.18-beta1'
 	}
 	repositories {
 		mavenCentral()

From 1180f6cb41db2e405585fa09181fc307f0c8df8a Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Fri, 30 Apr 2021 16:09:19 +0200
Subject: [PATCH 2/5] Update release notes

[ci skip]
---
 fastlane/metadata/android/de-DE/changelogs/default.txt | 4 +++-
 fastlane/metadata/android/en-US/changelogs/default.txt | 4 +++-
 fastlane/release-notes.html                            | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/fastlane/metadata/android/de-DE/changelogs/default.txt b/fastlane/metadata/android/de-DE/changelogs/default.txt
index e15151b6..4d72d043 100644
--- a/fastlane/metadata/android/de-DE/changelogs/default.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/default.txt
@@ -1 +1,3 @@
-- Problem bei der pCloud-Anmeldung in der F-Droid-Variante behoben
\ No newline at end of file
+- Unterstützung für S3-kompatiblen Speicher hinzugefügt
+- Passwortrichtlinie verbessert, so dass Tresore mit sehr schlechten Passwörtern nicht mehr erstellt werden können
+- Problem bei der Dateisuche behoben, falls Globbing aktiviert, die Live-Suche deaktiviert und das Muster Großbuchstaben enthält
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt
index 8dfdac01..ce5afae0 100644
--- a/fastlane/metadata/android/en-US/changelogs/default.txt
+++ b/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1 +1,3 @@
-- Fixed pCloud login using F-Droid
\ No newline at end of file
+- Added support for S3 compatible storage
+- Enhanced password policy so that vaults with very bad passwords can no longer be created
+- Fixed problem in file search when globbing is enabled, live search is disabled and pattern contains uppercase characters
\ No newline at end of file
diff --git a/fastlane/release-notes.html b/fastlane/release-notes.html
index faa77e7b..22d760ac 100644
--- a/fastlane/release-notes.html
+++ b/fastlane/release-notes.html
@@ -1,3 +1,5 @@
 <ul>
-  <li>Fixed pCloud login using F-Droid</li>
+  <li>Added support for S3 compatible storage</li>
+  <li>Enhanced password policy so that vaults with very bad passwords can no longer be created</li>
+  <li>Fixed problem in file search when globbing is enabled, live search is disabled and pattern contains uppercase characters</li>
 </ul>
\ No newline at end of file

From 0ce6ce33f995cca6fa44d6eca5799c7e0f679e04 Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Fri, 30 Apr 2021 16:26:21 +0200
Subject: [PATCH 3/5] Skip deployment to F-Droid when beta option set

[ci skip]
---
 fastlane/Fastfile | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 71fd794e..6e06db4a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -177,25 +177,31 @@ platform :android do |options|
       }
     )
 
-    FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "repo/Cryptomator.apk")
+	if options[:beta]
+	  puts "Skipping deployment to F-Droid cause there isn't currently a beta channel"
+	else
+	  puts "Updating F-Droid"
 
-    sh("cp -r metadata/android/ metadata/org.cryptomator/")
-    FileUtils.cp("metadata/org.cryptomator/en-US/changelogs/default.txt", "metadata/org.cryptomator/en-US/changelogs/#{version}.txt")
-    FileUtils.cp("metadata/org.cryptomator/de-DE/changelogs/default.txt", "metadata/org.cryptomator/de-DE/changelogs/#{version}.txt")
-    sh("fdroid update && fdroid rewritemeta")
-    sh("rm -r metadata/org.cryptomator/")
+	  FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "repo/Cryptomator.apk")
 
-    aws_s3(
-        bucket: ENV['S3_BUCKET'],
-        endpoint: ENV['S3_ENDPOINT'],
-        region: ENV['S3_REGION'],
-        access_key: ENV['S3_ACCESS_KEY'],
-        secret_access_key: ENV['S3_SECRET_ACCESS_KEY'],
-        path: "android/fdroid",
-        folder: "fastlane/repo",
-        skip_html_upload: true,
-        apk: ''
-      )
+	  sh("cp -r metadata/android/ metadata/org.cryptomator/")
+	  FileUtils.cp("metadata/org.cryptomator/en-US/changelogs/default.txt", "metadata/org.cryptomator/en-US/changelogs/#{version}.txt")
+	  FileUtils.cp("metadata/org.cryptomator/de-DE/changelogs/default.txt", "metadata/org.cryptomator/de-DE/changelogs/#{version}.txt")
+	  sh("fdroid update && fdroid rewritemeta")
+	  sh("rm -r metadata/org.cryptomator/")
+
+	  aws_s3(
+		  bucket: ENV['S3_BUCKET'],
+		  endpoint: ENV['S3_ENDPOINT'],
+		  region: ENV['S3_REGION'],
+		  access_key: ENV['S3_ACCESS_KEY'],
+		  secret_access_key: ENV['S3_SECRET_ACCESS_KEY'],
+		  path: "android/fdroid",
+		  folder: "fastlane/repo",
+		  skip_html_upload: true,
+		  apk: ''
+		)
+	end
 
     FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "release/Cryptomator-#{version}_fdroid_signed.apk")
   end

From 6f939655310a13923db603bb9490a1efb456a690 Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Fri, 7 May 2021 11:31:11 +0200
Subject: [PATCH 4/5] Bump version to 1.5.18

[ci skip]
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5157cecc..0bc69290 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
 		androidVersionCode = getVersionCode()
-		androidVersionName = '1.5.18-beta1'
+		androidVersionName = '1.5.18'
 	}
 	repositories {
 		mavenCentral()

From 18a44bf08b0b38af6976099fbb15b3c6bf3f6f60 Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Fri, 7 May 2021 11:48:10 +0200
Subject: [PATCH 5/5] New Crowdin updates

[ci skip]
---
 .../src/main/res/values-b+sr+Latn/strings.xml | 38 +++++++++++++++++++
 .../src/main/res/values-de/strings.xml        |  5 +++
 .../src/main/res/values-fr/strings.xml        | 15 ++++++++
 .../src/main/res/values-hu/strings.xml        | 38 +++++++++++++++++++
 .../src/main/res/values-nl/strings.xml        | 38 +++++++++++++++++++
 presentation/src/main/res/values/strings.xml  |  1 +
 6 files changed, 135 insertions(+)
 create mode 100644 presentation/src/main/res/values-b+sr+Latn/strings.xml
 create mode 100644 presentation/src/main/res/values-hu/strings.xml
 create mode 100644 presentation/src/main/res/values-nl/strings.xml

diff --git a/presentation/src/main/res/values-b+sr+Latn/strings.xml b/presentation/src/main/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 00000000..bede0f6c
--- /dev/null
+++ b/presentation/src/main/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- # app -->
+	<!-- # error messages -->
+	<!-- # clouds -->
+	<!-- ## cloud names -->
+	<!-- # permission -->
+	<!-- ## permission messages -->
+	<!-- # screens -->
+	<!-- # screen: vault list -->
+	<!-- # screen: file browser -->
+	<!-- ## screen: text editor -->
+	<!-- ## screen: share files -->
+	<!-- ## screen: choose cloud service -->
+	<!-- ## screen: cloud connections -->
+	<!-- ## screen: webdav settings -->
+	<!-- ## screen: s3 settings -->
+	<!-- ## screen: enter vault name -->
+	<!-- ## screen: set password -->
+	<!-- ## screen: settings -->
+	<!-- ## screen: cloud settings -->
+	<!-- ## screen: licenses -->
+	<!-- ## screen: authenticate cloud -->
+	<!-- ## screen: empty dir file info -->
+	<!-- ## screen: insecure android version info -->
+	<!-- # dialogs -->
+	<!-- Vault not found -->
+	<!-- # error reports -->
+	<!-- # misc -->
+	<!-- ## file size helper -->
+	<!-- ## date helper -->
+	<!-- ## biometric authentication -->
+	<!-- notification -->
+	<!-- lock timeout names -->
+	<!-- cache size names -->
+	<!-- screen scheme mode names -->
+	<!-- update interval names -->
+</resources>
diff --git a/presentation/src/main/res/values-de/strings.xml b/presentation/src/main/res/values-de/strings.xml
index 1dfb5036..5ae206ff 100644
--- a/presentation/src/main/res/values-de/strings.xml
+++ b/presentation/src/main/res/values-de/strings.xml
@@ -22,12 +22,17 @@
 	<string name="error_names_contains_invalid_characters">Dateinamen können keine Sonderzeichen enthalten.</string>
 	<string name="error_vault_name_contains_invalid_characters">Tresorname kann keine Sonderzeichen enthalten.</string>
 	<string name="error_general_update">Prüfung auf Aktualisierungen fehlgeschlagen. Ein Fehler ist aufgetreten.</string>
+	<string name="error_hash_mismatch_update">Update-Überprüfung fehlgeschlagen. Berechnete Prüfsumme entspricht nicht der der hochgeladenen Datei</string>
 	<string name="error_update_no_internet">Prüfung auf Aktualisierungen fehlgeschlagen. Keine Internetverbindung.</string>
 	<string name="error_failed_to_decrypt_webdav_password">Beim entschlüsseln des WebDAV-Passworts trat ein Fehler auf. Bitte in den Einstellungen erneut festlegen.</string>
 	<string name="error_play_services_not_available">Die Play Services sind nicht installiert</string>
 	<string name="error_biometric_auth_aborted">Biometrischer Login abgebrochen</string>
+	<string name="error_vault_version_mismatch">Die in der vault.cryptomator-Datei angegebene Version ist anders als die der masterkey.cryptomator-Datei</string>
+	<string name="error_vault_key_invalid">vault.cryptomator-Datei stimmt nicht mit der masterkey.cryptomator-Datei überein</string>
+	<string name="error_vault_config_loading">Allgemeiner Fehler beim Laden der Tresorkonfiguration</string>
 	<string name="error_file_not_found_after_opening_using_3party">Lokale Datei ist nach dem Zurückwechseln zu Cryptomator nicht mehr vorhanden. Mögliche Änderungen können nicht in die Cloud übertragen werden.</string>
 	<string name="error_no_such_bucket">Bucket existiert nicht</string>
+	<string name="error_masterkey_location_not_supported">Benutzerdefinierter Ort der Masterkey-Datei wird noch nicht unterstützt</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<string name="cloud_names_local_storage">Lokaler Speicher</string>
diff --git a/presentation/src/main/res/values-fr/strings.xml b/presentation/src/main/res/values-fr/strings.xml
index 8154cd58..e0fc5841 100644
--- a/presentation/src/main/res/values-fr/strings.xml
+++ b/presentation/src/main/res/values-fr/strings.xml
@@ -22,11 +22,13 @@
 	<string name="error_names_contains_invalid_characters">Les noms de fichiers ne peuvent pas contenir de caractères spéciaux.</string>
 	<string name="error_vault_name_contains_invalid_characters">Le nom du coffre-fort ne peut pas contenir de caractères spéciaux.</string>
 	<string name="error_general_update">La vérification de la mise à jour a échoué. Une erreur générale s\'est produite.</string>
+	<string name="error_hash_mismatch_update">La vérification de la mise à jour a échoué. Le hachage calculé ne correspond pas au fichier téléchargé</string>
 	<string name="error_update_no_internet">La vérification de la mise à jour a échoué. Pas de connexion Internet.</string>
 	<string name="error_failed_to_decrypt_webdav_password">Le mot de passe WebDAV n\'a pas été déchiffré, veuillez l\'ajouter une nouvelle fois dans les paramètres</string>
 	<string name="error_play_services_not_available">Services Google play non installés</string>
 	<string name="error_biometric_auth_aborted">Authentification biométrique avortée</string>
 	<string name="error_file_not_found_after_opening_using_3party">Le fichier local n\'est plus présent après le retour à Cryptomator. Les éventuels modifications ne peuvent être propagées au nuage.</string>
+	<string name="error_no_such_bucket">Aucun compartiment de ce type</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<string name="cloud_names_local_storage">Stockage local</string>
@@ -122,6 +124,17 @@
 	<string name="screen_webdav_settings_msg_username_must_not_be_empty">Le nom d\'utilisateur ne peut pas être vide.</string>
 	<string name="screen_webdav_settings_msg_password_must_not_be_empty">Le mot de passe ne peut pas être vide.</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">Nom Afficher</string>
+	<string name="screen_s3_settings_access_key_label">Clef d’Accès</string>
+	<string name="screen_s3_settings_secret_key_label">Clé secrète</string>
+	<string name="screen_s3_settings_bucket_label">Compartiment Existant</string>
+	<string name="screen_s3_settings_endpoint_label">Point de terminaison</string>
+	<string name="screen_s3_settings_region_label">Région</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">Le nom d\'affichage ne peut être vide</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">La clé d\'accès ne peut être vide</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">La clé d\'accès ne peut être vide</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Le compartiment ne peut être vide</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Le Point de Terminaison et la Région ne peuvent être vides</string>
 	<!-- ## screen: enter vault name -->
 	<string name="screen_enter_vault_name_msg_name_empty">Le nom du coffre-fort ne peut pas être vide.</string>
 	<string name="screen_enter_vault_name_vault_label">Nom du coffre-fort</string>
@@ -132,6 +145,7 @@
 	<string name="screen_set_password_button_text">Terminé</string>
 	<string name="screen_set_password_hint">IMPORTANT: Si vous oubliez votre mot de passe, il n\'y aura aucun moyen de récupérer vos données.</string>
 	<string name="screen_set_password_retype_password_label">Retaper le mot de passe</string>
+	<string name="screen_set_password_strength_indicator_0">Trop faible pour créer un coffre-fort</string>
 	<string name="screen_set_password_strength_indicator_1">Faible</string>
 	<string name="screen_set_password_strength_indicator_2">Acceptable</string>
 	<string name="screen_set_password_strength_indicator_3">Fort</string>
@@ -182,6 +196,7 @@
 	<!-- ## screen: cloud settings -->
 	<string name="screen_cloud_settings_webdav_connections">Connexions WebDAV</string>
 	<string name="screen_cloud_settings_pcloud_connections">Connexions pCloud</string>
+	<string name="screen_cloud_settings_s3_connections">Connexions S3</string>
 	<string name="screen_cloud_settings_local_storage_locations">Emplacements du stockage local</string>
 	<string name="screen_cloud_settings_log_in_to">Se connecter à</string>
 	<string name="screen_cloud_settings_sign_out_from_cloud">Se déconnecter de</string>
diff --git a/presentation/src/main/res/values-hu/strings.xml b/presentation/src/main/res/values-hu/strings.xml
new file mode 100644
index 00000000..bede0f6c
--- /dev/null
+++ b/presentation/src/main/res/values-hu/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- # app -->
+	<!-- # error messages -->
+	<!-- # clouds -->
+	<!-- ## cloud names -->
+	<!-- # permission -->
+	<!-- ## permission messages -->
+	<!-- # screens -->
+	<!-- # screen: vault list -->
+	<!-- # screen: file browser -->
+	<!-- ## screen: text editor -->
+	<!-- ## screen: share files -->
+	<!-- ## screen: choose cloud service -->
+	<!-- ## screen: cloud connections -->
+	<!-- ## screen: webdav settings -->
+	<!-- ## screen: s3 settings -->
+	<!-- ## screen: enter vault name -->
+	<!-- ## screen: set password -->
+	<!-- ## screen: settings -->
+	<!-- ## screen: cloud settings -->
+	<!-- ## screen: licenses -->
+	<!-- ## screen: authenticate cloud -->
+	<!-- ## screen: empty dir file info -->
+	<!-- ## screen: insecure android version info -->
+	<!-- # dialogs -->
+	<!-- Vault not found -->
+	<!-- # error reports -->
+	<!-- # misc -->
+	<!-- ## file size helper -->
+	<!-- ## date helper -->
+	<!-- ## biometric authentication -->
+	<!-- notification -->
+	<!-- lock timeout names -->
+	<!-- cache size names -->
+	<!-- screen scheme mode names -->
+	<!-- update interval names -->
+</resources>
diff --git a/presentation/src/main/res/values-nl/strings.xml b/presentation/src/main/res/values-nl/strings.xml
new file mode 100644
index 00000000..bede0f6c
--- /dev/null
+++ b/presentation/src/main/res/values-nl/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- # app -->
+	<!-- # error messages -->
+	<!-- # clouds -->
+	<!-- ## cloud names -->
+	<!-- # permission -->
+	<!-- ## permission messages -->
+	<!-- # screens -->
+	<!-- # screen: vault list -->
+	<!-- # screen: file browser -->
+	<!-- ## screen: text editor -->
+	<!-- ## screen: share files -->
+	<!-- ## screen: choose cloud service -->
+	<!-- ## screen: cloud connections -->
+	<!-- ## screen: webdav settings -->
+	<!-- ## screen: s3 settings -->
+	<!-- ## screen: enter vault name -->
+	<!-- ## screen: set password -->
+	<!-- ## screen: settings -->
+	<!-- ## screen: cloud settings -->
+	<!-- ## screen: licenses -->
+	<!-- ## screen: authenticate cloud -->
+	<!-- ## screen: empty dir file info -->
+	<!-- ## screen: insecure android version info -->
+	<!-- # dialogs -->
+	<!-- Vault not found -->
+	<!-- # error reports -->
+	<!-- # misc -->
+	<!-- ## file size helper -->
+	<!-- ## date helper -->
+	<!-- ## biometric authentication -->
+	<!-- notification -->
+	<!-- lock timeout names -->
+	<!-- cache size names -->
+	<!-- screen scheme mode names -->
+	<!-- update interval names -->
+</resources>
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index 25a5c224..94fbfbc4 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -28,6 +28,7 @@
 	<string name="error_names_contains_invalid_characters">File names can\'t contain special characters.</string>
 	<string name="error_vault_name_contains_invalid_characters">Vault name can\'t contain special characters.</string>
 	<string name="error_general_update">Update check failed. General error occurred.</string>
+	<string name="error_hash_mismatch_update">Update check failed. Calculated hash doesn\'t match the uploaded file</string>
 	<string name="error_update_no_internet">Update check failed. No internet connection.</string>
 	<string name="error_failed_to_decrypt_webdav_password">Failed to decrypt WebDAV password, please re add in settings</string>
 	<string name="error_play_services_not_available">Play Services not installed</string>