From d5809e687c9b7edb4d00af746f780376d1e28228 Mon Sep 17 00:00:00 2001
From: Michael Belz <mbelz@outlook.de>
Date: Mon, 13 Jul 2015 20:03:34 +0200
Subject: [PATCH] Bug #352: MacPass not opening when DB is remembered but
 missing:

Added an implementation for the completionHandler of openDocumentWithContentsOfURL.
---
 MacPass/MPAppDelegate.m                   |  17 ++++++++++++++++-
 MacPass/de.lproj/Localizable.strings      | Bin 12650 -> 12756 bytes
 MacPass/en.lproj/Localizable.strings      | Bin 12058 -> 12144 bytes
 MacPass/fr.lproj/Localizable.strings      | Bin 6299 -> 12596 bytes
 MacPass/nl.lproj/Localizable.strings      | Bin 12376 -> 12472 bytes
 MacPass/zh-Hans.lproj/Localizable.strings | Bin 9890 -> 9952 bytes
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m
index 02838738..0ab3fc3e 100644
--- a/MacPass/MPAppDelegate.m
+++ b/MacPass/MPAppDelegate.m
@@ -273,7 +273,22 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
   if(isFileURL) {
     [documentController openDocumentWithContentsOfURL:documentUrl
                                               display:YES
-                                    completionHandler:^(NSDocument *document, BOOL documentWasAlreadyOpen, NSError *error) {}];
+                                    completionHandler:^(NSDocument *document, BOOL documentWasAlreadyOpen, NSError *error) {
+                                    
+                                      if(error != nil){
+                                        
+                                        NSAlert *alert = [[NSAlert alloc] init];
+                                        [alert setMessageText:   NSLocalizedString(@"FILE_OPEN_ERROR", nil)];
+                                        [alert setInformativeText: [error localizedDescription]];
+                                        [alert setAlertStyle:NSCriticalAlertStyle ];
+                                        [alert runModal];
+                                      }
+                                      
+                                      if(document == nil){
+                                        [self _showWelcomeWindow];
+                                      }
+                                    
+                                    }];
   }
   return isFileURL;
 }
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 4dfd036df8d5133d8a27b982a64588633cba64fc..2f61edbaf5a18c40bef0904ff0d60446fbcc4f31 100644
GIT binary patch
delta 114
zcmaErbR~I1mSL6>gByb<gAao%Lp*~&LjaKW1F~Ehf`HH;h?N)=7;J$Uq%M^qgCPe<
q76JK5Ksu8l7s$HCkOqW#Kz<&Omjab{VMt^s0jtpi>a}LzVgLX=fE2?3

delta 7
OcmcbT{3>ZfmLUKUR0Gcd

diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index b5d3ffbcc20ac82326f0de5532d08bf80fd05774..ff189fe28c19f662538e7b2d53ef04a1245ef78f 100644
GIT binary patch
delta 94
zcmbOg_aSbBlzx~JgByb<gAao%Lp*~&LjaKW1F~Ehf`HH;h?N)=7;J%92`E+sg!w?M
e03-_-QW^3XGJ!Z9$WH^Za)2UwKy}s(TnqqphY*4Q

delta 7
OcmewmH!E&~ls*6txC1}{

diff --git a/MacPass/fr.lproj/Localizable.strings b/MacPass/fr.lproj/Localizable.strings
index 32708e69e350bd8285c79d4cc635023ea45d9e80..2540d1fc4ecd846ec4571dc96520801e5b776e59 100644
GIT binary patch
literal 12596
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
Ic|A)11(0KAX8-^I

literal 6299
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

diff --git a/MacPass/nl.lproj/Localizable.strings b/MacPass/nl.lproj/Localizable.strings
index dd669248c800ffc2663ce7d073d4bd9c9e3c014b..9e9f2454869dc439b82ff359c8aa2509bf1ec20f 100644
GIT binary patch
delta 104
zcmcbSup@Cpgh7H5gByb<gAao%Lp*~&LjaKW1F~Ehf`HH;h?N)=7;J$Uq%NPKl%WL3
mPGZPp$O6*&3<V6S40&J-5=~_&2FfP_MN$~_fI6%hxEKINjS`gr

delta 7
Ocmdmycq3s$gaH5#{R4^s

diff --git a/MacPass/zh-Hans.lproj/Localizable.strings b/MacPass/zh-Hans.lproj/Localizable.strings
index 387354313572d755c0ab0b2335317fb4ffce6d08..1f1bbe94e00462617ec224af7b91918a8734b755 100644
GIT binary patch
delta 70
zcmZ4F`@na@A~icD1~&#z1|J4jhIj^lh5#V#2V}W21OcHx5Gye#FxUdI5<_qjLwtMc
TH@|PGzXBzvDlu3ya4`S?MWYZ;

delta 7
OcmaFhyU2ILA~gUH%>$JH