v2.6.5

App/fr.lproj/InfoPlist.strings

@@ -1,4 +1,4 @@
-"CFBundleDisplayName" = "Mot de passe";
+"CFBundleDisplayName" = "Mots de passe";
 "NSCameraUsageDescription" = "Scanner le code QR";
 "NSFaceIDUsageDescription" = "Déverrouiller l'appli";
 "NSPhotoLibraryAddUsageDescription" = "Partager le code QR";

Passwords.xcodeproj/project.pbxproj

@@ -2105,7 +2105,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
 				CODE_SIGN_ENTITLEMENTS = App/Passwords.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 29;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				ENABLE_PREVIEWS = YES;
@@ -2115,7 +2115,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.4;
+				MARKETING_VERSION = 2.6.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
@@ -2132,7 +2132,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
 				CODE_SIGN_ENTITLEMENTS = App/Passwords.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 29;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				ENABLE_PREVIEWS = YES;
@@ -2142,7 +2142,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.4;
+				MARKETING_VERSION = 2.6.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
@@ -2198,7 +2198,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = Provider/Provider.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 29;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				INFOPLIST_FILE = Provider/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2207,7 +2207,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.4;
+				MARKETING_VERSION = 2.6.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER).Provider";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2221,7 +2221,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = Provider/Provider.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 29;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				INFOPLIST_FILE = Provider/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2230,7 +2230,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.4;
+				MARKETING_VERSION = 2.6.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER).Provider";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2285,7 +2285,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = ExtensionIcon;
 				CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 29;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				INFOPLIST_FILE = Extension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2294,7 +2294,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.4;
+				MARKETING_VERSION = 2.6.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER).Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2309,7 +2309,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = ExtensionIcon;
 				CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 29;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				INFOPLIST_FILE = Extension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2318,7 +2318,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.4;
+				MARKETING_VERSION = 2.6.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER).Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

Shared/Controllers/Local/LoginFlowNavigationController.swift

@@ -19,7 +19,7 @@ extension LoginFlowNavigationController: WKNavigationDelegate {
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
         decisionHandler(.allow)
         guard let relativeReference = navigationAction.request.url?.relativeReference,
-              relativeReference.hasSuffix("/login/v2/grant") else {
+              relativeReference.hasSuffix("/login/v2/grant") || relativeReference.hasSuffix("/login/v2/apptoken") else {
             return
         }
 

Shared/Utilities/Crypto.swift

@@ -199,7 +199,16 @@ extension Crypto {
                     return tag
                 }
 
-            return (folders, passwords, tags)
+            // TODO: Find a better to fix duplicate entries
+            // When creating a new entry from this app, in very rare cases, the entry is created multiple times and even stored multiple times in Core Data. The cause of this issue is still unknown. Those duplicate entries cause a lot of rare bugs, including:
+            // - The same entry is shown multiple times in the entries list (obviously)
+            // - When receiving new remote data, the updated*Pairs in EntriesController can get out of sync, thus preventing the new data from showing up in the iOS app
+            // - The previous bug also implies that affected entries can't be updated from the iOS app because the local revision is outdated
+            // - Lists might behave in undefined ways, as indicated by debug logs
+            // To at least bypass this issue, all entries that are duplicates are removed as soon as the IDs are known, which is the next line.
+            let decryptedEntries = (Array(Set(folders)), Array(Set(passwords)), Array(Set(tags)))
+
+            return decryptedEntries
         }
 
         static func decrypt(offlineSettings: Data, key: SymmetricKey) throws -> Settings {

Shared/cs.lproj/Localizable.strings

@@ -156,3 +156,7 @@
 "_duplicates" = "Duplicity";
 "_duplicatesTrashMessage" = "Veškeré duplicity tohoto hesla se nacházejí v koši.";
 "_joinTestFlightBeta" = "Pomozte s testováním vývojových verzí";
+
+/* Make sure to keep newlines (\n) and the placeholder (%@) */
+"_connectingToNextcloudInstanceAt(url)" = "Připojování k instanci Nextcloud na\n%@";
+"_managedServerUrlErrorMessage" = "Adresa Nextcloud serveru byla předem nastavena, ale aplikaci se nepodařilo se k této instanci Nextcloud připojit. Obraťte se na správce.";

Shared/de.lproj/Localizable.strings

@@ -156,3 +156,7 @@
 /* I.e. duplicates of a password */
 "_duplicates" = "Duplikate";
 "_joinTestFlightBeta" = "An TestFlight-Beta teilnehmen";
+
+/* Make sure to keep newlines (\n) and the placeholder (%@) */
+"_connectingToNextcloudInstanceAt(url)" = "Verbinde mit der Nextcloud-Instanz auf\n%@";
+"_managedServerUrlErrorMessage" = "Die Nextcloud-Serveradresse wurde vorkonfiguriert, aber die App konnte keine Verbindung zur Nextcloud-Instanz herstellen. Bitte kontaktiere deinen Administrator.";

Shared/fr.lproj/Localizable.strings

@@ -58,7 +58,7 @@
 "_folders" = "Dossiers";
 "_generatePassword" = "Générer un mot de passe";
 "_giveATip" = "Donner un pourboire";
-"_highFive" = "High Five! 👏";
+"_highFive" = "Tape-m'en cinq ! 👏";
 "_incorrectPassword" = "Mauvais mot de passe";
 "_incorrectPasswordMessage" = "Veuillez réessayer.";
 "_integration" = "Intégration";
@@ -195,3 +195,12 @@
 
 /* I.e. this OTP is a time-based one, possible value for "Type" field in OTP editor, other key is "_counterBased" */
 "_timeBased" = "Basé sur le temps";
+"_duplicatesTrashMessage" = "Tous les doublons de ce mot de passe se trouvent dans la poubelle.";
+"_joinTestFlightBeta" = "Rejoindre la Bêta TestFlight";
+
+/* I.e. duplicates of a password */
+"_duplicates" = "Doublons";
+
+/* Make sure to keep newlines (\n) and the placeholder (%@) */
+"_connectingToNextcloudInstanceAt(url)" = "Connexion à l'instance Nextcloud à\n%@";
+"_managedServerUrlErrorMessage" = "L'adresse du serveur Nextcloud a été préconfigurée, mais l'application n'a pas pu se connecter à l'instance Nextcloud. Veuillez contacter votre administrateur.";

Shared/nb-NO.lproj/Localizable.strings

@@ -310,3 +310,8 @@
 /* Use the same wording Apple uses across iOS */
 "_dismiss" = "Avslå";
 "_thanksMessage" = "Takk til hele Nextcloud-gemenskapen og alle som involverer seg i dette flotte økosystemet. Jeg håper jeg bidrar på mitt vis med dette programmet.";
+"_duplicatesTrashMessage" = "Alle duplikater av dette passordet befinner seg i papirkurven.";
+
+/* I.e. duplicates of a password */
+"_duplicates" = "Duplikater";
+"_joinTestFlightBeta" = "Ta del i TestFlight-beta";

fastlane/Fastfile

@@ -3,7 +3,7 @@ default_platform(:ios)
 opt_out_usage
 
 before_all do
-    ensure_xcode_version(version: "14.1")
+    ensure_xcode_version(version: "14.2")
     ensure_git_status_clean
     ensure_git_branch(branch: "develop")
     unless sh("git fetch --dry-run").empty?

fastlane/metadata/de-DE/release_notes.txt

@@ -1,2 +1 @@
-• Unterstützung für verwaltete App-Konfiguration
-• Fehlerbehebungen und Optimierungen
+• Fehlerbehebungen

fastlane/metadata/en-US/release_notes.txt

@@ -1,2 +1 @@
-• Support for managed app configuration
-• Bugfixes and optimizations
+• Bugfixes