skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

JSON support for Mac app.

Browse Source
This commit is contained in:
Maarten Billemont 2020-04-04 17:34:07 -04:00
parent 6a635491bd
commit 878970ff22
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
View File

@ -3378,7 +3378,7 @@
); );
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DMPW_SODIUM=1", "-DMPW_SODIUM=1",
"-DMPW_CPERCIVA=0", "-DMPW_JSON=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac; PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac;
PRODUCT_NAME = MasterPassword; PRODUCT_NAME = MasterPassword;
@ -3418,7 +3418,7 @@
); );
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DMPW_SODIUM=1", "-DMPW_SODIUM=1",
"-DMPW_CPERCIVA=0", "-DMPW_JSON=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac; PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac;
PRODUCT_NAME = MasterPassword; PRODUCT_NAME = MasterPassword;

23
platform-darwin/Source/Mac/MPMacAppDelegate.m
View File

@ -20,6 +20,7 @@
#import "MPAppDelegate_Key.h" #import "MPAppDelegate_Key.h"
#import "MPAppDelegate_Store.h" #import "MPAppDelegate_Store.h"
#import "MPSecrets.h" #import "MPSecrets.h"
#import "mpw-marshal.h"
#import <Carbon/Carbon.h> #import <Carbon/Carbon.h>
#import <ServiceManagement/ServiceManagement.h> #import <ServiceManagement/ServiceManagement.h>
@ -318,7 +319,15 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
openPanel.message = @"Locate the Master Password export file to import."; openPanel.message = @"Locate the Master Password export file to import.";
openPanel.prompt = @"Import"; openPanel.prompt = @"Import";
openPanel.directoryURL = [[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask].firstObject; openPanel.directoryURL = [[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask].firstObject;
openPanel.allowedFileTypes = @[ @"mpsites" ]; NSMutableArray *allExtensions = [NSMutableArray array];
for (MPMarshalFormat format = MPMarshalFormatLast; format >= MPMarshalFormatFirst; --format) {
size_t count = 0;
const char **extensions = mpw_format_extensions( format, &count );
for (int c = 0; c < count; ++c)
[allExtensions addObject:@(extensions[c])];
free( extensions );
}
openPanel.allowedFileTypes = allExtensions;
[NSApp activateIgnoringOtherApps:YES]; [NSApp activateIgnoringOtherApps:YES];
if ([openPanel runModal] == NSFileHandlingPanelCancelButton) if ([openPanel runModal] == NSFileHandlingPanelCancelButton)
return; return;
@ -535,9 +544,15 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
savePanel.message ); savePanel.message );
savePanel.prompt = @"Export"; savePanel.prompt = @"Export";
savePanel.directoryURL = [[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask].firstObject; savePanel.directoryURL = [[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask].firstObject;
savePanel.nameFieldStringValue = strf( @"%@ (%@).mpsites", mainActiveUser.name, savePanel.nameFieldStringValue = strf( @"%@ (%@).%@", mainActiveUser.name, [exportDateFormatter stringFromDate:[NSDate date]],
[exportDateFormatter stringFromDate:[NSDate date]] ); @(mpw_format_extension( MPMarshalFormatDefault ) ) );
savePanel.allowedFileTypes = @[ @"mpsites" ]; NSMutableArray *allExtensions = [NSMutableArray array];
size_t count = 0;
const char **extensions = mpw_format_extensions( MPMarshalFormatDefault, &count );
for (int c = 0; c < count; ++c)
[allExtensions addObject:@(extensions[c])];
free( extensions );
savePanel.allowedFileTypes = allExtensions;
[NSApp activateIgnoringOtherApps:YES]; [NSApp activateIgnoringOtherApps:YES];
if ([savePanel runModal] == NSFileHandlingPanelCancelButton) if ([savePanel runModal] == NSFileHandlingPanelCancelButton)
return; return;