1.15.1

Author: strongbox-mark

About/AboutViewController.m

@@ -10,7 +10,6 @@
 #import "DebugHelper.h"
 #import "ClipboardManager.h"
 #import "Alerts.h"
-//#import "Settings.h"
 #import "SharedAppAndAutoFillSettings.h"
 #import "Utils.h"
 #import "ProUpgradeIAPManager.h"

CustomFieldTableCell.m

@@ -70,14 +70,14 @@ - (IBAction)toggleShowHide:(id)sender {
 
 - (void)bindConcealed {
     if(self._concealed) {
-        [self.buttonShowHide setImage:[UIImage imageNamed:@"show"] forState:UIControlStateNormal];
+        [self.buttonShowHide setImage:[UIImage imageNamed:@"visible"] forState:UIControlStateNormal];
 
         self.valueLabel.text = NSLocalizedString(@"generic_masked_protected_field_text", @"*****************");
 
         self.valueLabel.textColor = [UIColor lightGrayColor];
     }
     else {
-        [self.buttonShowHide setImage:[UIImage imageNamed:@"hide"] forState:UIControlStateNormal];
+        [self.buttonShowHide setImage:[UIImage imageNamed:@"invisible"] forState:UIControlStateNormal];
 
         BOOL dark = NO;
         if (@available(iOS 12.0, *)) {

StrongBox Auto Fill/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>1.52.7</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3029</string>
+	<string>3030</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

StrongBox/AppDelegate.m

@@ -41,6 +41,7 @@ @implementation AppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
 
+
 
     [self installTopLevelExceptionHandlers];
 

StrongBox/DatabaseCell.m

@@ -161,7 +161,7 @@ - (void)populateCell:(SafeMetaData *)database disabled:(BOOL)disabled autoFill:(
     UIImage* databaseIcon = SharedAppAndAutoFillSettings.sharedInstance.showDatabaseIcon ? [UIImage imageNamed:databaseIconName] : nil;
 
     if (disabled) {
-        databaseIcon = SharedAppAndAutoFillSettings.sharedInstance.showDatabaseIcon ? [UIImage imageNamed:@"cancel_32"] : nil;
+        databaseIcon = SharedAppAndAutoFillSettings.sharedInstance.showDatabaseIcon ? [UIImage imageNamed:@"cancel"] : nil;
 
         if (autoFill) {
             subtitle2 = database.autoFillEnabled ?

StrongBox/DatabasePreferencesController.m

@@ -27,6 +27,7 @@ @interface DatabasePreferencesController ()
 
 @property (weak, nonatomic) IBOutlet UILabel *labelDatabaseAutoLockDelay;
 @property (weak, nonatomic) IBOutlet UISwitch *switchDatabaseAutoLockEnabled;
+@property (weak, nonatomic) IBOutlet UISwitch *switchLockOnDeviceLock;
 
 @property (weak, nonatomic) IBOutlet UISwitch *switchAllowBiometric;
 @property (weak, nonatomic) IBOutlet UILabel *labelAllowBiometricSetting;
@@ -222,6 +223,8 @@ - (void)bindUi {
     } else {
         self.labelQuickTypeFormat.textColor = self.switchQuickTypeAutoFill.on ? UIColor.blackColor : UIColor.lightGrayColor;
     }
+    
+    self.switchLockOnDeviceLock.on = self.viewModel.metadata.autoLockOnDeviceLock;
 }
 
 - (IBAction)onDone:(id)sender {
@@ -379,4 +382,10 @@ - (BOOL)canToggleTouchId {
     return BiometricsManager.isBiometricIdAvailable && [SharedAppAndAutoFillSettings.sharedInstance isProOrFreeTrial];
 }
 
+- (IBAction)onSwitchLockOnDeviceLock:(id)sender {
+    self.viewModel.metadata.autoLockOnDeviceLock = self.switchLockOnDeviceLock.on;
+    [SafesList.sharedInstance update:self.viewModel.metadata];
+    [self bindUi];
+}
+
 @end

StrongBox/OldCustomFieldCell.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -38,7 +38,7 @@
                                     <constraint firstAttribute="height" constant="32" id="10E-UU-c26"/>
                                     <constraint firstAttribute="width" constant="32" id="bet-Q7-6Sd"/>
                                 </constraints>
-                                <state key="normal" image="show-24"/>
+                                <state key="normal" image="show"/>
                                 <connections>
                                     <action selector="toggleShowHide:" destination="2ui-jb-htS" eventType="touchUpInside" id="q72-n9-u9c"/>
                                 </connections>
@@ -65,6 +65,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="show-24" width="24" height="24"/>
+        <image name="show" width="512" height="512"/>
     </resources>
 </document>

StrongBox/RecordView.m

@@ -477,7 +477,7 @@ - (void)enableDisableUiForEditing {
     self.textViewNotes.textColor = self.editing ? [UIColor blackColor] : [UIColor grayColor];
     self.textViewNotes.layer.borderColor = self.editing ? [UIColor darkGrayColor].CGColor : [UIColor lightGrayColor].CGColor;
 
-    UIImage *btnImage = [UIImage imageNamed:self.isEditing ? @"syncronize" : @"copy_64"];
+    UIImage *btnImage = [UIImage imageNamed:self.isEditing ? @"syncronize" : @"copy"];
 
     [self.buttonGeneratePassword setImage:btnImage forState:UIControlStateNormal];
     (self.buttonGeneratePassword).enabled = self.editing || (!self.isEditing && (self.record != nil && (self.record.fields.password).length));

StrongBox/RecordView.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="1ud-dC-1he">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="1ud-dC-1he">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -229,7 +229,7 @@
                                                         <constraint firstAttribute="height" constant="40" id="wId-vU-GnM"/>
                                                     </constraints>
                                                     <inset key="imageEdgeInsets" minX="5" minY="5" maxX="5" maxY="5"/>
-                                                    <state key="normal" image="clock_64"/>
+                                                    <state key="normal" image="timer"/>
                                                     <connections>
                                                         <action selector="onViewHistory:" destination="1ud-dC-1he" eventType="touchUpInside" id="wYJ-8l-m0D"/>
                                                     </connections>
@@ -291,7 +291,7 @@
                                                         <constraint firstAttribute="width" constant="40" id="ViF-Fw-7th"/>
                                                     </constraints>
                                                     <inset key="imageEdgeInsets" minX="5" minY="5" maxX="5" maxY="5"/>
-                                                    <state key="normal" image="copy_64"/>
+                                                    <state key="normal" image="copy"/>
                                                     <connections>
                                                         <action selector="onCopyTotp:" destination="1ud-dC-1he" eventType="touchUpInside" id="aeF-Rw-rH9"/>
                                                     </connections>
@@ -352,7 +352,7 @@
                                                         <constraint firstAttribute="width" constant="40" id="Ycn-5R-Jae"/>
                                                     </constraints>
                                                     <inset key="imageEdgeInsets" minX="5" minY="5" maxX="5" maxY="5"/>
-                                                    <state key="normal" image="copy_64"/>
+                                                    <state key="normal" image="copy"/>
                                                     <connections>
                                                         <action selector="onCopyUsername:" destination="1ud-dC-1he" eventType="touchUpInside" id="Fpq-bm-QIq"/>
                                                     </connections>
@@ -393,7 +393,7 @@
                                                         <constraint firstAttribute="width" constant="40" id="tO7-rt-yJw"/>
                                                     </constraints>
                                                     <inset key="imageEdgeInsets" minX="5" minY="5" maxX="5" maxY="5"/>
-                                                    <state key="normal" image="copy_64"/>
+                                                    <state key="normal" image="copy"/>
                                                     <connections>
                                                         <action selector="onCopyEmail:" destination="1ud-dC-1he" eventType="touchUpInside" id="FMB-BD-qtO"/>
                                                     </connections>
@@ -443,7 +443,7 @@
                                                         <constraint firstAttribute="height" constant="40" id="cK1-tI-dSF"/>
                                                     </constraints>
                                                     <inset key="imageEdgeInsets" minX="5" minY="5" maxX="5" maxY="5"/>
-                                                    <state key="normal" image="copy_64"/>
+                                                    <state key="normal" image="copy"/>
                                                     <connections>
                                                         <action selector="onCopyUrl:" destination="1ud-dC-1he" eventType="touchUpInside" id="ybQ-Vo-4km"/>
                                                     </connections>
@@ -627,10 +627,10 @@
     </scenes>
     <resources>
         <image name="C00_Password" width="48" height="48"/>
-        <image name="clock_64" width="64" height="64"/>
-        <image name="copy_64" width="64" height="64"/>
+        <image name="copy" width="30" height="30"/>
         <image name="document" width="30" height="30"/>
         <image name="services" width="30" height="30"/>
         <image name="syncronize" width="30" height="30"/>
+        <image name="timer" width="30" height="30"/>
     </resources>
 </document>

StrongBox/SFTPStorageProvider.m

@@ -36,8 +36,14 @@ @interface SFTPStorageProvider ()
 @property NMSFTP* maintainedSessionForListing;
 @property SFTPSessionConfiguration* maintainedConfigurationForFastListing;
 
+#if TARGET_OS_IPHONE
+
+#else
+
 @property ProgressWindow* progressWindow;
 
+#endif
+
 @end
 
 @implementation SFTPStorageProvider

StrongBox/SafeMetaData.h

@@ -153,6 +153,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property BOOL immediateOfflineOfferIfOfflineDetected;
 
 @property QuickTypeAutoFillDisplayFormat quickTypeDisplayFormat;
+@property BOOL emptyOrNilPwPreferNilCheckFirst; 
+@property BOOL autoLockOnDeviceLock;
 
 @end
 

StrongBox/SafeMetaData.m

@@ -86,6 +86,7 @@ - (instancetype)init {
 
         self.conflictResolutionStrategy = kConflictResolutionStrategyAsk;
         self.quickTypeDisplayFormat = kQuickTypeFormatTitleThenUsername;
+        self.autoLockOnDeviceLock = YES;
     }
 
     return self;
@@ -221,6 +222,21 @@ + (instancetype)fromJsonSerializationDictionary:(NSDictionary *)jsonDictionary {
         ret.quickTypeDisplayFormat = kQuickTypeFormatTitleThenUsername;
     }
 
+    
+    
+    if ( jsonDictionary[@"emptyOrNilPwPreferNilCheckFirst"] != nil ) {
+        ret.emptyOrNilPwPreferNilCheckFirst = ((NSNumber*)jsonDictionary[@"emptyOrNilPwPreferNilCheckFirst"]).boolValue;
+    }
+    
+    
+    
+    if ( jsonDictionary[@"autoLockOnDeviceLock"] != nil ) {
+        ret.autoLockOnDeviceLock = ((NSNumber*)jsonDictionary[@"autoLockOnDeviceLock"]).boolValue;
+    }
+    else { 
+        ret.autoLockOnDeviceLock = YES;
+    }
+    
     return ret;
 }
 
@@ -279,6 +295,8 @@ - (NSDictionary *)getJsonSerializationDictionary {
         @"immediateOfflineOfferIfOfflineDetected" : @(self.immediateOfflineOfferIfOfflineDetected),
         @"quickTypeEnabled" : @(self.quickTypeEnabled),
         @"quickTypeDisplayFormat" : @(self.quickTypeDisplayFormat),
+        @"emptyOrNilPwPreferNilCheckFirst" : @(self.emptyOrNilPwPreferNilCheckFirst),
+        @"autoLockOnDeviceLock" : @(self.autoLockOnDeviceLock)
     }];
 
     if (self.nickName != nil) {

StrongBox/SafeStorageProviderFactory.m

@@ -118,17 +118,18 @@ + (NSString*)getDisplayNameForProvider:(StorageProvider)provider database:(METAD
                 NSLocalizedString(@"autofill_safes_vc_storage_local_name", @"Local") :
                 NSLocalizedString(@"autofill_safes_vc_storage_local_docs_name", @"Local (Documents)");
 #else
-            _displayName = NSLocalizedString(@"storage_provider_name_local_device", @"Local Device");
-            if([_displayName isEqualToString:@"storage_provider_name_local_device"]) {
-                _displayName = @"Local Device";
-            }
+            _displayName = NSLocalizedString(@"storage_provider_name_mac_file_short", @"File");
 #endif
         }
         else {
+#if TARGET_OS_IPHONE
             _displayName = NSLocalizedString(@"storage_provider_name_local_device", @"Local Device");
             if([_displayName isEqualToString:@"storage_provider_name_local_device"]) {
                 _displayName = @"Local Device";
             }
+#else
+            _displayName = NSLocalizedString(@"storage_provider_name_mac_file_short", @"File");
+#endif
         }
     }
     else if(provider == kOneDrive) {
@@ -150,10 +151,14 @@ + (NSString*)getDisplayNameForProvider:(StorageProvider)provider database:(METAD
         }
     }
     else if(provider == kWebDAV) {
+#if TARGET_OS_IPHONE
         _displayName = NSLocalizedString(@"storage_provider_name_webdav", @"WebDAV");
         if([_displayName isEqualToString:@"storage_provider_name_webdav"]) {
             _displayName = @"WebDAV";
         }
+#else
+            _displayName = @"DAV"; 
+#endif
     }
     else {
         _displayName = @"SafeStorageProviderFactory::getDisplayName Unknown";
@@ -174,7 +179,7 @@ + (NSString*)getIconForProvider:(StorageProvider)provider {
         return @"dropbox-blue-32x32-nologo";
     }
     else if (provider == kiCloud) {
-        return @"icloud-32";
+        return @"cloud";
     }
     else if (provider == kLocalDevice) {
         return @"iphone_x";
@@ -186,10 +191,10 @@ + (NSString*)getIconForProvider:(StorageProvider)provider {
         return @"lock";
     }
     else if(provider == kSFTP) {
-        return @"sftp-32x32";
+        return @"cloud-sftp";
     }
     else if(provider == kWebDAV) {
-        return @"webdav-32x32";
+        return @"cloud-webdav";
     }
     else {
         return @"SafeStorageProviderFactory::getIcon Unknown";