From 0bb6e48d392709775dc675e94aa4187efd8f3958 Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sun, 18 Jun 2017 01:13:49 +0800
Subject: [PATCH] Fix migration of user defaults

---
 passKit/Models/PasswordStore.swift | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 2605243..e1e4dee 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -140,7 +140,12 @@ public class PasswordStore {
         
         do {
             // migrate Defaults
-            SharedDefaults = Defaults
+            let userDefaults = UserDefaults()
+            for key in Defaults.dictionaryRepresentation().keys {
+                if SharedDefaults.value(forKey: key) == nil {
+                    SharedDefaults.setValue(userDefaults.value(forKey: key), forKey: key)
+                }
+            }
             
             // migrate files
             try fm.createDirectory(atPath: Globals.documentPath, withIntermediateDirectories: true, attributes: nil)