From 8f69701b828df23e933477e88a67ae25650152c0 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Fri, 4 Mar 2022 15:50:06 +0100 Subject: [PATCH 1/3] Fix not found dialog during unlock if it contains a blank using OneDrive "Vault not found" dialog is displayed during unlocking if it contains a blank character due to encoding twice. MicrosoftGraph now encodes the provided path to `itemWithPath` itself. Fixes #419 --- .../java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.kt b/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.kt index b77eab342..0be2c2af8 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.kt +++ b/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.kt @@ -1,7 +1,6 @@ package org.cryptomator.data.cloud.onedrive import android.content.Context -import android.net.Uri import com.microsoft.graph.http.GraphServiceException import com.microsoft.graph.models.DriveItem import com.microsoft.graph.models.DriveItemCreateUploadSessionParameterSet @@ -86,7 +85,7 @@ internal class OnedriveImpl(cloud: OnedriveCloud, context: Context, graphService private fun childByName(parentId: String, parentDriveId: String, name: String): DriveItem? { return try { - drive(parentDriveId).items(parentId).itemWithPath(Uri.encode(name)).buildRequest().get() + drive(parentDriveId).items(parentId).itemWithPath(name).buildRequest().get() } catch (e: GraphServiceException) { if (isNotFoundError(e)) { null From 2bdc6afdb5922a67f7f0f3bdb6e9fe4d73d3f7e1 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Fri, 4 Mar 2022 15:54:07 +0100 Subject: [PATCH 2/3] Bump to version 1.7.1 [ci skip] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 49cbd7174..28fa29163 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ allprojects { ext { androidApplicationId = 'org.cryptomator' androidVersionCode = getVersionCode() - androidVersionName = '1.7.0' + androidVersionName = '1.7.1' } repositories { mavenCentral() From 69a4c009899de5d7f6ee21446d49e53253d386fd Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Fri, 4 Mar 2022 16:07:59 +0100 Subject: [PATCH 3/3] Update release notes [ci skip] --- fastlane/metadata/android/de-DE/changelogs/default.txt | 7 +------ fastlane/metadata/android/en-US/changelogs/default.txt | 7 +------ fastlane/release-notes.html | 7 +------ 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/fastlane/metadata/android/de-DE/changelogs/default.txt b/fastlane/metadata/android/de-DE/changelogs/default.txt index 7e9ce8c07..4d9f3432d 100644 --- a/fastlane/metadata/android/de-DE/changelogs/default.txt +++ b/fastlane/metadata/android/de-DE/changelogs/default.txt @@ -1,6 +1 @@ -- Unterstützung für mehrere OneDrive-Konten hinzugefügt -- Zugriff auf Tresore, die sich in "Shared with Me", "My Computer" und "My Drive" von Google Drive befinden, wurde mit Hilfe von Shortcuts hinzugefügt -- Viele Übersetzungen hinzugefügt -- Verbesserte Suchfunktion, nun wird eine "enthält"-Suche anstelle von "beginnt mit" verwendet -- Absturz auf einigen Geräten während des Entsperrens aufgrund einer Keystore-Ausnahme behoben -- Problem beim Löschen einer Cloud behoben \ No newline at end of file +- Problem behoben, bei dem ein "Tresor nicht gefunden"-Dialog beim Entsperren mit OneDrive angezeigt wird, wenn er ein Leerzeichen im Namen enthält \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt index 5a29c08bb..bc4d458a8 100644 --- a/fastlane/metadata/android/en-US/changelogs/default.txt +++ b/fastlane/metadata/android/en-US/changelogs/default.txt @@ -1,6 +1 @@ -- Added support for multiple OneDrive accounts -- Added access to vaults located in "Shared with Me", "My Computer" and "My Drive" of Google Drive using shortcuts -- Added a lot of translations -- Improved search functionality, now a "contains" search is used instead of "starts with" -- Fixed crash on some devices during unlock due to keystore exception -- Fixed problem during deletion of a cloud \ No newline at end of file +- Fixed a problem where a "Vault not found" dialog is shown during unlock with OneDrive cloud if the vault contains a blank character \ No newline at end of file diff --git a/fastlane/release-notes.html b/fastlane/release-notes.html index 2a6b198a1..3008487d3 100644 --- a/fastlane/release-notes.html +++ b/fastlane/release-notes.html @@ -1,8 +1,3 @@
    -
  • Added support for multiple OneDrive accounts
    • -
  • Added access to vaults located in "Shared with Me", "My Computer" and "My Drive" of Google Drive using shortcuts
    • -
  • Added a lot of translations
    • -
  • Improved search functionality, now a "contains" search is used instead of "starts with"
    • -
  • Fixed crash on some devices during unlock due to keystore exception
    • -
  • Fixed problem during deletion of a cloud
    • +
  • Fixed a problem where a "Vault not found" dialog is shown during unlock with OneDrive cloud if the vault contains a blank character
\ No newline at end of file