Merge branch 'release/1.6.7'

cryptomator · Dec 2, 2021 · a516cd8 · a516cd8
2 parents 024cd4f + 582ced6
commit a516cd8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -39,7 +39,7 @@ allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
 		androidVersionCode = getVersionCode()
-		androidVersionName = '1.6.6'
+		androidVersionName = '1.6.7'
 	}
 	repositories {
 		mavenCentral()

diff --git a/fastlane/metadata/android/de-DE/changelogs/default.txt b/fastlane/metadata/android/de-DE/changelogs/default.txt
@@ -1 +1 @@
-- App-Absturz behoben, wenn der für den automatischen Upload angegebene Tresor nicht mehr existiert und der Upload beginnt
+- Automatischer Upload bei Geräten mit Android Version 10 behoben
diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1 +1 @@
-- Fixed app crash when vault specified for auto upload doesn't exist anymore and upload starts
+- Fixed auto upload via devices running Android version 10
diff --git a/fastlane/release-notes.html b/fastlane/release-notes.html
@@ -1,3 +1,3 @@
 <ul>
-  <li>Fixed app crash when vault specified for auto upload doesn't exist anymore and upload starts</li>
+  <li>Fixed auto upload via devices running Android version 10</li>
 </ul>
diff --git a/presentation/src/apkstore/AndroidManifest.xml b/presentation/src/apkstore/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="org.cryptomator.presentation">
+
+	<!-- Required to self update Cryptomator in the apkstore variant -->
+	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+</manifest>
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
@@ -10,7 +10,6 @@
 	<uses-permission android:name="android.permission.USE_BIOMETRIC" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
 	<uses-permission
 		android:name="android.permission.GET_ACCOUNTS"
@@ -27,6 +26,7 @@
 		android:allowBackup="false"
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
+		android:requestLegacyExternalStorage="true"
 		android:supportsRtl="true"
 		android:theme="@style/AppTheme"
 		android:usesCleartextTraffic="true">
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		- App-Absturz behoben, wenn der für den automatischen Upload angegebene Tresor nicht mehr existiert und der Upload beginnt
		- Automatischer Upload bei Geräten mit Android Version 10 behoben
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		- Fixed app crash when vault specified for auto upload doesn't exist anymore and upload starts
		- Fixed auto upload via devices running Android version 10