Merge branch 'main' into develop

buildsystem/Dockerfile

@@ -42,5 +42,7 @@ RUN rm -rf ${ANDROID_HOME}/tools
 # Create a non-root user and group
 RUN groupadd -r appuser && useradd --no-log-init -r -g appuser appuser
 
+# RUN mkdir -p /home/appuser/.gradle && chown -R appuser:appuser /home/appuser/.gradle
+
 # Switch to the non-root user
 USER appuser

fastlane/Fastfile

@@ -130,7 +130,7 @@ platform :android do |options|
   desc "Deploy new version to Lenotra AG"
   private_lane :deployToLenotraAG do |options|
     apk_path = "fastlane/release/Cryptomator-#{version}_playstore_signed.apk"
-    if File.exists?("../#{apk_path}")
+    if File.exist?("../#{apk_path}")
       puts "APK found"
     else
       puts "No APK available at #{apk_path}, please build it first e.g. using the deployToPlaystore lane"
@@ -295,11 +295,11 @@ platform :android do |options|
   desc "Deploy new lite version"
   private_lane :deployLite do |options|
     sh("docker build -t cryptomator-android ../buildsystem")
-    sh("docker run --rm -v $(cd .. && pwd):/project -w /project cryptomator-android ./gradlew clean assembleLiteRelease")
+    sh("docker run -u $(id -u):$(id -g) --rm -v $(cd .. && pwd):/project -w /project cryptomator-android ./gradlew clean assembleLiteRelease")
 
     sh("zipalign -v -p 4 ../presentation/build/outputs/apk/lite/release/presentation-lite-release-unsigned.apk presentation-lite-release-unsigned-aligned.apk")
     sh("apksigner sign --ks #{ENV["SIGNING_KEYSTORE_PATH"]} --ks-key-alias #{ENV["SIGNING_KEY_ALIAS"]} --ks-pass env:SIGNING_KEYSTORE_PASSWORD --key-pass env:SIGNING_KEY_PASSWORD --out release/Cryptomator-#{version}_lite_signed.apk presentation-lite-release-unsigned-aligned.apk")
-	  sh("rm presentation-lite-release-unsigned-aligned.apk")
+    sh("rm presentation-lite-release-unsigned-aligned.apk")
 
     lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH] = File.join(Dir.pwd, 'release', "Cryptomator-#{version}_lite_signed.apk")
 

fastlane/release-notes-de.txt

@@ -1 +1 @@
-- Fehlerbehebung beim Zurückschreiben geänderter Dateien auf bestimmten Geräten
+- Migration von Cloud-Zugangs-Tokens und Tresor-Passwörtern zu AES 256bit GCM

fastlane/release-notes-en.txt

@@ -1 +1 @@
-- Fix write back edited file on some devices
+- Migrate cloud access tokens and vault passwords to AES 256bit GCM

fastlane/release-notes.html

@@ -1,3 +1,3 @@
 <ul>
-  <li>Fix write back edited file on some devices</li>
+  <li>Migrate cloud access tokens and vault passwords to AES 256bit GCM</li>
 </ul>

src/fdroid/fastlane/metadata/android/de-DE/changelogs/default.txt

@@ -1 +1 @@
-- Fehlerbehebung beim Zurückschreiben geänderter Dateien auf bestimmten Geräten
+- Migration von Cloud-Zugangs-Tokens und Tresor-Passwörtern zu AES 256bit GCM

src/fdroid/fastlane/metadata/android/en-US/changelogs/default.txt

@@ -1 +1 @@
-- Fix write back edited file on some devices
+- Migrate cloud access tokens and vault passwords to AES 256bit GCM

src/fdroid/fastlane/metadata/android/fr-FR/changelogs/default.txt

@@ -1 +1 @@
-- Fix write back edited file on some devices
+- Migrate cloud access tokens and vault passwords to AES 256bit GCM

src/lite/fastlane/metadata/android/de-DE/changelogs/default.txt

@@ -1 +1 @@
-- Fehlerbehebung beim Zurückschreiben geänderter Dateien auf bestimmten Geräten
+- Migration von Cloud-Zugangs-Tokens und Tresor-Passwörtern zu AES 256bit GCM

src/lite/fastlane/metadata/android/en-US/changelogs/default.txt

@@ -1 +1 @@
-- Fix write back edited file on some devices
+- Migrate cloud access tokens and vault passwords to AES 256bit GCM

src/lite/fastlane/metadata/android/fr-FR/changelogs/default.txt

@@ -1 +1 @@
-- Fix write back edited file on some devices
+- Migrate cloud access tokens and vault passwords to AES 256bit GCM

src/playstore/fastlane/metadata/android/de-DE/changelogs/default.txt

@@ -1 +1 @@
-- Fehlerbehebung beim Zurückschreiben geänderter Dateien auf bestimmten Geräten
+- Migration von Cloud-Zugangs-Tokens und Tresor-Passwörtern zu AES 256bit GCM

src/playstore/fastlane/metadata/android/en-US/changelogs/default.txt

@@ -1 +1 @@
-- Fix write back edited file on some devices
+- Migrate cloud access tokens and vault passwords to AES 256bit GCM

src/playstore/fastlane/metadata/android/fr-FR/changelogs/default.txt

@@ -1 +1 @@
-- Fix write back edited file on some devices
+- Migrate cloud access tokens and vault passwords to AES 256bit GCM