From 8a09818828c81ddc014f579b43aec4f6081e25e7 Mon Sep 17 00:00:00 2001
From: "matt123337@hotmail.com" <matt123337@hotmail.com>
Date: Fri, 27 Feb 2015 13:28:44 -0500
Subject: [PATCH] Fixed a few small mistakes from last commit, added new proxy
 type "NONE"

---
 .../core/network/proxy/ProxySocket.java       |  4 +--
 .../parabot/core/network/proxy/ProxyType.java |  2 +-
 .../src/org/parabot/core/ui/NetworkUI.java    | 25 +++++++++++++++----
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/parabotv2/src/org/parabot/core/network/proxy/ProxySocket.java b/parabotv2/src/org/parabot/core/network/proxy/ProxySocket.java
index d4ad9e2..e01698b 100644
--- a/parabotv2/src/org/parabot/core/network/proxy/ProxySocket.java
+++ b/parabotv2/src/org/parabot/core/network/proxy/ProxySocket.java
@@ -24,7 +24,7 @@ public class ProxySocket extends Socket {
 
 	private static List<ProxySocket> connections = new ArrayList<ProxySocket>();
 
-	private static ProxyType proxyType = ProxyType.HTTP;
+	private static ProxyType proxyType = ProxyType.NONE;
 
 	private static int proxyPort = 0;
 
@@ -96,7 +96,7 @@ public class ProxySocket extends Socket {
 			this.addr = InetAddress.getByName(isa.getHostString());
 			this.port = isa.getPort();
 		}
-		if (proxyInetAddress != null && proxyPort > 0) {
+		if (proxyType != ProxyType.NONE) {
 			try {
 				super.connect(cachedAddr = new InetSocketAddress(
 						proxyInetAddress, proxyPort));
diff --git a/parabotv2/src/org/parabot/core/network/proxy/ProxyType.java b/parabotv2/src/org/parabot/core/network/proxy/ProxyType.java
index 061bfc6..cf365ee 100644
--- a/parabotv2/src/org/parabot/core/network/proxy/ProxyType.java
+++ b/parabotv2/src/org/parabot/core/network/proxy/ProxyType.java
@@ -1,5 +1,5 @@
 package org.parabot.core.network.proxy;
 
 public enum ProxyType {
-	SOCKS5, SOCKS4, HTTP
+	NONE,SOCKS5, SOCKS4, HTTP
 }
\ No newline at end of file
diff --git a/parabotv2/src/org/parabot/core/ui/NetworkUI.java b/parabotv2/src/org/parabot/core/ui/NetworkUI.java
index dcce19c..0ca1fe4 100644
--- a/parabotv2/src/org/parabot/core/ui/NetworkUI.java
+++ b/parabotv2/src/org/parabot/core/ui/NetworkUI.java
@@ -14,6 +14,7 @@ import javax.swing.JComboBox;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JList;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.JScrollPane;
@@ -66,6 +67,7 @@ public class NetworkUI extends JFrame implements KeyListener, ActionListener,
 			proxyHost.setText(ProxySocket.getProxyAddress().getHostName());
 		proxyPort.setText("" + ProxySocket.getProxyPort());
 		proxyType.setSelectedItem(ProxySocket.getProxyType());
+		authCheckBox.setSelected(ProxySocket.auth);
 		setLocationRelativeTo(BotUI.getInstance());
 		super.setVisible(b);
 	}
@@ -224,12 +226,15 @@ public class NetworkUI extends JFrame implements KeyListener, ActionListener,
 	@Override
 	public void actionPerformed(ActionEvent arg0) {
 		boolean b = false;
-		
+
 		if (arg0.getSource() == proxyType) {
-			authCheckBox.setEnabled(proxyType.getSelectedItem() == ProxyType.SOCKS5);
+			Object o = proxyType.getSelectedItem();
+			authCheckBox.setEnabled(o == ProxyType.SOCKS5);
+			proxyHost.setEnabled(o != ProxyType.NONE);
+			proxyPort.setEnabled(o != ProxyType.NONE);
 			b = true;
 		}
-		
+
 		if (b || arg0.getSource() == authCheckBox) {
 			b = authCheckBox.isSelected() && authCheckBox.isEnabled();
 			ProxySocket.auth = b;
@@ -237,8 +242,18 @@ public class NetworkUI extends JFrame implements KeyListener, ActionListener,
 			authPassword.setEnabled(b);
 			return;
 		}
-		
-		ProxySocket.setLogin(authUsername.getText(), authPassword.getPassword());
+
+		if (proxyType.getSelectedItem() != ProxyType.NONE) {
+			if (proxyPort.getText().equals("")
+					|| proxyHost.getText().equals("")) {
+				UILog.log("Error", "Please supply proxy information!",
+						JOptionPane.ERROR_MESSAGE);
+				return;
+			}
+		}
+
+		ProxySocket
+				.setLogin(authUsername.getText(), authPassword.getPassword());
 
 		byte[] mac = new byte[macList.length];
 		for (int i = 0; i < mac.length; i++)