diff --git a/KeePassKit b/KeePassKit
index 8b7349b8..fb6b52e8 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit 8b7349b85675eb2ca863222c951028c35b8854a8
+Subproject commit fb6b52e86f8e6835ce6d8ccc00f438fbdf48fefc
diff --git a/MacPass/EntryInspectorView.xib b/MacPass/EntryInspectorView.xib
index db1549bd..34328a9b 100644
--- a/MacPass/EntryInspectorView.xib
+++ b/MacPass/EntryInspectorView.xib
@@ -13,7 +13,6 @@
-
@@ -32,7 +31,7 @@
-
+
@@ -40,7 +39,7 @@
-
+
@@ -432,45 +431,58 @@
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -482,25 +494,96 @@
-
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m
index a2e65eb9..cd831924 100644
--- a/MacPass/MPAppDelegate.m
+++ b/MacPass/MPAppDelegate.m
@@ -62,6 +62,7 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
}
- (void)dealloc {
+ [self unbind:@"isAllowedToStoreKeyFile"];
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index dddbf246..cda5206c 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -117,7 +117,6 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
}
- (void)dealloc {
- [self unbind:@"isAllowedToStoreKeyFile"];
[self _cleanupLock];
}
diff --git a/MacPass/MPEntryInspectorViewController.h b/MacPass/MPEntryInspectorViewController.h
index 8e827b58..91a44509 100644
--- a/MacPass/MPEntryInspectorViewController.h
+++ b/MacPass/MPEntryInspectorViewController.h
@@ -24,7 +24,6 @@
@property (weak) IBOutlet NSSegmentedControl *infoTabControl;
@property (weak) IBOutlet NSTableView *attachmentTableView;
@property (weak) IBOutlet NSTableView *customFieldsTableView;
-@property (weak) IBOutlet NSTableView *historyTableView;
@property (unsafe_unretained) IBOutlet NSTextView *notesTextView;
@property (weak) IBOutlet NSButton *generatePasswordButton;
@property (weak) IBOutlet NSButton *togglePassword;
diff --git a/MacPass/MPEntryInspectorViewController.m b/MacPass/MPEntryInspectorViewController.m
index c89b2542..22af7419 100644
--- a/MacPass/MPEntryInspectorViewController.m
+++ b/MacPass/MPEntryInspectorViewController.m
@@ -25,14 +25,13 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
MPEntryTabGeneral,
MPEntryTabFiles,
MPEntryTabCustomFields,
- MPEntryTabHistory
+ MPEntryTabAutotype
};
@interface MPEntryInspectorViewController () {
@private
NSArrayController *_attachmentsController;
NSArrayController *_customFieldsController;
- NSArrayController *_historyController;
MPAttachmentTableViewDelegate *_attachmentTableDelegate;
MPCustomFieldTableViewDelegate *_customFieldTableDelegate;
MPAttachmentTableDataSource *_attachmentDataSource;
@@ -59,7 +58,6 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
_showPassword = NO;
_attachmentsController = [[NSArrayController alloc] init];
_customFieldsController = [[NSArrayController alloc] init];
- _historyController = [[NSArrayController alloc] init];
_attachmentTableDelegate = [[MPAttachmentTableViewDelegate alloc] init];
_customFieldTableDelegate = [[MPCustomFieldTableViewDelegate alloc] init];
_attachmentDataSource = [[MPAttachmentTableDataSource alloc] init];
@@ -121,8 +119,6 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
[_customFieldsTableView bind:NSContentBinding toObject:_customFieldsController withKeyPath:@"arrangedObjects" options:nil];
[_customFieldsTableView setDelegate:_customFieldTableDelegate];
- [_historyTableView bind:NSContentBinding toObject:_historyController withKeyPath:@"arrangedObjects" options:nil];
-
[self.passwordTextField bind:@"showPassword" toObject:self withKeyPath:@"showPassword" options:nil];
[self.togglePassword bind:NSValueBinding toObject:self withKeyPath:@"showPassword" options:nil];
}
@@ -237,7 +233,6 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
[self _bindEntry];
[self _bindAttachments];
[self _bindCustomFields];
- [self _bindHistory];
}
- (void)_bindEntry {
@@ -275,16 +270,6 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
[_customFieldsController bind:NSContentArrayBinding toObject:self.entry withKeyPath:@"customAttributes" options:nil];
}
-- (void)_bindHistory {
- if(self.entry) {
- [_historyController bind:NSContentArrayBinding toObject:self.entry withKeyPath:@"history" options:nil];
- }
- else if([_historyController content] != nil) {
- [_historyController unbind:NSContentArrayBinding];
- [_historyController setContent:nil];
- }
-}
-
- (void)_toggleEditing:(BOOL)edit {
/* TODO: not fully working right now */
diff --git a/MacPass/SavePanelAccessoryView.xib b/MacPass/SavePanelAccessoryView.xib
index ddbcc1d7..8997e65b 100644
--- a/MacPass/SavePanelAccessoryView.xib
+++ b/MacPass/SavePanelAccessoryView.xib
@@ -1,630 +1,68 @@
-
-
-
- 1080
- 12E55
- 3084
- 1187.39
- 626.00
-
-
- IBNSLayoutConstraint
- NSCustomObject
- NSCustomView
- NSMenu
- NSMenuItem
- NSPopUpButton
- NSPopUpButtonCell
- NSTextField
- NSTextFieldCell
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
- YES
- 3
-
- {11, 11}
- {10, 3}
-
- YES
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MacPass/UnprotectedWarningView.xib b/MacPass/UnprotectedWarningView.xib
index 0a9c6e3e..91994252 100644
--- a/MacPass/UnprotectedWarningView.xib
+++ b/MacPass/UnprotectedWarningView.xib
@@ -1,5 +1,5 @@
-
+
diff --git a/MacPassTests/KPKTestPlaceholder.m b/MacPassTests/KPKTestPlaceholder.m
index 40a56644..5af242f0 100644
--- a/MacPassTests/KPKTestPlaceholder.m
+++ b/MacPassTests/KPKTestPlaceholder.m
@@ -10,7 +10,7 @@
#import "KPKEntry.h"
#import "KPKAttribute.h"
-#import "NSString+Placeholder.h"
+#import "NSString+Commands.h"
@implementation KPKTextPlaceholder