From d9f773eae0bf2d158012dfe55139ffdc6b1c57ff Mon Sep 17 00:00:00 2001
From: Max <post@wickenrode.com>
Date: Tue, 27 Feb 2018 23:56:36 +0100
Subject: Manually roll back all changes for #2979

Those will be moved to a different branch for the time being since other stuff needs to be changed first
---
 Source/SPConnectionController.h | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'Source/SPConnectionController.h')

diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h
index 44b0a89f..2da8f58a 100644
--- a/Source/SPConnectionController.h
+++ b/Source/SPConnectionController.h
@@ -69,8 +69,6 @@
 	BOOL isConnecting;
 	BOOL isEditingConnection;
 	BOOL isTestingConnection;
-	NSString *agreedInsecurePlugin;
-	NSString *insecureOverridePassword;
 	
 	// Standard details
 	NSInteger previousType;
@@ -166,10 +164,6 @@
     IBOutlet NSMenuItem *favoritesSortByMenuItem;
 	IBOutlet NSView *exportPanelAccessoryView;
 	IBOutlet NSView *editButtonsView;
-
-	IBOutlet NSView *requestPasswordAccessoryView;
-	IBOutlet NSTextField *requestPasswordPluginNameField;
-	IBOutlet NSSecureTextField *requestPasswordPasswordField;
 	
 	BOOL isEditingItemName;
     BOOL reverseFavoritesSort;
@@ -214,24 +208,11 @@
 @property (readwrite, assign) NSInteger sshKeyLocationEnabled;
 @property (readwrite, retain) NSString *sshKeyLocation;
 @property (readwrite, retain) NSString *sshPort;
-@property (readwrite, copy, nonatomic) NSString *connectionKeychainID;
 @property (readwrite, retain) NSString *connectionKeychainItemName;
 @property (readwrite, retain) NSString *connectionKeychainItemAccount;
 @property (readwrite, retain) NSString *connectionSSHKeychainItemName;
 @property (readwrite, retain) NSString *connectionSSHKeychainItemAccount;
 @property (readwrite, assign) BOOL useCompression;
-/**
- * If the user was prompted to allow a connection with an insecure auth plugin,
- * the name of that plugin will be stored here (not persisted) so that we
- * don't have to ask again when duplicating a connection/reconnecting.
- */
-@property (readwrite, copy, nonatomic) NSString *agreedInsecurePlugin;
-/**
- * If the user has given a password that is not the keychain password in
- * the insecure auth plugin request, we will store it in memory and keep the
- * other properties unchanged, since they are connected to GUI and/or backing stores
- */
-@property (readwrite, copy, nonatomic) NSString *insecureOverridePassword;
 
 #ifdef SP_CODA
 @property (readwrite, assign) SPDatabaseDocument *dbDocument;
@@ -240,10 +221,6 @@
 @property (readonly, assign) BOOL isConnecting;
 @property (readonly, assign) BOOL isEditingConnection;
 
-- (NSString *)keychainPassword;
-- (NSString *)keychainPasswordForSSH;
-- (NSString *)actualPasswordForAuthPlugin:(NSString *)pluginName;
-
 // Connection processes
 - (IBAction)initiateConnection:(id)sender;
 - (IBAction)cancelConnection:(id)sender;
-- 
cgit v1.2.3