Merge branch 'release/1.7.3'

Author: SailReal

.idea/deploymentTargetDropDown.xml

@@ -29,11 +29,13 @@ git submodule init && git submodule update // (not necessary if cloned using --r
 ./gradlew assembleApkstoreDebug
 ```
 
-Before connecting to OneDrive or Dropbox you have to provide valid API keys using environment variables:   
+Before connecting to Dropbox, OneDrive or pCloud you have to provide valid API keys using environment variables:
 For build type
 
-* **release**: `DROPBOX_API_KEY` or `ONEDRIVE_API_KEY` and  `ONEDRIVE_API_REDIRCT_URI`
-* **debug**: `DROPBOX_API_KEY_DEBUG` or `ONEDRIVE_API_KEY_DEBUG` and `ONEDRIVE_API_REDIRCT_URI_DEBUG`
+* **release**: `DROPBOX_API_KEY`, `ONEDRIVE_API_KEY` and  `ONEDRIVE_API_REDIRCT_URI` or `PCLOUD_CLIENT_ID`
+* **debug**: `DROPBOX_API_KEY_DEBUG`, `ONEDRIVE_API_KEY_DEBUG` and `ONEDRIVE_API_REDIRCT_URI_DEBUG` or `PCLOUD_CLIENT_ID_DEBUG`
+
+Before connecting to Google Drive you have to create a new project in [Google Cloud Platform](https://console.cloud.google.com) with Google Drive API, credentials including Google Drive scopes (read, write, delete,..) and the fingerprint of the key you use to build the app.
 
 ## Contributing to Cryptomator for Android
 

README.md

@@ -2,13 +2,13 @@ apply from: 'buildsystem/dependencies.gradle'
 apply plugin: "com.vanniktech.android.junit.jacoco"
 
 buildscript {
-	ext.kotlin_version = '1.6.10'
+	ext.kotlin_version = '1.6.20'
 	repositories {
 		mavenCentral()
 		google()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.1.2'
+		classpath 'com.android.tools.build:gradle:7.1.3'
 		classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
 		classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -39,7 +39,7 @@ allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
 		androidVersionCode = getVersionCode()
-		androidVersionName = '1.7.2'
+		androidVersionName = '1.7.3'
 	}
 	repositories {
 		mavenCentral()

build.gradle

@@ -53,7 +53,7 @@ ext {
 
 	timberVersion = '5.0.1'
 
-	zxcvbnVersion = '1.5.2'
+	zxcvbnVersion = '1.6.0'
 
 	scaleImageViewVersion = '3.10.0'
 
@@ -65,7 +65,7 @@ ext {
 	// cloud provider libs
 	cryptolibVersion = '2.0.2'
 
-	dropboxVersion = '5.1.1'
+	dropboxVersion = '5.2.0'
 
 	googleApiServicesVersion = 'v3-rev20220110-1.32.1'
 	googlePlayServicesVersion = '19.2.0'
@@ -76,10 +76,10 @@ ext {
 	 */
 	trackingFreeGoogleCLientVersion = '1.41.5'
 
-	msgraphVersion = '5.17.0'
+	msgraphVersion = '5.19.0'
 	msgraphAuthVersion = '3.0.2'
 
-	minIoVersion = '8.3.7'
+	minIoVersion = '8.3.8'
 	staxVersion = '1.2.0' // needed for minIO
 
 	commonsCodecVersion = '1.15'

buildsystem/dependencies.gradle

@@ -56,7 +56,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 
 	@Throws(IOException::class)
 	private fun findFile(parentDriveId: String?, name: String): File? {
-		val fileListQuery = client().files().list().setFields("files(id,mimeType,name,size,shortcutDetails)")
+		val fileListQuery = client().files().list().setFields("files(id,mimeType,name,size,shortcutDetails)").setSupportsAllDrives(true).setIncludeItemsFromAllDrives(true)
 		fileListQuery.q = "name contains '$name' and '$parentDriveId' in parents and trashed = false"
 		return fileListQuery.execute().files.firstOrNull { it.name == name }
 	}
@@ -131,6 +131,8 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 				.setFields("nextPageToken,files(id,mimeType,modifiedTime,name,size,shortcutDetails)") //
 				.setPageSize(1000) //
 				.setPageToken(pageToken)
+				.setSupportsAllDrives(true)
+				.setIncludeItemsFromAllDrives(true)
 			fileListQuery.q = "'" + folder.driveId + "' in parents and trashed = false"
 			val fileList = fileListQuery.execute()
 			for (file in fileList.files) {
@@ -160,6 +162,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 				.files() //
 				.create(metadata) //
 				.setFields("id,name") //
+				.setSupportsAllDrives(true) //
 				.execute()
 			return idCache.cache(GoogleDriveCloudNodeFactory.folder(parentFolder, createdFolder))
 		} ?: throw ParentFolderIsNullException(folder.name)
@@ -181,6 +184,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 					.setFields("id,mimeType,modifiedTime,name,size") //
 					.setAddParents(targetsParent.driveId) //
 					.setRemoveParents(sourcesParent.driveId)  //
+					.setSupportsAllDrives(true) //
 					.execute()
 				idCache.remove(source)
 				return idCache.cache(GoogleDriveCloudNodeFactory.from(targetsParent, movedFile))
@@ -224,6 +228,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 					.files() //
 					.update(file.driveId, metadata, it) //
 					.setFields("id,modifiedTime,name,size") //
+					.setSupportsAllDrives(true) //
 					.execute()
 			}
 		}
@@ -246,6 +251,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 					.files() //
 					.create(metadata, it) //
 					.setFields("id,modifiedTime,name,size") //
+					.setSupportsAllDrives(true) //
 					.execute()
 			}
 		}
@@ -316,6 +322,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 				client() //
 					.files()[file.driveId] //
 					.setAlt("media") //
+					.setSupportsAllDrives(true) //
 					.executeMediaAndDownloadTo(it)
 			}
 		} catch (e: HttpResponseException) {
@@ -373,7 +380,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 
 	@Throws(IOException::class)
 	fun delete(node: GoogleDriveNode) {
-		client().files().delete(node.driveId).execute()
+		client().files().delete(node.driveId).setSupportsAllDrives(true).execute()
 		idCache.remove(node)
 	}
 

data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt

@@ -85,7 +85,7 @@ Create GitHub draft release
 [bundle exec] fastlane android dryRun
 ```
 
-Dry run - check trackin added for all flavors
+Dry run - check tracking added for all flavors
 
 ----
 

fastlane/README.md

@@ -1,3 +1,2 @@
-- Fehlermeldungen, wenn ein Tresor nicht unterstützt wird, verbessert
-- Anzeigefehler, der beim Verschieben von Ordnern mit lokalem Speicher und direktem Zugriff auf diesen auftritt, behoben
-- Fehler, dass beim automatischen Hochladen aufgrund der Batterieoptimierung nicht immer alle Bilder erfasst werden, behoben
+- Das Hinzufügen und Erstellen von Tresoren über eine Verknüpfung zu "Meiner Ablage" aus einem Ordner im Bereich "Geteilte Laufwerke" behoben
+- Absturz der App auf einigen Geräten beim Betrachten von Bildern und Klicken auf den Bildschirm behoben