1.52.22 - 1.14.15

Author: strongbox-mark

About/AboutViewController.m

@@ -13,6 +13,7 @@
 #import "AppPreferences.h"
 #import "Utils.h"
 #import "ProUpgradeIAPManager.h"
+#import "CustomizationManager.h"
 
 @interface AboutViewController ()
 
@@ -34,7 +35,7 @@ - (void)viewDidLoad {
         self.navigationItem.title = about;
     }
 
-    self.upgradeOptions.hidden = ProUpgradeIAPManager.isProFamilyEdition || ProUpgradeIAPManager.sharedInstance.hasPurchasedLifeTime; 
+    self.upgradeOptions.hidden = CustomizationManager.isAProBundle || ProUpgradeIAPManager.sharedInstance.hasPurchasedLifeTime; 
 
     self.debugTextView.layer.cornerRadius = 2.0f;
     if (@available(iOS 13.0, *)) {
@@ -74,7 +75,8 @@ - (void)viewDidLoad {
 }
 
 - (IBAction)onCopy:(id)sender {
-    [UIPasteboard.generalPasteboard setString:[DebugHelper getAboutDebugString]];
+    [ClipboardManager.sharedInstance copyStringWithNoExpiration:[DebugHelper getAboutDebugString]];
+    
     [Alerts info:self title:@"Done" message:@"Debug Info copied to clipboard"];
 }
 

FileManager.h

@@ -42,6 +42,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setFileProtection:(BOOL)complete;
 
+@property (readonly) NSArray<NSURL*>* importedKeyFiles;
+
 @end
 
 NS_ASSUME_NONNULL_END

FileManager.m

@@ -366,4 +366,30 @@ - (void)deleteAllFoo:(NSString*)tmpPath {
     }
 }
 
+- (NSArray<NSURL *> *)importedKeyFiles {
+    NSMutableArray* files = [NSMutableArray array];
+    NSFileManager *fm = [NSFileManager defaultManager];
+    NSURL *directoryURL =  self.keyFilesDirectory;
+    
+    NSDirectoryEnumerator *enumerator = [fm
+                                         enumeratorAtURL:directoryURL
+                                         includingPropertiesForKeys:@[NSURLIsDirectoryKey]
+                                         options:0
+                                         errorHandler:nil];
+    
+    for (NSURL *url in enumerator) {
+        NSError *error;
+        NSNumber *isDirectory = nil;
+        if (![url getResourceValue:&isDirectory forKey:NSURLIsDirectoryKey error:&error]) {
+            
+            NSLog(@"%@", error);
+        }
+        else if (![isDirectory boolValue]) {
+            [files addObject:url];
+        }
+    }
+    
+    return [files copy];
+}
+
 @end

Podfile

@@ -10,13 +10,13 @@ abstract_target 'common-mac' do
     target 'Strongbox' do
     end
 
-    target 'Strongbox-Outright-Pro' do
+    target 'Strongbox-Pro' do
     end
 
-    target 'Strongbox AutoFill' do
+    target 'Strongbox-AutoFill' do
     end
 
-    target 'Strongbox-Outright-Pro-AutoFill' do
+    target 'Strongbox-Pro-AutoFill' do
     end
 end
 
@@ -40,7 +40,7 @@ abstract_target 'common-ios' do
         pod 'GoogleSignIn'
     end
 
-    target 'Strongbox-iOS-Family' do
+    target 'Strongbox-iOS-Pro' do
         use_frameworks!
 
         pod 'MTBBarcodeScanner'
@@ -51,13 +51,25 @@ abstract_target 'common-ios' do
         pod 'OneDriveSDK'
         pod 'GoogleAPIClientForREST/Drive'
         pod 'GoogleSignIn'
-    end
+    end    
+
+    target 'Strongbox-iOS-SCOTUS' do
+        use_frameworks!
+
+        pod 'MTBBarcodeScanner'
+
+        pod 'Reachability'
+        pod 'ISMessages'
+    end    
+
+    target 'Strongbox-Auto-Fill' do
 
-   target 'Strongbox-Auto-Fill' do
+    end
 
-   end
+    target 'Strongbox-Auto-Fill-Pro' do
 
-   target 'Strongbox-Auto-Fill-Family' do
+    end
 
-   end
+    target 'Strongbox-Auto-Fill-SCOTUS' do 
+    end
 end

Podfile.lock

@@ -6,18 +6,18 @@ PODS:
   - AppAuth/Core (1.4.0)
   - AppAuth/ExternalUserAgent (1.4.0)
   - Base32 (1.1.2)
-  - GoogleAPIClientForREST/Core (1.5.1):
+  - GoogleAPIClientForREST/Core (1.5.2):
     - GTMSessionFetcher (>= 1.1.7)
-  - GoogleAPIClientForREST/Drive (1.5.1):
+  - GoogleAPIClientForREST/Drive (1.5.2):
     - GoogleAPIClientForREST/Core
     - GTMSessionFetcher (>= 1.1.7)
   - GoogleSignIn (5.0.2):
     - AppAuth (~> 1.2)
     - GTMAppAuth (~> 1.0)
     - GTMSessionFetcher/Core (~> 1.1)
-  - GTMAppAuth (1.1.0):
+  - GTMAppAuth (1.2.2):
     - AppAuth/Core (~> 1.4)
-    - GTMSessionFetcher (~> 1.4)
+    - GTMSessionFetcher/Core (~> 1.5)
   - GTMSessionFetcher (1.5.0):
     - GTMSessionFetcher/Full (= 1.5.0)
   - GTMSessionFetcher/Core (1.5.0)
@@ -26,7 +26,7 @@ PODS:
   - ISMessages (1.3.1)
   - libsodium (1.0.12)
   - MTBBarcodeScanner (5.0.11)
-  - ObjectiveDropboxOfficial (5.0.5)
+  - ObjectiveDropboxOfficial (6.0.0)
   - OneDriveSDK (1.3.0):
     - OneDriveSDK/Auth (= 1.3.0)
     - OneDriveSDK/Common (= 1.3.0)
@@ -78,17 +78,17 @@ SPEC CHECKSUMS:
   ADAL: f2eb2158b9bcd2c8416ff2d026c176b98ea6651f
   AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
   Base32: 163c298644d184e89ca4e00a996bad6bf5166390
-  GoogleAPIClientForREST: 4bb409633efcc2e1b3f945afe7e35039b5a61db2
+  GoogleAPIClientForREST: 538a8ad0014fd88b78894e77100775a6b0a4f7ed
   GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213
-  GTMAppAuth: 197a8dabfea5d665224aa00d17f164fc2248dab9
+  GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
   GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
   ISMessages: 562cddc3e960359de95f934a4e5c4e1f4ea6fd7d
   libsodium: 9a8faa5ef2fa0d2d57bd7f7d79bf8fb7c1a9f0ea
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  ObjectiveDropboxOfficial: 9ba0f4a3a9fdc914c2e660d759957328dd6cd744
+  ObjectiveDropboxOfficial: bca5b00db1989dd1999c04a70ac4f5e782cc1e54
   OneDriveSDK: 90ab8781f0992c37d96b68cc340585f5cf36701f
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
 
-PODFILE CHECKSUM: 676165795f2c1ee9cad346bc6c154be28bd72dc7
+PODFILE CHECKSUM: 59922f097286d2bc6b90d59ec1289342643909cd
 
 COCOAPODS: 1.10.0

StrongBox Auto Fill/AutoFillPreferencesViewController.h

@@ -8,10 +8,11 @@
 
 #import <UIKit/UIKit.h>
 #import "Model.h"
+#import "StaticDataTableViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface AutoFillPreferencesViewController : UITableViewController
+@interface AutoFillPreferencesViewController : StaticDataTableViewController
 
 @property Model* viewModel;
 

StrongBox Auto Fill/AutoFillPreferencesViewController.m

@@ -21,31 +21,108 @@ @interface AutoFillPreferencesViewController ()
 
 @property (weak, nonatomic) IBOutlet UISwitch *switchAutoFill;
 @property (weak, nonatomic) IBOutlet UISwitch *switchQuickTypeAutoFill;
-@property (weak, nonatomic) IBOutlet UITableViewCell *cellQuickTypeFormat;
 @property (weak, nonatomic) IBOutlet UILabel *labelQuickTypeFormat;
-@property (weak, nonatomic) IBOutlet UITableViewCell *cellConvenienceAutoUnlock;
 @property (weak, nonatomic) IBOutlet UILabel *labelConvenienceAutoUnlockTimeout;
 @property (weak, nonatomic) IBOutlet UISwitch *switchCopyTOTP;
 @property (weak, nonatomic) IBOutlet UISwitch *switchAutoLaunchSingle;
 @property (weak, nonatomic) IBOutlet UISwitch *switchShowPinned;
 
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellSystemLevelEnabled;
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellSystemLevelDisabled;
+
+
+@property (weak, nonatomic) IBOutlet UITableViewCell *howTo1;
+@property (weak, nonatomic) IBOutlet UITableViewCell *howTo2;
+@property (weak, nonatomic) IBOutlet UITableViewCell *howTo3;
+@property (weak, nonatomic) IBOutlet UITableViewCell *howTo4;
+@property (weak, nonatomic) IBOutlet UITableViewCell *howTo5;
+@property (weak, nonatomic) IBOutlet UITableViewCell *howTo6;
+
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellAllowAutoFill;
+
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellAllowQuickType;
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellQuickTypeFormat;
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellCopyTotp;
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellAutoLaunchDatabase;
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellAutoSelectSingle;
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellShowPinned;
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellConvenienceAutoUnlock;
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellUseHostOnly;
+@property (weak, nonatomic) IBOutlet UITableViewCell *cellAddServiceIds;
+
 @end
 
 @implementation AutoFillPreferencesViewController
 
+- (void)dealloc {
+    [NSNotificationCenter.defaultCenter removeObserver:self];
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
 
+    [NSNotificationCenter.defaultCenter addObserver:self
+                                           selector:@selector(bind)
+                                               name:UIApplicationDidBecomeActiveNotification
+                                             object:nil];
+
     [self bind];
 }
 
 - (void)bind {
-    self.autoProceed.on = AppPreferences.sharedInstance.autoProceedOnSingleMatch;
-    self.addServiceIds.on = AppPreferences.sharedInstance.storeAutoFillServiceIdentifiersInNotes;
-    self.useHostOnlyUrl.on = !AppPreferences.sharedInstance.useFullUrlAsURLSuggestion;
+    BOOL onForStrongbox = AutoFillManager.sharedInstance.isOnForStrongbox;
+    
+    
+    
+    UIImage* check;
+    UIImage* notCheck;
+
+    if (@available(iOS 13.0, *)) {
+        check = [UIImage systemImageNamed:@"checkmark.circle"];
+        notCheck = [UIImage systemImageNamed:@"exclamationmark.triangle"];
+    } else {
+        check = [UIImage imageNamed:@"ok"];
+        notCheck = [UIImage imageNamed:@"error"];
+    }
+    
+    self.cellSystemLevelEnabled.imageView.image = check;
+    self.cellSystemLevelEnabled.imageView.tintColor = UIColor.systemGreenColor;
+
+    self.cellSystemLevelDisabled.imageView.image = notCheck;
+    self.cellSystemLevelDisabled.imageView.tintColor = UIColor.systemOrangeColor;
+
+    [self cell:self.cellSystemLevelEnabled setHidden:!onForStrongbox];
+    [self cell:self.cellSystemLevelDisabled setHidden:onForStrongbox];
+    
+    
 
+    [self cell:self.howTo1 setHidden:onForStrongbox];
+    [self cell:self.howTo2 setHidden:onForStrongbox];
+    [self cell:self.howTo3 setHidden:onForStrongbox];
+    [self cell:self.howTo4 setHidden:onForStrongbox];
+    [self cell:self.howTo5 setHidden:onForStrongbox];
+    [self cell:self.howTo6 setHidden:onForStrongbox];
+    
+    
+    
+    [self cell:self.cellAllowAutoFill setHidden:!onForStrongbox];
+
     self.switchAutoFill.on = self.viewModel.metadata.autoFillEnabled;
 
+    BOOL on = onForStrongbox && self.viewModel.metadata.autoFillEnabled;
+    
+    
+    
+    [self cell:self.cellAllowQuickType setHidden:!on];
+    [self cell:self.cellQuickTypeFormat setHidden:!on];
+    [self cell:self.cellCopyTotp setHidden:!on];
+    [self cell:self.cellAutoLaunchDatabase setHidden:!on];
+    [self cell:self.cellAutoSelectSingle setHidden:!on];
+    [self cell:self.cellShowPinned setHidden:!on];
+    [self cell:self.cellConvenienceAutoUnlock setHidden:!on];
+    [self cell:self.cellUseHostOnly setHidden:!on];
+    [self cell:self.cellAddServiceIds setHidden:!on];
+    
 
 
     self.switchQuickTypeAutoFill.on = self.viewModel.metadata.autoFillEnabled && self.viewModel.metadata.quickTypeEnabled;
@@ -62,6 +139,14 @@ - (void)bind {
         self.labelQuickTypeFormat.textColor = self.switchQuickTypeAutoFill.on ? UIColor.blackColor : UIColor.lightGrayColor;
     }
 
+
+    
+    
+    self.autoProceed.on = AppPreferences.sharedInstance.autoProceedOnSingleMatch;
+    self.switchCopyTOTP.on = self.viewModel.metadata.autoFillCopyTotp;
+    self.switchAutoLaunchSingle.on = AppPreferences.sharedInstance.autoFillAutoLaunchSingleDatabase;
+    self.switchShowPinned.on = AppPreferences.sharedInstance.autoFillShowPinned;
+    
 
 
     self.cellConvenienceAutoUnlock.userInteractionEnabled = self.viewModel.metadata.autoFillEnabled;
@@ -76,15 +161,10 @@ - (void)bind {
 
 
 
-    self.switchAutoLaunchSingle.on = AppPreferences.sharedInstance.autoFillAutoLaunchSingleDatabase;
-    
-    
-    
-    self.switchCopyTOTP.on = self.viewModel.metadata.autoFillCopyTotp;
-    
-    
+    self.addServiceIds.on = AppPreferences.sharedInstance.storeAutoFillServiceIdentifiersInNotes;
+    self.useHostOnlyUrl.on = !AppPreferences.sharedInstance.useFullUrlAsURLSuggestion;
 
-    self.switchShowPinned.on = AppPreferences.sharedInstance.autoFillShowPinned;
+    [self reloadDataAnimated:YES];
 }
 
 static NSString* stringForConvenienceAutoUnlock(NSInteger val) {

StrongBox Auto Fill/CloudSessionsTableViewController.m

@@ -6,13 +6,16 @@
 //  Copyright © 2014-2021 Mark McGuill. All rights reserved.
 //
 
+#ifndef NO_3RD_PARTY_STORAGE_PROVIDERS
+
 #import "CloudSessionsTableViewController.h"
-#import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>
-#import "GoogleDriveManager.h"
-#import "OneDriveStorageProvider.h"
 #import "Alerts.h"
 #import "AppPreferences.h"
 
+#import "OneDriveStorageProvider.h"
+#import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>
+#import "GoogleDriveManager.h"
+
 @interface CloudSessionsTableViewController ()
 
 @property NSArray* rows;
@@ -74,6 +77,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    
     if(indexPath.row == 0) {
         [self onSignoutGoogleDrive];
     }
@@ -82,11 +86,13 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     }
     else if(indexPath.row == 2) {
         [self onSignoutOneDrive];
+
     }
 
     [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
 }
 
+
 - (void)onSignoutGoogleDrive {
     [Alerts checkThirdPartyLibOptInOK:self completion:^(BOOL optInOK) {
         if ( !optInOK ) {
@@ -154,6 +160,7 @@ - (void)onSignoutOneDrive {
         if ( !optInOK ) {
             return;
         }
+        
         if ([OneDriveStorageProvider.sharedInstance isSignedIn]) {
             [Alerts yesNo:self
                     title:NSLocalizedString(@"cloud_sessions_prompt_signout_onedrive_title", @"Sign out of OneDrive?")
@@ -190,3 +197,6 @@ - (void)onSignoutOneDrive {
 }
 
 @end
+
+#endif
+