Merge pull request #678 from Sequel-Ace/keychainImprovements

Keychain improvements and safety checks #fixed
Sequel-Ace · Dec 23, 2020 · 4c3f1a8 · 4c3f1a8
2 parents ab1e3ea + 774aad5
commit 4c3f1a8
Show file tree

Hide file tree

Showing 17 changed files with 90 additions and 212 deletions.
diff --git a/Source/Controllers/MainViewControllers/ConnectionView/SPConnectionController.m b/Source/Controllers/MainViewControllers/ConnectionView/SPConnectionController.m
@@ -830,19 +830,19 @@ - (void)updateFavoriteSelection:(id)sender
 
 	// Clear the keychain referral items as appropriate
 	[self setConnectionKeychainID:nil];
-
-
-
-
 
 	SPTreeNode *node = [self selectedFavoriteNode];
 	if ([node isGroup]) node = nil;
 
 	// Update key-value properties from the selected favourite, using empty strings where not found
 	NSDictionary *fav = [[node representedObject] nodeFavorite];
+
+    // Don't prefill anything if we are not using favorite
+    if (!fav) {
+        return;
+    }
 
 	// Keep a copy of the favorite as it currently stands
-
 	currentFavorite = [fav copy];
 
 	[connectionResizeContainer setHidden:NO];
@@ -926,8 +926,6 @@ - (void)updateFavoriteSelection:(id)sender
 
 	if (![[self password] length]) {
 		[self setPassword:nil];
-
-
 	}
 
 	// Store the selected favorite ID for use with the document on connection
@@ -941,8 +939,6 @@ - (void)updateFavoriteSelection:(id)sender
 
 	if (![[self sshPassword] length]) {
 		[self setSshPassword:nil];
-
-
 	}
 
 	[prefs setInteger:[[fav objectForKey:SPFavoriteIDKey] integerValue] forKey:SPLastFavoriteID];

diff --git a/Source/Controllers/SPAppController.m b/Source/Controllers/SPAppController.m
@@ -48,7 +48,6 @@
 #import "SPBundleCommandRunner.h"
 #import "SPCopyTable.h"
 #import "SPSyntaxParser.h"
-#import "SPOSInfo.h"
 #import "SPTextView.h"
 #import <PSMTabBar/PSMTabBarControl.h>
 #import "SPFunctions.h"

diff --git a/Source/Controllers/SubviewControllers/HelpViewer/SPHelpViewerClient.m b/Source/Controllers/SubviewControllers/HelpViewer/SPHelpViewerClient.m
@@ -35,7 +35,6 @@
 #import "RegexKitLite.h"
 #import "MGTemplateEngine.h"
 #import "ICUTemplateMatcher.h"
-#import "SPOSInfo.h"
 
 typedef NS_ENUM(NSInteger, HelpVersionNumber) {
 	MySQLVer56 = 11,

diff --git a/Source/Controllers/SubviewControllers/HelpViewer/SPHelpViewerController.m b/Source/Controllers/SubviewControllers/HelpViewer/SPHelpViewerController.m
@@ -31,7 +31,6 @@
 
 #import "SPHelpViewerController.h"
 
-#import "SPOSInfo.h"
 #import <WebKit/WebKit.h>
 #import "sequel-ace-Swift.h"
 

diff --git a/Source/Controllers/SubviewControllers/SPAboutController.m b/Source/Controllers/SubviewControllers/SPAboutController.m
@@ -29,7 +29,6 @@
 //  More info at <https://github.com/sequelpro/sequelpro>
 
 #import "SPAboutController.h"
-#import "SPOSInfo.h"
 
 static NSString *SPSnapshotBuildIndicator = @"Beta";
 

diff --git a/Source/Model/SPTooltip.m b/Source/Model/SPTooltip.m
@@ -57,7 +57,6 @@
 //	See more possible syntaxa in SPTooltip to init a tooltip
 
 #import "SPTooltip.h"
-#import "SPOSInfo.h"
 
 #include <tgmath.h>
 
@@ -332,7 +331,7 @@ - (void)setContent:(NSString *)content withOptions:(NSDictionary *)displayOption
 				@"<body>%@</body>"
 				@"</html>";
 
-	NSString *tooltipColor = ([SPOSInfo isOSVersionAtLeastMajor:10 minor:10 patch:0])? @"#F0F0F0" : @"#F9FBC5";
+	NSString *tooltipColor = @"#F0F0F0";
 	NSString *bgColor = ([displayOptions objectForKey:@"backgroundcolor"]) ? [displayOptions objectForKey:@"backgroundcolor"] : tooltipColor;
 	BOOL isTransparent = ([displayOptions objectForKey:@"transparent"]) ? YES : NO;
 

diff --git a/Source/Other/DebuggingSupport/SPOSInfo.h b/Source/Other/DebuggingSupport/SPOSInfo.h
diff --git a/Source/Other/DebuggingSupport/SPOSInfo.m b/Source/Other/DebuggingSupport/SPOSInfo.m
diff --git a/Source/Other/Extensions/NSImageExtensions.swift b/Source/Other/Extensions/NSImageExtensions.swift
@@ -0,0 +1,9 @@
+//
+//  NSImageExtensions.swift
+//  Sequel Ace
+//
+//  Created by Jakub Kašpar on 23.12.2020.
+//  Copyright © 2020 Sequel-Ace. All rights reserved.
+//
+
+import Foundation