Fixed issue when trying to store key files for drafted documents

cathyjf · May 24, 2022 · cbb4cea · cbb4cea
1 parent 8be69ca
commit cbb4cea
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
@@ -969,11 +969,17 @@ - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)anItem {
 }
 
 - (void)_storeKeyURL:(NSURL *)keyURL {
+  if(self.isDraft) {
+    // we cannot store key files for draft documents
+    return;
+  }
   NSMutableDictionary *keysForFiles = [[NSUserDefaults.standardUserDefaults dictionaryForKey:kMPSettingsKeyRememeberdKeysForDatabases] mutableCopy];
   MPAppDelegate *delegate = (MPAppDelegate *)[NSApp delegate];
   if(!delegate.isAllowedToStoreKeyFile || nil == keyURL) {
     /* user has removed the keyfile or we should not safe it so remove it */
-    [keysForFiles removeObjectForKey:self.fileURL.path.sha1HexDigest];
+    if(self.fileURL) {
+      [keysForFiles removeObjectForKey:self.fileURL.path.sha1HexDigest];
+    }
   }
   else if([self.compositeKey hasKeyOfClass:KPKPasswordKey.class] && [self.compositeKey hasKeyOfClass:KPKFileKey.class]) {
     if(nil == keysForFiles) {