From 7c2cf6eadbf6ceaf7e0a47798a9e7e35e3bf44d2 Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Fri, 5 Apr 2019 08:53:51 +0200 Subject: [PATCH] Re-worked hide after copy to pasteboard. It now works for all copy actions that securely copy to the clipboard (closed #906) --- MacPass/Base.lproj/GeneralSettings.xib | 46 +++++++++++-------------- MacPass/Base.lproj/WorkflowSettings.xib | 5 +-- MacPass/MPEntryViewController.m | 3 +- MacPass/MPPasteBoardController.h | 12 +++++++ MacPass/MPPasteBoardController.m | 9 ++++- MacPass/MPSettingsHelper.h | 1 + MacPass/MPSettingsHelper.m | 4 ++- MacPass/MPWorkflowSettingsController.h | 9 ++--- MacPass/MPWorkflowSettingsController.m | 1 + 9 files changed, 56 insertions(+), 34 deletions(-) diff --git a/MacPass/Base.lproj/GeneralSettings.xib b/MacPass/Base.lproj/GeneralSettings.xib index 438d5fb6..a53cc4b8 100644 --- a/MacPass/Base.lproj/GeneralSettings.xib +++ b/MacPass/Base.lproj/GeneralSettings.xib @@ -1,8 +1,8 @@ - + - + @@ -23,13 +23,13 @@ - + - + - + @@ -44,10 +44,7 @@ - - - - + @@ -75,7 +72,7 @@ - + @@ -114,7 +111,7 @@ - + Enabling this compromises security. If enabled, your preferences will contain mappings from database to keyfile. Key locations for databases without a password will not be saved. @@ -123,7 +120,7 @@ - + Disabling this compromises security. If enabled, anything copied to the Clipboard in MacPass will be available on your connected iOS devices. You should clear the clipboard on those devices manually. @@ -166,9 +163,9 @@ - + - + @@ -178,8 +175,8 @@ - - + + @@ -195,15 +192,14 @@ - - + - + - - + + @@ -237,7 +233,7 @@ - + @@ -247,7 +243,7 @@ - + @@ -273,7 +269,7 @@ - + diff --git a/MacPass/Base.lproj/WorkflowSettings.xib b/MacPass/Base.lproj/WorkflowSettings.xib index a8c7bf7b..ffa0a7d7 100644 --- a/MacPass/Base.lproj/WorkflowSettings.xib +++ b/MacPass/Base.lproj/WorkflowSettings.xib @@ -11,6 +11,7 @@ + @@ -139,8 +140,8 @@