diff --git a/.gitignore b/.gitignore
index d3f5d3e..9539001 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,19 @@ gen/
 
 # Local configuration file (sdk path, etc)
 local.properties
+
+# IntelliJ
+*.iws
+*.ipr
+*.iml
+
+# These dependencies should be resolved in other way, probably through maven.
+# If you're not using maven for your Android project
+# - clone https://github.com/fusesource/mqtt-client
+# - run `mvn install`
+# - copy the files from the ~/.m2/repository/ directory
+libs/hawtbuf-1.9.jar
+libs/hawtdispatch-1.12.jar
+libs/hawtdispatch-transport-1.12.jar
+libs/mqtt-client-1.5-SNAPSHOT.jar
+
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 395e191..a9d7ac1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.example.mqtt"
-    android:versionCode="1"
-    android:versionName="1.0" >
+          package="org.example.mqtt"
+          android:versionCode="2"
+          android:versionName="1.1">
 
-    <uses-sdk android:minSdkVersion="10" />
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
+            android:icon="@drawable/ic_launcher"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Light">
         <activity
-            android:name="org.example.mqtt.MQTTActivity"
-            android:label="@string/app_name" >
+                android:name="org.example.mqtt.MQTTActivity"
+                android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/res/layout-large/main.xml b/res/layout-large/main.xml
new file mode 100644
index 0000000..149e369
--- /dev/null
+++ b/res/layout-large/main.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+
+        android:id="@+id/scrollView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:id="@+id/linearLayout1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="10dp">
+
+        <TableLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            <TableRow>
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Address:"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+                <Spinner
+                        android:id="@+id/spnProtocol"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        />
+                <EditText
+                        android:id="@+id/addressEditText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:lines="1"
+                        android:inputType="text|textNoSuggestions">
+                    <requestFocus/>
+                </EditText>
+            </TableRow>
+            <TableRow>
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="User Name:"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+                <EditText
+                        android:id="@+id/userNameEditText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:inputType="text|textNoSuggestions"/>
+            </TableRow>
+            <TableRow>
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Password:"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+                <EditText
+                        android:id="@+id/passwordEditText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:inputType="textPassword"/>
+            </TableRow>
+        </TableLayout>
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+            <Button android:id="@+id/btnConnect"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="Connect"
+                    android:onClick="doConnect"
+                    />
+
+            <Button android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="Disconnect"
+                    android:onClick="doDisconnect"
+                    />
+        </LinearLayout>
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Destination:"
+                android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+        <EditText
+                android:id="@+id/destinationEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+
+        <TextView
+                android:id="@+id/textView4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Message:"
+                android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+        <EditText
+                android:id="@+id/messageEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:inputType="textMultiLine"
+                android:lines="2"/>
+
+        <Button android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Send"
+                android:onClick="doSend"
+                />
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Received:"
+                android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+        <EditText
+                android:id="@+id/receiveEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="none|textMultiLine"
+                android:lines="2"/>
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index e05a997..17cac60 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,136 +1,119 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+<ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
 
-    <ScrollView
         android:id="@+id/scrollView1"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
 
-        <LinearLayout
+    <LinearLayout
             android:id="@+id/linearLayout1"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="10dp">
 
-            <LinearLayout
-                android:id="@+id/linearLayout3"
+        <TableLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content">
 
+            <TableRow>
                 <TextView
-                    android:id="@+id/textView1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Address:"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Address:"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                 <EditText
-                    android:id="@+id/addressEditText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:lines="1" >
-
-                    <requestFocus />
+                        android:id="@+id/addressEditText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:lines="1"
+                        android:inputType="text|textNoSuggestions">
+                    <requestFocus/>
                 </EditText>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/linearLayout4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/linearLayout5"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
+            </TableRow>
+            <TableRow>
+                <View/>
+                <Spinner
+                        android:id="@+id/spnProtocol"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        />
+            </TableRow>
+            <TableRow>
                 <TextView
-                    android:id="@+id/textView6"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="User Name:"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="User Name:"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                 <EditText
-                    android:id="@+id/userNameEditText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/linearLayout6"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
+                        android:id="@+id/userNameEditText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:inputType="text|textNoSuggestions"/>
+            </TableRow>
+            <TableRow>
                 <TextView
-                    android:id="@+id/textView7"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Password:"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Password:"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                 <EditText
-                    android:id="@+id/passwordEditText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:inputType="textPassword" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/linearLayout2"
+                        android:id="@+id/passwordEditText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:inputType="textPassword"/>
+            </TableRow>
+        </TableLayout>
+        <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
+                android:orientation="horizontal">
 
-                <Button
-                    android:id="@+id/connectButton"
+            <Button android:id="@+id/btnConnect"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="Connect" />
+                    android:text="Connect"
+                    android:onClick="doConnect"
+                    />
 
-                <Button
-                    android:id="@+id/disconnectButton"
-                    android:layout_width="wrap_content"
+            <Button android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Disconnect" android:layout_weight="1"/>
-
-            </LinearLayout>
+                    android:layout_weight="1"
+                    android:text="Disconnect"
+                    android:onClick="doDisconnect"
+                    />
+        </LinearLayout>
 
-            <TextView
-                android:id="@+id/textView3"
+        <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="Destination:"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-            <EditText
+        <EditText
                 android:id="@+id/destinationEditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1" />
+                android:layout_weight="1"/>
 
-            <TextView
+        <TextView
                 android:id="@+id/textView4"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="Message:"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-            <EditText
+        <EditText
                 android:id="@+id/messageEditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -138,28 +121,25 @@
                 android:inputType="textMultiLine"
                 android:lines="2"/>
 
-            <Button
-                android:id="@+id/sendButton"
-                android:layout_width="fill_parent"
+        <Button android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Send" />
+                android:text="Send"
+                android:onClick="doSend"
+                />
 
-            <TextView
-                android:id="@+id/textView5"
+        <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Received:"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-            <EditText
+        <EditText
                 android:id="@+id/receiveEditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="none|textMultiLine"
-                android:lines="2" />
-
-        </LinearLayout>
-    </ScrollView>
+                android:lines="2"/>
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/org/example/mqtt/MQTTActivity.java b/src/org/example/mqtt/MQTTActivity.java
index 8bfb1ed..4c9173a 100644
--- a/src/org/example/mqtt/MQTTActivity.java
+++ b/src/org/example/mqtt/MQTTActivity.java
@@ -1,281 +1,289 @@
 package org.example.mqtt;
 
-import java.net.URISyntaxException;
-
-import org.fusesource.mqtt.client.Callback;
-import org.fusesource.mqtt.client.FutureConnection;
-import org.fusesource.mqtt.client.MQTT;
-import org.fusesource.mqtt.client.Message;
-import org.fusesource.mqtt.client.QoS;
-import org.fusesource.mqtt.client.Topic;
-
-import org.example.mqtt.R;
-
 import android.app.Activity;
 import android.app.ProgressDialog;
-import android.content.pm.ActivityInfo;
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.TextView;
 import android.widget.Toast;
+import org.fusesource.mqtt.client.Callback;
+import org.fusesource.mqtt.client.FutureConnection;
+import org.fusesource.mqtt.client.MQTT;
+import org.fusesource.mqtt.client.Message;
+import org.fusesource.mqtt.client.QoS;
+import org.fusesource.mqtt.client.Topic;
+
+import java.net.URISyntaxException;
+
+public class MQTTActivity extends Activity {
+
+    private final String TAG = "MQTTClient";
+
+    EditText addressET = null;
+    EditText destinationET = null;
+    EditText messageET = null;
+    EditText receiveET = null;
+    EditText userNameET = null;
+    EditText passwordET = null;
+
+    Button connectButton = null;
+    Button disconnectButton = null;
+    Button sendButton = null;
+
+    Spinner spnProtocol;
+
+    private ProgressDialog progressDialog = null;
+
+    String sAddress = null;
+    String sUserName = null;
+    String sPassword = null;
+    String sDestination = null;
+    String sMessage = null;
+
+    MQTT mqtt = null;
+
+    FutureConnection connection = null;
 
-public class MQTTActivity extends Activity implements OnClickListener{
-	
-	private final String TAG = "MQTTClient";
-	
-	EditText addressET = null;
-	EditText destinationET = null;
-	EditText messageET = null;
-	EditText receiveET = null;
-	EditText userNameET = null;
-	EditText passwordET = null;
-	
-	Button connectButton = null;
-	Button disconnectButton = null;
-	Button sendButton = null;
-	
-	private ProgressDialog progressDialog = null;
-	
-	String sAddress = null;
-	String sUserName = null;
-	String sPassword = null;
-	String sDestination = null;
-	String sMessage = null;
-	
-	MQTT mqtt = null;
-	
-	FutureConnection connection = null;
-	
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
-        
+
         setupView();
     }
-    
+
     @Override
-    public void onPause()
-    {
-    	super.onPause();
-    	
-    	disconnect();
+    protected void onResume() {
+        super.onResume();
+
+        restoreConnectionDetails();
     }
-    
-    public void setupView()
-    {
-    	// lock the screen in portrait mode
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-    	
-    	addressET = (EditText)findViewById(R.id.addressEditText);
-    	addressET.setHint("tcp://192.168.1.15:1883");
-    	userNameET = (EditText)findViewById(R.id.userNameEditText);
-    	passwordET = (EditText)findViewById(R.id.passwordEditText);
-    	destinationET = (EditText)findViewById(R.id.destinationEditText);
-    	messageET = (EditText)findViewById(R.id.messageEditText);
-    	receiveET = (EditText)findViewById(R.id.receiveEditText);
-    	
-    	connectButton = (Button)findViewById(R.id.connectButton);
-    	connectButton.setOnClickListener(this);
-    	
-    	disconnectButton = (Button)findViewById(R.id.disconnectButton);
-    	disconnectButton.setOnClickListener(this);
-    	
-    	sendButton = (Button)findViewById(R.id.sendButton);
-    	sendButton.setOnClickListener(this);
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        disconnect();
+    }
+
+    public void setupView() {
+        spnProtocol = (Spinner) findViewById(R.id.spnProtocol);
+        spnProtocol.setAdapter(new ProtocolSpinnerAdapter());
+        addressET = (EditText) findViewById(R.id.addressEditText);
+        addressET.setHint("192.168.1.15:1883");
+        userNameET = (EditText) findViewById(R.id.userNameEditText);
+        passwordET = (EditText) findViewById(R.id.passwordEditText);
+        destinationET = (EditText) findViewById(R.id.destinationEditText);
+        messageET = (EditText) findViewById(R.id.messageEditText);
+        receiveET = (EditText) findViewById(R.id.receiveEditText);
+
+        connectButton = (Button) findViewById(R.id.btnConnect);
+    }
+
+    public void doConnect(View view) {
+        sAddress = addressET.getText().toString().trim();
+        sUserName = userNameET.getText().toString().trim();
+        sPassword = passwordET.getText().toString().trim();
+
+        if (sAddress.equals("")) {
+            toast("Address must be provided");
+        } else {
+            connect();
+        }
     }
 
-	public void onClick(View v) {
-		if(v == connectButton)
-		{
-			sAddress = addressET.getText().toString().trim();
-			sUserName = userNameET.getText().toString().trim();
-			sPassword = passwordET.getText().toString().trim();
-			
-			if(sAddress.equals(""))
-			{
-				toast("Address must be provided");
-			}
-			else
-			{
-				connect();
-			}
-		}
-		
-		if(v == disconnectButton)
-		{
-			disconnect();
-		}
-		
-		if(v == sendButton)
-		{
-			sDestination = destinationET.getText().toString().trim();
-			sMessage = messageET.getText().toString().trim();
-			
-			// allow empty messages
-			if(sDestination.equals(""))
-			{
-				toast("Destination must be provided");
-			}
-			else
-			{
-				send();
-			}	
-		}
-	}
-	
-	// callback used for Future
-	<T> Callback<T> onui(final Callback<T> original) {
-		return new Callback<T>() {
-			public void onSuccess(final T value) {
-				runOnUiThread(new Runnable(){
-					public void run() {
-						original.onSuccess(value);
-					}
-				});
-			}
-			public void onFailure(final Throwable error) {
-				runOnUiThread(new Runnable(){
-					public void run() {
-						original.onFailure(error);
-					}
-				});
-			}
-		};
-	}
-	
-	private void connect()
-	{
-		mqtt = new MQTT();
-		mqtt.setClientId("android-mqtt-example");
-
-		try
-		{
-			mqtt.setHost(sAddress);
-			Log.d(TAG, "Address set: " + sAddress);
-		}
-		catch(URISyntaxException urise)
-		{
-			Log.e(TAG, "URISyntaxException connecting to " + sAddress + " - " + urise);
-		}
-		
-		if(sUserName != null && !sUserName.equals(""))
-		{
-			mqtt.setUserName(sUserName);
-			Log.d(TAG, "UserName set: [" + sUserName + "]");
-		}
-		
-		if(sPassword != null && !sPassword.equals(""))
-		{
-			mqtt.setPassword(sPassword);
-			Log.d(TAG, "Password set: [" + sPassword + "]");
-		}
-		
-		connection = mqtt.futureConnection();
-		progressDialog = ProgressDialog.show(this, "", 
-                "Connecting...", true);
-		connection.connect().then(onui(new Callback<Void>(){
-			public void onSuccess(Void value) {
-				connectButton.setEnabled(false);
-				progressDialog.dismiss();
-				toast("Connected");
-			}
-			public void onFailure(Throwable e) {
-				toast("Problem connecting to host");
-				Log.e(TAG, "Exception connecting to " + sAddress + " - " + e);
-				progressDialog.dismiss();
-			}
-		}));
-
-	}
-	
-	private void disconnect()
-	{
-		connectButton.setEnabled(true);
-		try
-		{
-			if(connection != null && connection.isConnected())
-			{
-				connection.disconnect().then(onui(new Callback<Void>(){
-					public void onSuccess(Void value) {
-						connectButton.setEnabled(true);
-						toast("Disconnected");
-					}
-					public void onFailure(Throwable e) {
-						toast("Problem disconnecting");
-						Log.e(TAG, "Exception disconnecting from " + sAddress + " - " + e);
-					}
-				}));
-			}
-			else
-			{
-				toast("Not Connected");
-			}
-		}
-		catch(Exception e)
-		{
-			Log.e(TAG, "Exception " + e);
-		}
-	}
-	
-	private void send()
-	{
-		if(connection != null)
-		{
-			// automatically connect if no longer connected
-			if(!connection.isConnected())
-			{
-				connect();
-			}
-			
-			Topic[] topics = {new Topic(sDestination, QoS.AT_LEAST_ONCE)};
-			connection.subscribe(topics).then(onui(new Callback<byte[]>() {
-				public void onSuccess(byte[] subscription) {
-					
-					Log.d(TAG, "Destination: " + sDestination);
-					Log.d(TAG, "Message: " + sMessage);
-					
-					// publish message
-					connection.publish(sDestination, sMessage.getBytes(), QoS.AT_LEAST_ONCE, false);
-					destinationET.setText("");
-					messageET.setText("");
-					toast("Message sent");
-					
-					// receive message
-					connection.receive().then(onui(new Callback<Message>() {
-						public void onSuccess(Message message) {
-							String receivedMesageTopic = message.getTopic();
-							byte[] payload = message.getPayload();
-							String messagePayLoad = new String(payload);
-							message.ack();
-							connection.unsubscribe(new String[]{sDestination});
-							receiveET.setText(receivedMesageTopic + ":" + messagePayLoad);
-						}
-						
-						public void onFailure(Throwable e) {
-							Log.e(TAG, "Exception receiving message: " + e);
-						}
-					}));
-					
-				}
-				
-				public void onFailure(Throwable e) {
-					Log.e(TAG, "Exception sending message: " + e);
-				}
-			}));
-		}
-		else
-		{
-			toast("No connection has been made, please create the connection");
-		}
-	}
-	
-	private void toast(String message)
-	{
-		Toast.makeText(this, message, Toast.LENGTH_LONG).show();
-	}
+    public void doDisconnect(View view) {
+        disconnect();
+    }
+
+    public void doSend(View view) {
+        sDestination = destinationET.getText().toString().trim();
+        sMessage = messageET.getText().toString().trim();
+
+        // allow empty messages
+        if (sDestination.equals("")) {
+            toast("Destination must be provided");
+        } else {
+            send();
+        }
+    }
+
+    // callback used for Future
+    <T> Callback<T> onui(final Callback<T> original) {
+        return new Callback<T>() {
+            public void onSuccess(final T value) {
+                runOnUiThread(new Runnable() {
+                    public void run() {
+                        original.onSuccess(value);
+                    }
+                });
+            }
+
+            public void onFailure(final Throwable error) {
+                runOnUiThread(new Runnable() {
+                    public void run() {
+                        original.onFailure(error);
+                    }
+                });
+            }
+        };
+    }
+
+    private void connect() {
+        rememberConnectionDetails();
+
+        mqtt = new MQTT();
+        mqtt.setClientId("android-mqtt-example");
+
+        final String sAddress = spnProtocol.getSelectedItem().toString().toLowerCase() + "://" + this.sAddress;
+
+        try {
+            mqtt.setHost(sAddress);
+            Log.d(TAG, "Address set: " + sAddress);
+        } catch (URISyntaxException urise) {
+            Log.e(TAG, "URISyntaxException connecting to " + sAddress + " - " + urise);
+        }
+
+
+        if (sUserName != null && !sUserName.equals("")) {
+            mqtt.setUserName(sUserName);
+            Log.d(TAG, "UserName set: [" + sUserName + "]");
+        }
+
+        if (sPassword != null && !sPassword.equals("")) {
+            mqtt.setPassword(sPassword);
+            Log.d(TAG, "Password set: [" + sPassword + "]");
+        }
+
+            connection = mqtt.futureConnection();
+            progressDialog = ProgressDialog.show(this, "",
+                    "Connecting...", true);
+            connection.connect().then(onui(new Callback<Void>() {
+                public void onSuccess(Void value) {
+                    connectButton.setEnabled(false);
+                    progressDialog.dismiss();
+                    toast("Connected");
+                }
+
+                public void onFailure(Throwable e) {
+                    toast("Problem connecting to host");
+                    Log.e(TAG, "Exception connecting to " + sAddress + " - " + e);
+                    progressDialog.dismiss();
+                }
+            }));
+    }
+
+    private void disconnect() {
+        connectButton.setEnabled(true);
+        try {
+            if (connection != null && connection.isConnected()) {
+                connection.disconnect().then(onui(new Callback<Void>() {
+                    public void onSuccess(Void value) {
+                        connectButton.setEnabled(true);
+                        toast("Disconnected");
+                    }
+
+                    public void onFailure(Throwable e) {
+                        toast("Problem disconnecting");
+                        Log.e(TAG, "Exception disconnecting from " + sAddress + " - " + e);
+                    }
+                }));
+            } else {
+                toast("Not Connected");
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Exception " + e);
+        }
+    }
+
+    private void send() {
+        if (connection == null) {
+            toast("No connection has been made, please create the connection");
+            return;
+        }
+        // automatically connect if no longer connected
+        if (!connection.isConnected()) {
+            connect();
+        }
+
+        Topic[] topics = {new Topic(sDestination, QoS.AT_LEAST_ONCE)};
+        connection.subscribe(topics).then(onui(new Callback<byte[]>() {
+            public void onSuccess(byte[] subscription) {
+                Log.d(TAG, "Destination: " + sDestination);
+                Log.d(TAG, "Message: " + sMessage);
+
+                // publish message
+                connection.publish(sDestination, sMessage.getBytes(), QoS.AT_LEAST_ONCE, false);
+                destinationET.setText("");
+                messageET.setText("");
+                toast("Message sent");
+
+                // receive message
+                connection.receive().then(onui(new Callback<Message>() {
+                    public void onSuccess(Message message) {
+                        String receivedMesageTopic = message.getTopic();
+                        byte[] payload = message.getPayload();
+                        String messagePayLoad = new String(payload);
+                        message.ack();
+                        connection.unsubscribe(new String[]{sDestination});
+                        receiveET.setText(receivedMesageTopic + ":" + messagePayLoad);
+                    }
+
+                    public void onFailure(Throwable e) {
+                        Log.e(TAG, "Exception receiving message: " + e);
+                    }
+                }));
+            }
+
+            public void onFailure(Throwable e) {
+                Log.e(TAG, "Exception sending message: " + e);
+            }
+        }));
+    }
+
+    private void toast(String message) {
+        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+    }
+
+    private class ProtocolSpinnerAdapter extends ArrayAdapter<String> {
+
+        public ProtocolSpinnerAdapter() {
+            super(MQTTActivity.this, android.R.layout.simple_spinner_dropdown_item, android.R.id.text1, new String[]{"TCP", "UDP"});
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            final View v = LayoutInflater.from(getContext()).inflate(android.R.layout.simple_spinner_item, null);
+            ((TextView) v.findViewById(android.R.id.text1)).setText(getItem(position));
+            return v;
+        }
+
+    }
+
+    private void restoreConnectionDetails() {
+        SharedPreferences s = getSharedPreferences("MQTT", Context.MODE_PRIVATE);
+        spnProtocol.setSelection(s.getInt("protocol", 0));
+        addressET.setText(s.getString("host", ""));
+        userNameET.setText(s.getString("username", ""));
+        passwordET.setText(s.getString("password", ""));
+    }
+
+    private void rememberConnectionDetails() {
+        SharedPreferences.Editor e = getSharedPreferences("MQTT", Context.MODE_PRIVATE).edit();
+        e.putInt("protocol", spnProtocol.getSelectedItemPosition());
+        e.putString("host", addressET.getText().toString());
+        e.putString("username", userNameET.getText().toString());
+        e.putString("password", passwordET.getText().toString());
+        e.commit();
+    }
 }
\ No newline at end of file