From 6538634680fc9e801d38c534d6a5a5b7812e604b Mon Sep 17 00:00:00 2001 From: Yishi Lin Date: Thu, 12 Apr 2018 00:52:10 +0800 Subject: [PATCH] Delete files before cleaning up dirs --- passKit/Models/PasswordStore.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift index a39b810..5ae5692 100644 --- a/passKit/Models/PasswordStore.swift +++ b/passKit/Models/PasswordStore.swift @@ -654,9 +654,9 @@ public class PasswordStore { public func delete(passwordEntity: PasswordEntity) throws { let deletedFileURL = passwordEntity.getURL()! - try deleteDirectoryTree(at: passwordEntity.getURL()!) - try deletePasswordEntities(passwordEntity: passwordEntity) try gitRm(path: deletedFileURL.path) + try deletePasswordEntities(passwordEntity: passwordEntity) + try deleteDirectoryTree(at: deletedFileURL) let _ = try gitCommit(message: "Remove \(deletedFileURL.deletingPathExtension().path.removingPercentEncoding!) from store using Pass for iOS.") NotificationCenter.default.post(name: .passwordStoreUpdated, object: nil) }