Merge branch 'release/1.12.2'

SailReal · SailReal · commit 5a3aa1c1340d · 2025-10-06T15:56:22.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -37,8 +37,8 @@ def getVersionCode = { ->
 allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
-		androidVersionCode = 3016 // must be getVersionCode(). only at release tag set the actual value
-		androidVersionName = '1.12.1'
+		androidVersionCode = 3020 // must be getVersionCode(). only at release tag set the actual value
+		androidVersionName = '1.12.2'
 	}
 	repositories {
 		mavenCentral()
diff --git a/fastlane/release-notes-de.txt b/fastlane/release-notes-de.txt
@@ -1 +1 @@
-- App-Abstürze auf bestimmten Geräten beim Öffnen oder Bearbeiten von Dateien behoben
+- App-Absturz auf kleinen Bildschirmen bei der Anzeige eines leeren Tresor-Hinweises behoben
diff --git a/fastlane/release-notes-en.txt b/fastlane/release-notes-en.txt
@@ -1 +1 @@
-- Fixed app crashes on certain devices that occurred when opening or editing files
+- Fixed app crash on small screens when showing empty vault hint
diff --git a/fastlane/release-notes.html b/fastlane/release-notes.html
@@ -1,3 +1,3 @@
 <ul>
-  <li>Fixed app crashes on certain devices that occurred when opening or editing files</li>
+  <li>Fixed app crash on small screens when showing empty vault hint</li>
 </ul>
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/layout/ArcAwareCoordinatorLayout.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/layout/ArcAwareCoordinatorLayout.kt
@@ -35,7 +35,11 @@ class ArcAwareCoordinatorLayout : CoordinatorLayout {
 	override fun dispatchDraw(canvas: Canvas) {
 		super.dispatchDraw(canvas)
 		if (findViewById<View>(R.id.rl_creation_hint).visibility == VISIBLE) {
-			drawArcFromHintToFloatingActionButton(canvas)
+			try {
+				drawArcFromHintToFloatingActionButton(canvas)
+			} catch (e: IllegalArgumentException) {
+				Timber.tag("ArcAwareCoordinatorLayout").e(e, "Failed to draw Arc.")
+			}
 		}
 	}
 
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 +1 @@
-- App-Abstürze auf bestimmten Geräten beim Öffnen oder Bearbeiten von Dateien behoben
+- App-Absturz auf kleinen Bildschirmen bei der Anzeige eines leeren Tresor-Hinweises behoben
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 +1 @@
-- Fixed app crashes on certain devices that occurred when opening or editing files
+- Fixed app crash on small screens when showing empty vault hint
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 +1 @@
-- Fixed app crashes on certain devices that occurred when opening or editing files
+- Fixed app crash on small screens when showing empty vault hint
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 +1 @@
-- App-Abstürze auf bestimmten Geräten beim Öffnen oder Bearbeiten von Dateien behoben
+- App-Absturz auf kleinen Bildschirmen bei der Anzeige eines leeren Tresor-Hinweises behoben
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 +1 @@
-- Fixed app crashes on certain devices that occurred when opening or editing files
+- Fixed app crash on small screens when showing empty vault hint
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 +1 @@
-- Fixed app crashes on certain devices that occurred when opening or editing files
+- Fixed app crash on small screens when showing empty vault hint
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 +1 @@
-- App-Abstürze auf bestimmten Geräten beim Öffnen oder Bearbeiten von Dateien behoben
+- App-Absturz auf kleinen Bildschirmen bei der Anzeige eines leeren Tresor-Hinweises behoben
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 +1 @@
-- Fixed app crashes on certain devices that occurred when opening or editing files
+- Fixed app crash on small screens when showing empty vault hint
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 +1 @@
-- Fixed app crashes on certain devices that occurred when opening or editing files
+- Fixed app crash on small screens when showing empty vault hint

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-- App-Abstürze auf bestimmten Geräten beim Öffnen oder Bearbeiten von Dateien behoben`
	`1`	`+- App-Absturz auf kleinen Bildschirmen bei der Anzeige eines leeren Tresor-Hinweises behoben`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-- Fixed app crashes on certain devices that occurred when opening or editing files`
	`1`	`+- Fixed app crash on small screens when showing empty vault hint`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 <ul>
 -  <li>Fixed app crashes on certain devices that occurred when opening or editing files</li>
 +  <li>Fixed app crash on small screens when showing empty vault hint</li>
 </ul>
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,11 @@ class ArcAwareCoordinatorLayout : CoordinatorLayout {`
`35`	`35`	`override fun dispatchDraw(canvas: Canvas) {`
`36`	`36`	`super.dispatchDraw(canvas)`
`37`	`37`	`if (findViewById<View>(R.id.rl_creation_hint).visibility == VISIBLE) {`
`38`		`- drawArcFromHintToFloatingActionButton(canvas)`
	`38`	`+ try {`
	`39`	`+ drawArcFromHintToFloatingActionButton(canvas)`
	`40`	`+ } catch (e: IllegalArgumentException) {`
	`41`	`+ Timber.tag("ArcAwareCoordinatorLayout").e(e, "Failed to draw Arc.")`
	`42`	`+ }`
`39`	`43`	`}`
`40`	`44`	`}`
`41`	`45`