Merge branch 'develop' into release/1.6.0

.gitignore

@@ -49,6 +49,6 @@ local.properties
 # fdroid
 **/fastlane/repo/**
 **/fastlane/tmp/**
-**/fastlane/iod-scan-apk.php
-**/fastlane/current_iod-scan-apk.php
-**/fastlane/current_result.json
+**/fastlane/izzyscript/iod-scan-apk.php
+**/fastlane/izzyscript/current_iod-scan-apk.php
+**/fastlane/izzyscript/current_result_*.json

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "msa-auth-for-android"]
-	path = msa-auth-for-android
+	path = lib/msa-auth-for-android
 	url = https://github.com/SailReal/msa-auth-for-android.git
 [submodule "subsampling-scale-image-view"]
-	path = subsampling-scale-image-view
+	path = lib/subsampling-scale-image-view
 	url = https://github.com/SailReal/subsampling-scale-image-view.git
 [submodule "pcloud-sdk-java"]
-	path = pcloud-sdk-java
-	url = https://github.com/SailReal/pcloud-sdk-java
+	path = lib/pcloud-sdk-java
+	url = https://github.com/SailReal/pcloud-sdk-java.git

Gemfile.lock

@@ -1,24 +1,25 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
+    CFPropertyList (3.0.4)
+      rexml
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     apktools (0.7.4)
       rubyzip (~> 2.0)
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.501.0)
-    aws-sdk-core (3.121.0)
+    aws-partitions (1.509.0)
+    aws-sdk-core (3.121.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-kms (1.48.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.102.0)
+    aws-sdk-s3 (1.103.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -38,9 +39,9 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     ed25519 (1.2.4)
-    emoji_regex (3.2.2)
-    excon (0.85.0)
-    faraday (1.7.2)
+    emoji_regex (3.2.3)
+    excon (0.86.0)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -65,7 +66,7 @@ GEM
     faraday_middleware (1.1.0)
       faraday (~> 1.0)
     fastimage (2.2.5)
-    fastlane (2.193.1)
+    fastlane (2.195.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -125,14 +126,14 @@ GEM
       google-apis-core (>= 0.4, < 2.a)
     google-apis-playcustomapp_v1 (0.5.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.6.0)
+    google-apis-storage_v1 (0.8.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.1.0)
+    google-cloud-errors (1.2.0)
     google-cloud-storage (1.34.1)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
@@ -141,13 +142,13 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (0.17.1)
+    googleauth (1.0.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.15)
+      signet (>= 0.16, < 2.a)
     highline (2.0.3)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
@@ -203,7 +204,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8)
-    unicode-display_width (1.7.0)
+    unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
     xcodeproj (1.21.0)

build.gradle

@@ -2,7 +2,7 @@ apply from: 'buildsystem/dependencies.gradle'
 apply plugin: "com.vanniktech.android.junit.jacoco"
 
 buildscript {
-	ext.kotlin_version = '1.5.30'
+	ext.kotlin_version = '1.5.31'
 	repositories {
 		mavenCentral()
 		google()
@@ -39,7 +39,7 @@ allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
 		androidVersionCode = getVersionCode()
-		androidVersionName = '1.6.0-beta4'
+		androidVersionName = '1.6.0-SNAPSHOT'
 	}
 	repositories {
 		mavenCentral()

buildsystem/dependencies.gradle

@@ -18,7 +18,7 @@ ext {
 
 	// support lib
 	androidSupportAnnotationsVersion = '1.2.0'
-	androidSupportAppcompatVersion = '1.3.0'
+	androidSupportAppcompatVersion = '1.3.1'
 	androidSupportDesignVersion = '1.4.0'
 
 	coreDesugaringVersion = '1.1.5'
@@ -29,11 +29,11 @@ ext {
 	rxAndroidVersion = '2.1.1'
 	rxBindingVersion = '2.2.0'
 
-	daggerVersion = '2.38.1'
+	daggerVersion = '2.39'
 
 	gsonVersion = '2.8.8'
 
-	okHttpVersion = '4.9.1'
+	okHttpVersion = '4.9.2'
 	okHttpDigestVersion = '2.5'
 
 	velocityVersion = '2.3'
@@ -54,9 +54,14 @@ ext {
 
 	dropboxVersion = '4.0.1'
 
-	googleApiServicesVersion = 'v3-rev20210725-1.32.1'
-	googlePlayServicesVersion = '19.0.0'
-	googleClientVersion = '1.32.1'
+	googleApiServicesVersion = 'v3-rev20210919-1.32.1'
+	googlePlayServicesVersion = '19.2.0'
+	googleClientVersion = '1.32.1' // keep in sync with https://github.com/SailReal/google-http-java-client
+	/*
+		update using https://github.com/SailReal/google-http-java-client with `mvn clean install`,
+		copying `google-http-client-*.jar` and `google-http-client-android-*.jar` into the lib folder of this project
+	 */
+	trackingFreeGoogleCLientVersion = '1.40.1'
 
 	msgraphVersion = '2.10.0'
 
@@ -69,8 +74,7 @@ ext {
 
 	// testing dependencies
 
-	jUnitVersion = '5.7.1'
-	jUnit4Version = '4.13.1'
+	jUnitVersion = '5.8.1'
 	assertJVersion = '1.7.1'
 	mockitoVersion = '3.12.4'
 	mockitoKotlinVersion = '3.2.0'
@@ -84,7 +88,7 @@ ext {
 	uiautomatorVersion = '2.2.0'
 
 	androidxCoreVersion = '1.6.0'
-	androidxFragmentVersion = '1.3.5'
+	androidxFragmentVersion = '1.3.6'
 	androidxViewpagerVersion = '1.0.0'
 	androidxSwiperefreshVersion = '1.1.0'
 	androidxPreferenceVersion = '1.1.1'
@@ -119,6 +123,8 @@ ext {
 			googleApiClientAndroid: "com.google.api-client:google-api-client-android:${googleClientVersion}",
 			googleApiServicesDrive: "com.google.apis:google-api-services-drive:${googleApiServicesVersion}",
 			googlePlayServicesAuth: "com.google.android.gms:play-services-auth:${googlePlayServicesVersion}",
+			trackingFreeGoogleCLient       : files("lib/google-http-client-${trackingFreeGoogleCLientVersion}.jar"),
+			trackingFreeGoogleAndroidCLient: files("lib/google-http-client-android-${trackingFreeGoogleCLientVersion}.jar"),
 			greenDao              : "org.greenrobot:greendao:${greenDaoVersion}",
 			gson                  : "com.google.code.gson:gson:${gsonVersion}",
 			hamcrest              : "org.hamcrest:hamcrest-all:${hamcrestVersion}",
@@ -127,7 +133,6 @@ ext {
 			junitApi              : "org.junit.jupiter:junit-jupiter-api:${jUnitVersion}",
 			junitEngine           : "org.junit.jupiter:junit-jupiter-engine:${jUnitVersion}",
 			junitParams           : "org.junit.jupiter:junit-jupiter-params:${jUnitVersion}",
-			junit4                : "org.junit.jupiter:junit-jupiter:${jUnit4Version}",
 			junit4Engine          : "org.junit.vintage:junit-vintage-engine:${jUnitVersion}",
 			minIo                 : "io.minio:minio:${minIoVersion}",
 			mockito               : "org.mockito:mockito-core:${mockitoVersion}",

data/build.gradle

@@ -120,27 +120,54 @@ dependencies {
 	implementation dependencies.stax
 	api dependencies.minIo
 
-	playstoreImplementation dependencies.googlePlayServicesAuth
-	apkstoreImplementation dependencies.googlePlayServicesAuth
+	playstoreImplementation(dependencies.googlePlayServicesAuth) {
+		exclude module: 'guava-jdk5'
+		exclude module: 'httpclient'
+		exclude module: 'googlehttpclient'
+		exclude group: "com.google.http-client", module: "google-http-client"
+	}
+	apkstoreImplementation(dependencies.googlePlayServicesAuth) {
+		exclude module: 'guava-jdk5'
+		exclude module: 'httpclient'
+		exclude module: "google-http-client"
+		exclude group: "com.google.http-client", module: "google-http-client"
+	}
 
 	playstoreImplementation(dependencies.googleApiServicesDrive) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude module: 'googlehttpclient'
+		exclude group: "com.google.http-client", module: "google-http-client"
 	}
 	apkstoreImplementation(dependencies.googleApiServicesDrive) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude module: "google-http-client"
+		exclude group: "com.google.http-client", module: "google-http-client"
 	}
 
 	playstoreImplementation(dependencies.googleApiClientAndroid) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude module: "google-http-client"
+		exclude module: "jetified-google-http-client"
+		exclude group: "com.google.http-client", module: "google-http-client"
+		exclude group: "com.google.http-client", module: "jetified-google-http-client"
 	}
 	apkstoreImplementation(dependencies.googleApiClientAndroid) {
 		exclude module: 'guava-jdk5'
 		exclude module: 'httpclient'
+		exclude module: "google-http-client"
+		exclude module: "jetified-google-http-client"
+		exclude group: "com.google.http-client", module: "google-http-client"
+		exclude group: "com.google.http-client", module: "jetified-google-http-client"
 	}
 
+	playstoreImplementation dependencies.trackingFreeGoogleCLient
+	apkstoreImplementation dependencies.trackingFreeGoogleCLient
+	playstoreImplementation dependencies.trackingFreeGoogleAndroidCLient
+	apkstoreImplementation dependencies.trackingFreeGoogleAndroidCLient
+
 	// rest
 	implementation dependencies.rxJava
 	implementation dependencies.rxAndroid
@@ -163,8 +190,6 @@ dependencies {
 	testImplementation dependencies.junitApi
 	testRuntimeOnly dependencies.junitEngine
 	testImplementation dependencies.junitParams
-
-	testImplementation dependencies.junit4
 	testRuntimeOnly dependencies.junit4Engine
 
 	testImplementation dependencies.mockito

data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormat7.kt

@@ -285,7 +285,7 @@ open class CryptoImplVaultFormat7 : CryptoImplDecorator {
 			ByteArrayOutputStream().use { out ->
 				cloudContentRepository.read(file, null, out, ProgressAware.NO_OP_PROGRESS_AWARE_DOWNLOAD)
 				if (dirfileIsEmpty(out)) {
-					throw EmptyDirFileException(file.name, file.path)
+					throw EmptyDirFileException(file.parent.name, file.path)
 				}
 				return out.toByteArray()
 			}

domain/build.gradle

@@ -65,7 +65,6 @@ dependencies {
 	testRuntimeOnly dependencies.junitEngine
 	testImplementation dependencies.junitParams
 
-	testImplementation dependencies.junit4
 	testRuntimeOnly dependencies.junit4Engine
 
 	testImplementation dependencies.mockito