Merge branch 'release/1.10.2'

SailReal · SailReal · commit 43d82c852f00 · 2024-06-29T20:07:55.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -36,8 +36,8 @@ def getVersionCode = { ->
 allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
-		androidVersionCode = 2897 // must be getVersionCode(). only at release tag set the actual value
-		androidVersionName = '1.10.1'
+		androidVersionCode = 2904 // must be getVersionCode(). only at release tag set the actual value
+		androidVersionName = '1.10.2'
 	}
 	repositories {
 		mavenCentral()
diff --git a/fastlane/.default.env b/fastlane/.default.env
@@ -18,6 +18,12 @@ S3_REGION=
 S3_ACCESS_KEY=
 S3_SECRET_ACCESS_KEY=
 
+S3_LENOTRA_AG_BUCKET=
+S3_LENOTRA_AG_ENDPOINT=
+S3_LENOTRA_AG_REGION=
+S3_LENOTRA_AG_ACCESS_KEY=
+S3_LENOTRA_AG_SECRET_ACCESS_KEY=
+
 SLACK_URL=
 
 GITHUB_PERSONAL_ACCESS_TOKEN=
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -34,6 +34,7 @@ platform :android do |options|
     checkVersionCodeSet(alpha:options[:alpha], beta:options[:beta])
 
     deployToPlaystore(alpha:options[:alpha], beta:options[:beta])
+    deployToLenotraAG(alpha:options[:alpha], beta:options[:beta])
     deployToServer(alpha:options[:alpha], beta:options[:beta])
     deployToFDroid(alpha:options[:alpha], beta:options[:beta])
     deployLite(alpha:options[:alpha], beta:options[:beta])
@@ -126,6 +127,37 @@ platform :android do |options|
     FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "release/Cryptomator-#{version}_playstore_signed.apk")
   end
 
+  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}")
+      puts "APK found"
+    else
+      puts "No APK available at #{apk_path}, please build it first e.g. using the deployToPlaystore lane"
+      fail
+    end
+
+    if options[:alpha] or options[:beta]
+      puts "Skipping deployment to LenotraAG there isn't currently a alpha/beta channel"
+    else
+      puts "Uploading APK"
+
+      aws_s3(
+        bucket: ENV['S3_LENOTRA_AG_BUCKET'],
+        endpoint: ENV['S3_LENOTRA_AG_ENDPOINT'],
+        region: ENV['S3_LENOTRA_AG_REGION'],
+        access_key: ENV['S3_LENOTRA_AG_ACCESS_KEY'],
+        secret_access_key: ENV['S3_LENOTRA_AG_SECRET_ACCESS_KEY'],
+        path: "Cryptomator",
+        files: [
+          apk_path,
+        ],
+        skip_html_upload: true,
+        apk: ''
+      )
+    end
+  end
+
   desc "Deploy new version to server"
   private_lane :deployToServer do |options|
     gradle(task: "clean")
diff --git a/fastlane/README.md b/fastlane/README.md
@@ -55,6 +55,14 @@ Update Metadata
 
 Check if the version code was set
 
+### android deployToLenotraAG
+
+```sh
+[bundle exec] fastlane android deployToLenotraAG
+```
+
+Deploy new version to Lenotra AG
+
 ### android checkTrackingAddedInDependencyUsingIzzyScript
 
 ```sh
diff --git a/fastlane/release-notes-de.txt b/fastlane/release-notes-de.txt
@@ -1,5 +1 @@
-- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
-- Update auf die neueste Android-Version
-- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
-- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
-- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
+- Fehlerbehebung beim Zurückschreiben geänderter Dateien auf bestimmten Geräten
diff --git a/fastlane/release-notes-en.txt b/fastlane/release-notes-en.txt
@@ -1,5 +1 @@
-- Preserve original file modification date during upload (if possible)
-- Update to latest Android version
-- Fix for uploading files larger than 2GB in WebDAV
-- Fix vault unlock on Samsung devices
-- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
+- Fix write back edited file on some devices
diff --git a/fastlane/release-notes.html b/fastlane/release-notes.html
@@ -1,7 +1,3 @@
 <ul>
-  <li>Preserve original file modification date during upload (if possible)</li>
-  <li>Update to latest Android version</li>
-  <li>Fix for uploading files larger than 2GB in WebDAV</li>
-  <li>Fix vault unlock on Samsung devices</li>
-  <li>Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app</li>
+  <li>Fix write back edited file on some devices</li>
 </ul>
diff --git a/presentation/build.gradle b/presentation/build.gradle
@@ -119,17 +119,24 @@ android {
 			java.srcDirs = ['src/main/java/', 'src/lite/java/', 'src/fdroidAndLite/java/']
 		}
 	}
+
 	packagingOptions {
 		resources {
 			excludes += ['META-INF/jersey-module-version', 'META-INF/NOTICE.md', 'META-INF/DEPENDENCIES', 'META-INF/INDEX.LIST']
 		}
 	}
 
+	dependenciesInfo {
+		// Disables dependency metadata when building APKs, see #539
+		includeInApk = false
+	}
+
 	lint {
 		abortOnError false
 		ignoreWarnings true
 		quiet true
 	}
+
 	namespace 'org.cryptomator.presentation'
 }
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/ContentResolverUtil.kt b/presentation/src/main/java/org/cryptomator/presentation/util/ContentResolverUtil.kt
@@ -32,7 +32,7 @@ class ContentResolverUtil @Inject constructor(context: Context) {
 		contentResolver.query(uri, null, null, null, null).use { cursor ->
 			if (cursor != null && cursor.moveToFirst()) {
 				val dateModifiedColumnIndex = cursor.getColumnIndex(DocumentsContract.Document.COLUMN_LAST_MODIFIED)
-				if (!cursor.isNull(dateModifiedColumnIndex)) {
+				if (dateModifiedColumnIndex != -1) {
 					val date = cursor.getLong(dateModifiedColumnIndex)
 					return Date(date);
 				}
diff --git a/src/fdroid/fastlane/metadata/android/de-DE/changelogs/default.txt b/src/fdroid/fastlane/metadata/android/de-DE/changelogs/default.txt
@@ -1,5 +1 @@
-- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
-- Update auf die neueste Android-Version
-- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
-- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
-- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
+- Fehlerbehebung beim Zurückschreiben geänderter Dateien auf bestimmten Geräten
diff --git a/src/fdroid/fastlane/metadata/android/en-US/changelogs/default.txt b/src/fdroid/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1,5 +1 @@
-- Preserve original file modification date during upload (if possible)
-- Update to latest Android version
-- Fix for uploading files larger than 2GB in WebDAV
-- Fix vault unlock on Samsung devices
-- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
+- Fix write back edited file on some devices
diff --git a/src/fdroid/fastlane/metadata/android/fr-FR/changelogs/default.txt b/src/fdroid/fastlane/metadata/android/fr-FR/changelogs/default.txt
@@ -1,5 +1 @@
-- Preserve original file modification date during upload (if possible)
-- Update to latest Android version
-- Fix for uploading files larger than 2GB in WebDAV
-- Fix vault unlock on Samsung devices
-- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
+- Fix write back edited file on some devices
diff --git a/src/lite/fastlane/metadata/android/de-DE/changelogs/default.txt b/src/lite/fastlane/metadata/android/de-DE/changelogs/default.txt
@@ -1,5 +1 @@
-- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
-- Update auf die neueste Android-Version
-- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
-- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
-- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
+- Fehlerbehebung beim Zurückschreiben geänderter Dateien auf bestimmten Geräten
diff --git a/src/lite/fastlane/metadata/android/en-US/changelogs/default.txt b/src/lite/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1,5 +1 @@
-- Preserve original file modification date during upload (if possible)
-- Update to latest Android version
-- Fix for uploading files larger than 2GB in WebDAV
-- Fix vault unlock on Samsung devices
-- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
+- Fix write back edited file on some devices
diff --git a/src/lite/fastlane/metadata/android/fr-FR/changelogs/default.txt b/src/lite/fastlane/metadata/android/fr-FR/changelogs/default.txt
@@ -1,5 +1 @@
-- Preserve original file modification date during upload (if possible)
-- Update to latest Android version
-- Fix for uploading files larger than 2GB in WebDAV
-- Fix vault unlock on Samsung devices
-- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
+- Fix write back edited file on some devices
diff --git a/src/playstore/fastlane/metadata/android/de-DE/changelogs/default.txt b/src/playstore/fastlane/metadata/android/de-DE/changelogs/default.txt
@@ -1,5 +1 @@
-- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
-- Update auf die neueste Android-Version
-- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
-- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
-- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
+- Fehlerbehebung beim Zurückschreiben geänderter Dateien auf bestimmten Geräten
diff --git a/src/playstore/fastlane/metadata/android/en-US/changelogs/default.txt b/src/playstore/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1,5 +1 @@
-- Preserve original file modification date during upload (if possible)
-- Update to latest Android version
-- Fix for uploading files larger than 2GB in WebDAV
-- Fix vault unlock on Samsung devices
-- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
+- Fix write back edited file on some devices
diff --git a/src/playstore/fastlane/metadata/android/fr-FR/changelogs/default.txt b/src/playstore/fastlane/metadata/android/fr-FR/changelogs/default.txt
@@ -1,5 +1 @@
-- Preserve original file modification date during upload (if possible)
-- Update to latest Android version
-- Fix for uploading files larger than 2GB in WebDAV
-- Fix vault unlock on Samsung devices
-- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
+- Fix write back edited file on some devices

Original file line number	Diff line number	Diff line change
`@@ -119,17 +119,24 @@ android {`
`119`	`119`	`java.srcDirs = ['src/main/java/', 'src/lite/java/', 'src/fdroidAndLite/java/']`
`120`	`120`	`}`
`121`	`121`	`}`
	`122`	`+`
`122`	`123`	`packagingOptions {`
`123`	`124`	`resources {`
`124`	`125`	`excludes += ['META-INF/jersey-module-version', 'META-INF/NOTICE.md', 'META-INF/DEPENDENCIES', 'META-INF/INDEX.LIST']`
`125`	`126`	`}`
`126`	`127`	`}`
`127`	`128`
	`129`	`+ dependenciesInfo {`
	`130`	`+ // Disables dependency metadata when building APKs, see #539`
	`131`	`+ includeInApk = false`
	`132`	`+ }`
	`133`	`+`
`128`	`134`	`lint {`
`129`	`135`	`abortOnError false`
`130`	`136`	`ignoreWarnings true`
`131`	`137`	`quiet true`
`132`	`138`	`}`
	`139`	`+`
`133`	`140`	`namespace 'org.cryptomator.presentation'`
`134`	`141`	`}`
`135`	`142`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class ContentResolverUtil @Inject constructor(context: Context) {`
`32`	`32`	`contentResolver.query(uri, null, null, null, null).use { cursor ->`
`33`	`33`	`if (cursor != null && cursor.moveToFirst()) {`
`34`	`34`	`val dateModifiedColumnIndex = cursor.getColumnIndex(DocumentsContract.Document.COLUMN_LAST_MODIFIED)`
`35`		`- if (!cursor.isNull(dateModifiedColumnIndex)) {`
	`35`	`+ if (dateModifiedColumnIndex != -1) {`
`36`	`36`	`val date = cursor.getLong(dateModifiedColumnIndex)`
`37`	`37`	`return Date(date);`
`38`	`38`	`}`