Merge branch 'release/2.4.8'

cryptomator · Feb 20, 2023 · 03523e1 · 03523e1
2 parents 558cf43 + 1a4f0f4
commit 03523e1
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 54 deletions.
diff --git a/Cryptomator.xcodeproj/project.pbxproj b/Cryptomator.xcodeproj/project.pbxproj
@@ -2306,8 +2306,8 @@
 			);
 			mainGroup = 4A5E5B202453119100BD6298;
 			packageReferences = (
-				4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt" */,
-				4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
+				4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt.git" */,
+				4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect.git" */,
 			);
 			productRefGroup = 4A5E5B2A2453119100BD6298 /* Products */;
 			projectDirPath = "";
@@ -2976,6 +2976,7 @@
 		};
 		4A9172722619F16C003C4043 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
+			productRef = 4A9172712619F16C003C4043;
 		};
 		4A9BED69268F379300721BAA /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
@@ -3259,7 +3260,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.4.7;
+				MARKETING_VERSION = 2.4.8;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3321,7 +3322,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.4.7;
+				MARKETING_VERSION = 2.4.8;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";
@@ -3349,7 +3350,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cryptomator.ios.fileprovider-ui";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "37305fac-36be-4fe5-97bd-941e51187d50";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development org.cryptomator.ios.fileprovider-ui";
 				SKIP_INSTALL = YES;
 			};
@@ -3370,7 +3370,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cryptomator.ios.fileprovider-ui";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "de89cc0f-597d-413e-84e3-2108c3bb4841";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore org.cryptomator.ios.fileprovider-ui";
 				SKIP_INSTALL = YES;
 			};
@@ -3392,7 +3391,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios.fileprovider;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "b02d124e-86ef-431a-bf4c-f1203aa86ff5";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development org.cryptomator.ios.fileprovider";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "FileProviderExtension/FileProviderExtension-Bridging-Header.h";
@@ -3416,7 +3414,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios.fileprovider;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "a9384f4d-7dbd-4b66-b79b-be9c7cf0bebc";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore org.cryptomator.ios.fileprovider";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "FileProviderExtension/FileProviderExtension-Bridging-Header.h";
@@ -3440,7 +3437,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios.intents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "526da0c4-3ad8-4563-beca-e13c19f3724d";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development org.cryptomator.ios.intents";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -3464,7 +3460,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios.intents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "364c065c-fadb-43fc-8c5d-b5cd7b9278bf";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore org.cryptomator.ios.intents";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -3486,7 +3481,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "4e48538a-4159-41f0-8f58-3b6a1b25e374";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development org.cryptomator.ios";
 			};
 			name = Debug;
@@ -3506,7 +3500,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "1e4ece37-8d7d-4cdb-ad79-61ca52e40a64";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore org.cryptomator.ios";
 			};
 			name = Release;
@@ -3667,15 +3660,15 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt" */ = {
+		4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt.git" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/tikhop/TPInAppReceipt.git";
 			requirement = {
 				kind = upToNextMinorVersion;
 				minimumVersion = 3.3.0;
 			};
 		};
-		4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
+		4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect.git" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/siteline/SwiftUI-Introspect.git";
 			requirement = {
@@ -3688,7 +3681,7 @@
 /* Begin XCSwiftPackageProductDependency section */
 		4A1521E327C55EA2006C96B2 /* TPInAppReceipt */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt" */;
+			package = 4A1521E227C55EA2006C96B2 /* XCRemoteSwiftPackageReference "TPInAppReceipt.git" */;
 			productName = TPInAppReceipt;
 		};
 		4A33092C282EC23400876A3E /* CryptomatorCommonCore */ = {
@@ -3705,7 +3698,7 @@
 		};
 		4AED9A6E286B38DA00352951 /* Introspect */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
+			package = 4AED9A6D286B38D900352951 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect.git" */;
 			productName = Introspect;
 		};
 /* End XCSwiftPackageProductDependency section */

diff --git a/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/cryptomator/cloud-access-swift.git",
         "state": {
           "branch": null,
-          "revision": "f714b246aa64e75593c503dc1261049eccc81ca4",
-          "version": "1.7.3"
+          "revision": "99fa3b966d153cfb1ee34755bd3b4736b4a25ab6",
+          "version": "1.7.4"
         }
       },
       {

diff --git a/CryptomatorIntents/zh-Hant.lproj/Intents.strings b/CryptomatorIntents/zh-Hant.lproj/Intents.strings
@@ -2,7 +2,7 @@
 "common.false" = "否";
 "common.folder" = "資料夾";
 "common.true" = "是";
-"common.vault" = "加密檔案庫";
+"common.vault" = "保险库";
 
 "getFolderIntent.description" = "返回特定加密檔案庫內指定路徑的資料夾。";
 "getFolderIntent.path" = "路徑";

diff --git a/FileProviderExtension/FileProviderExtension.entitlements b/FileProviderExtension/FileProviderExtension.entitlements
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.developer.default-data-protection</key>
-	<string>NSFileProtectionCompleteUnlessOpen</string>
+	<string>NSFileProtectionCompleteUntilFirstUserAuthentication</string>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.org.cryptomator.ios</string>

diff --git a/SharedResources/da.lproj/Localizable.strings b/SharedResources/da.lproj/Localizable.strings
@@ -15,7 +15,7 @@
 "common.button.confirm" = "Bekræft";
 "common.button.create" = "Opret";
 "common.button.createFolder" = "Opret mappe";
-"common.button.done" = "Færdig";
+"common.button.done" = "Ferdig";
 "common.button.download" = "Download";
 "common.button.edit" = "Redigér";
 "common.button.enable" = "Aktivér";
@@ -26,7 +26,7 @@
 "common.button.signOut" = "Log ud";
 "common.button.verify" = "Bekræft";
 "common.cells.openInFilesApp" = "Åbn i Filer appen";
-"common.cells.password" = "Adgangskode";
+"common.cells.password" = "Passord";
 "common.cells.url" = "URL";
 "common.cells.username" = "Brugernavn";
 "common.footer.learnMore" = "Læs mere.";
@@ -37,13 +37,13 @@
 "accountList.signOut.alert.title" = "Fjern associerede bokse?";
 "accountList.signOut.alert.message" = "Ved at logge ud, vil alle tilknyttede bokse blive fjernet fra listen. Ingen krypterede data vil blive slettet. Du kan logge ind igen og tilføje boksene igen senere.";
 
-"addVault.title" = "Tilføj boks";
-"addVault.createNewVault.title" = "Opret ny boks";
+"addVault.title" = "Legg til kvelv";
+"addVault.createNewVault.title" = "Opprett ein ny kvelv";
 "addVault.createNewVault.purchase" = "Oprettelse af en ny boks kræver den fulde version af Cryptomator.";
 "addVault.createNewVault.setVaultName.header.title" = "Vælg et navn til boksen.";
-"addVault.createNewVault.setVaultName.cells.name" = "Boks-navn";
+"addVault.createNewVault.setVaultName.cells.name" = "Namn på kvelven";
 "addVault.createNewVault.setVaultName.error.emptyVaultName" = "Boks navn må ikke være tomt.";
-"addVault.createNewVault.chooseCloud.header" = "Hvor skal Cryptomator gemme de krypterede filer af din boks?";
+"addVault.createNewVault.chooseCloud.header" = "Kvar skal Cryptomator lagra dei krypterte filene i kvelven din?";
 "addVault.createNewVault.chooseFolder.error.vaultNameCollision" = "\"%@\" findes allerede på dette sted. Vælg et andet navn eller en anden placering.";
 "addVault.createNewVault.detectedMasterkey.text" = "Cryptomator detekterede en eksisterende boks på denne placering.\nFor at oprette en ny boks, skal du gå tilbage og vælge en anden mappe.";
 "addVault.createNewVault.password.enterPassword.header" = "Indtast en ny adgangskode.";
@@ -54,7 +54,7 @@
 "addVault.createNewVault.password.error.nonMatchingPasswords" = "Adgangskoderne er ikke ens.";
 "addVault.createNewVault.password.error.tooShortPassword" = "Adgangskoden skal indeholde mindst 8 tegn.";
 "addVault.createNewVault.progress" = "Opretter boks…";
-"addVault.openExistingVault.title" = "Open eksisterende boks";
+"addVault.openExistingVault.title" = "Opn ein eksisterande kvelv";
 "addVault.openExistingVault.chooseCloud.header" = "Hvor er boksen placeret?";
 "addVault.openExistingVault.detectedMasterkey.text" = "Kryptomator fandt boksen \"%@\".\nVil du tilføje denne boks?";
 "addVault.openExistingVault.detectedMasterkey.add" = "Tilføj denne boks";
@@ -247,7 +247,7 @@
 
 "vaultAccountManager.error.vaultAccountAlreadyExists" = "Du har allerede tilføjet denne boks.";
 
-"vaultDetail.button.changeVaultPassword" = "Skift adgangskode";
+"vaultDetail.button.changeVaultPassword" = "Byt passord";
 "vaultDetail.button.lock" = "Lås nu";
 "vaultDetail.button.moveVault" = "Flyt";
 "vaultDetail.button.removeVault" = "Fjern fra listen over bokse";

diff --git a/SharedResources/pt-BR.lproj/Localizable.strings b/SharedResources/pt-BR.lproj/Localizable.strings
@@ -15,7 +15,7 @@
 "common.button.confirm" = "Confirmar";
 "common.button.create" = "Criar";
 "common.button.createFolder" = "Criar pasta";
-"common.button.done" = "Concluído";
+"common.button.done" = "Pronto";
 "common.button.download" = "Baixar";
 "common.button.edit" = "Editar";
 "common.button.enable" = "Habilitar";

diff --git a/SharedResources/zh-Hans.lproj/Localizable.strings b/SharedResources/zh-Hans.lproj/Localizable.strings
@@ -12,7 +12,7 @@
 "common.button.choose" = "选择";
 "common.button.clear" = "清除";
 "common.button.close" = "关闭";
-"common.button.confirm" = "确认";
+"common.button.confirm" = "确定";
 "common.button.create" = "新建";
 "common.button.createFolder" = "新建文件夹";
 "common.button.done" = "完成";
@@ -25,7 +25,7 @@
 "common.button.retry" = "重试";
 "common.button.signOut" = "退出登录";
 "common.button.verify" = "验证";
-"common.cells.openInFilesApp" = "在文管应用中打开";
+"common.cells.openInFilesApp" = "在文件管理器中打开";
 "common.cells.password" = "密码";
 "common.cells.url" = "URL";
 "common.cells.username" = "用户名";

diff --git a/SharedResources/zh-Hant.lproj/Localizable.strings b/SharedResources/zh-Hant.lproj/Localizable.strings
@@ -19,14 +19,14 @@
 "common.button.download" = "下載";
 "common.button.edit" = "編輯";
 "common.button.enable" = "啟用";
-"common.button.next" = "繼續";
+"common.button.next" = "下一步";
 "common.button.ok" = "確認";
 "common.button.remove" = "移除";
 "common.button.retry" = "重試";
 "common.button.signOut" = "登出";
 "common.button.verify" = "驗證";
 "common.cells.openInFilesApp" = "在「檔案」應用程式中開啟";
-"common.cells.password" = "密碼";
+"common.cells.password" = "密码";
 "common.cells.url" = "網址";
 "common.cells.username" = "帳號";
 "common.footer.learnMore" = "了解更多。";
@@ -38,12 +38,12 @@
 "accountList.signOut.alert.message" = "登出後，所有關聯的加密檔案庫將從列表中移除。這並不會刪除任何加密數據。您可以稍後再次登入並重新添加加密檔案庫。";
 
 "addVault.title" = "新增加密檔案庫";
-"addVault.createNewVault.title" = "新建加密檔案庫";
+"addVault.createNewVault.title" = "创建新的保险库";
 "addVault.createNewVault.purchase" = "創建新的加密檔案庫需要 Cryptomator 完整版。";
 "addVault.createNewVault.setVaultName.header.title" = "為加密檔案庫命名.";
-"addVault.createNewVault.setVaultName.cells.name" = "加密檔案庫名稱";
+"addVault.createNewVault.setVaultName.cells.name" = "保险库名称";
 "addVault.createNewVault.setVaultName.error.emptyVaultName" = "加密檔案庫名稱不可留空。";
-"addVault.createNewVault.chooseCloud.header" = "Cryptomator 應該將您加密後的檔案存放在哪裡？";
+"addVault.createNewVault.chooseCloud.header" = "Cryptomator 应该在哪里存储您保险库的加密文件？";
 "addVault.createNewVault.chooseFolder.error.vaultNameCollision" = "“%@”已經在此位置，請更換加密檔案庫名或位置";
 "addVault.createNewVault.detectedMasterkey.text" = "Cryptomator 在此檢測到現有的加密檔案庫。\n如要建立新的加密檔案庫，請返回並選擇其他資料夾。";
 "addVault.createNewVault.password.enterPassword.header" = "輸入新密碼.";
@@ -98,7 +98,7 @@
 "fileProvider.error.biometricalAuthWrongPassword.message" = "保存在%@的密碼錯誤，請重試並輸入你的密碼來重新啟用%@";
 "fileProvider.error.defaultLock.title" = "需要解鎖";
 "fileProvider.error.defaultLock.message" = "要存取加密庫和顯示其內容，需要先解鎖。";
-"fileProvider.error.unlockButton" = "解鎖";
+"fileProvider.error.unlockButton" = "解锁";
 "fileProvider.clearFileFromCache.title" = "清除快取檔䅁";
 "fileProvider.clearFileFromCache.message" = "這只會從您的本機上刪除文件，而不會刪除雲端的文件。";
 "fileProvider.fileImporting.error.missingPremium" = "解鎖 Cryptomator 完整版本以獲得寫入加密檔案庫的功能。";
@@ -219,7 +219,7 @@
 "trialStatus.active" = "生效中";
 "trialStatus.expired" = "已過期";
 
-"unlockVault.button.unlock" = "解鎖";
+"unlockVault.button.unlock" = "解锁";
 "unlockVault.button.unlockVia" = "使用%@解鎖";
 "unlockVault.password.footer" = "輸入 「%@」 的密碼：";
 "unlockVault.enableBiometricalUnlock.switch" = "啓用 %@";
@@ -248,7 +248,7 @@
 
 "vaultAccountManager.error.vaultAccountAlreadyExists" = "您已經添加了這個加密檔案庫。";
 
-"vaultDetail.button.changeVaultPassword" = "變更密碼";
+"vaultDetail.button.changeVaultPassword" = "更改密码";
 "vaultDetail.button.lock" = "立即鎖定";
 "vaultDetail.button.moveVault" = "移動";
 "vaultDetail.button.removeVault" = "從加密檔案庫列表中移除";

diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
@@ -1,3 +1,3 @@
-- Fixed random crashes when downloading files via Google Drive (#306)
-
-Unfortunately, the new download progress indication that we added in 2.4.4 caused some issues we didn't anticipate. So we've removed this feature from Google Drive for now. We may revisit it in a future release.
+- Fixed file upload errors with certain Nextcloud servers via WebDAV (#308)
+- Improved debug logging with WebDAV
+- Improved background upload support (you may need to reinstall the app for this to take effect)
diff --git a/fastlane/config/freemium/metadata/de-DE/release_notes.txt b/fastlane/config/freemium/metadata/de-DE/release_notes.txt
@@ -1,3 +1,3 @@
-- Zufällige Abstürze beim Herunterladen von Dateien über Google Drive behoben (#306)
-
-Leider hat die neue Anzeige des Download-Fortschritts, die wir in der Version 2.4.4 hinzugefügt haben, einige Probleme verursacht, die wir nicht erwartet hatten. Daher haben wir diese Funktion vorerst aus Google Drive entfernt. Möglicherweise werden wir sie in einer zukünftigen Version wieder einbauen.
+- Fehler beim Hochladen von Dateien mit bestimmten Nextcloud-Servern über WebDAV behoben (#308)
+- Diagnose-Protokollierung mit WebDAV verbessert
+- Unterstützung für Uploads im Hintergrund verbessert (evtl. muss die App neu installiert werden, damit dies funktioniert)
diff --git a/fastlane/config/freemium/metadata/en-US/release_notes.txt b/fastlane/config/freemium/metadata/en-US/release_notes.txt
@@ -1,3 +1,3 @@
-- Fixed random crashes when downloading files via Google Drive (#306)
-
-Unfortunately, the new download progress indication that we added in 2.4.4 caused some issues we didn't anticipate. So we've removed this feature from Google Drive for now. We may revisit it in a future release.
+- Fixed file upload errors with certain Nextcloud servers via WebDAV (#308)
+- Improved debug logging with WebDAV
+- Improved background upload support (you may need to reinstall the app for this to take effect)
diff --git a/fastlane/config/premium/metadata/de-DE/release_notes.txt b/fastlane/config/premium/metadata/de-DE/release_notes.txt
@@ -1,3 +1,3 @@
-- Zufällige Abstürze beim Herunterladen von Dateien über Google Drive behoben (#306)
-
-Leider hat die neue Anzeige des Download-Fortschritts, die wir in der Version 2.4.4 hinzugefügt haben, einige Probleme verursacht, die wir nicht erwartet hatten. Daher haben wir diese Funktion vorerst aus Google Drive entfernt. Möglicherweise werden wir sie in einer zukünftigen Version wieder einbauen.
+- Fehler beim Hochladen von Dateien mit bestimmten Nextcloud-Servern über WebDAV behoben (#308)
+- Diagnose-Protokollierung mit WebDAV verbessert
+- Unterstützung für Uploads im Hintergrund verbessert (evtl. muss die App neu installiert werden, damit dies funktioniert)
diff --git a/fastlane/config/premium/metadata/en-US/release_notes.txt b/fastlane/config/premium/metadata/en-US/release_notes.txt
@@ -1,3 +1,3 @@
-- Fixed random crashes when downloading files via Google Drive (#306)
-
-Unfortunately, the new download progress indication that we added in 2.4.4 caused some issues we didn't anticipate. So we've removed this feature from Google Drive for now. We may revisit it in a future release.
+- Fixed file upload errors with certain Nextcloud servers via WebDAV (#308)
+- Improved debug logging with WebDAV
+- Improved background upload support (you may need to reinstall the app for this to take effect)