skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Huge refactor to do marshalling completely through mpw data object now.

Browse Source
This commit is contained in:
Maarten Billemont
2019-10-02 23:16:20 -04:00
parent 0fcdb2a5e6
commit 44fa32697a
6 changed files with 388 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform-darwin/Source/MPAppDelegate_Store.m
View File

@@ -565,7 +565,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
saveInContext:(NSManagedObjectContext *)context {
// Read metadata for the import file.
MPMarshalledInfo *info = mpw_marshal_read_info( importData.UTF8String );
MPMarshalledInfo *info = mpw_marshal_read( importData.UTF8String );
if (info->format == MPMarshalFormatNone)
return MPError( ([NSError errorWithDomain:MPErrorDomain code:MPErrorMarshalCode userInfo:@{
@"type" : @(MPMarshalErrorFormat),
@@ -589,7 +589,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
// Parse import data.
MPMarshalError importError = { .type = MPMarshalSuccess };
MPMarshalledUser *importUser = mpw_marshal_read( importData.UTF8String, info->format, importMasterPassword.UTF8String, &importError );
MPMarshalledUser *importUser = mpw_marshal_auth( importData.UTF8String, info->format, importMasterPassword.UTF8String, &importError );
mpw_marshal_info_free( &info );
@try {