Attempting to fix #23. Also did some overall code cleanup to avoid context leaks.

DeveloperPaul123 · DeveloperPaul123 · commit 6d070a5afcb1 · 2016-03-21T21:40:49.000-04:00
diff --git a/app/src/main/java/com/devpaul/bluetoothutilitydemo/MainActivity.java b/app/src/main/java/com/devpaul/bluetoothutilitydemo/MainActivity.java
@@ -44,48 +44,36 @@ protected void onResume() {
         //object on the client side gets lost. Thus when send is called, nothing happens because it's
         //a different object.
         if(simpleBluetooth == null) {
-            simpleBluetooth = new SimpleBluetooth(this, this);
+            simpleBluetooth = new SimpleBluetooth(this, new SimpleBluetoothListener() {
+                @Override
+                public void onBluetoothDataReceived(byte[] bytes, String data) {
+                    //read the data coming in.
+                    Toast.makeText(MainActivity.this, "Data: " + data, Toast.LENGTH_SHORT).show();
+                    connectionState.setText("Data: " + data);
+                    isConnected = false;
+                    Log.w("SIMPLEBT", "Data received");
+                }
+
+                @Override
+                public void onDeviceConnected(BluetoothDevice device) {
+                    //a device is connected so you can now send stuff to it
+                    Toast.makeText(MainActivity.this, "Connected!", Toast.LENGTH_SHORT).show();
+                    connectionState.setText("Connected");
+                    isConnected = true;
+                    Log.w("SIMPLEBT", "Device connected");
+                }
+
+                @Override
+                public void onDeviceDisconnected(BluetoothDevice device) {
+                    // device was disconnected so connect it again?
+                    Toast.makeText(MainActivity.this, "Disconnected!", Toast.LENGTH_SHORT).show();
+                    connectionState.setText("Disconnected");
+                    Log.w("SIMPLEBT", "Device disconnected");
+                }
+            });
         }
         simpleBluetooth.initializeSimpleBluetooth();
         simpleBluetooth.setInputStreamType(BluetoothUtility.InputStreamType.BUFFERED);
-        simpleBluetooth.setSimpleBluetoothListener(new SimpleBluetoothListener() {
-
-            @Override
-            public void onBluetoothDataReceived(byte[] bytes, String data) {
-                //read the data coming in.
-                Toast.makeText(MainActivity.this, "Data: " + data, Toast.LENGTH_SHORT).show();
-                connectionState.setText("Data: " + data);
-                isConnected = false;
-                Log.w("SIMPLEBT", "Data received");
-            }
-
-            @Override
-            public void onDeviceConnected(BluetoothDevice device) {
-                //a device is connected so you can now send stuff to it
-                Toast.makeText(MainActivity.this, "Connected!", Toast.LENGTH_SHORT).show();
-                connectionState.setText("Connected");
-                isConnected = true;
-                Log.w("SIMPLEBT", "Device connected");
-            }
-
-            @Override
-            public void onDeviceDisconnected(BluetoothDevice device) {
-                // device was disconnected so connect it again?
-                Toast.makeText(MainActivity.this, "Disconnected!", Toast.LENGTH_SHORT).show();
-                connectionState.setText("Disconnected");
-                Log.w("SIMPLEBT", "Device disconnected");
-            }
-
-            @Override
-            public void onDiscoveryStarted() {
-
-            }
-
-            @Override
-            public void onDiscoveryFinished() {
-
-            }
-        });
     }
 
     @Override
diff --git a/btutillib/src/main/java/com/devpaul/bluetoothutillib/SimpleBluetooth.java b/btutillib/src/main/java/com/devpaul/bluetoothutillib/SimpleBluetooth.java
@@ -2,19 +2,17 @@
 
 import android.app.Activity;
 import android.app.ProgressDialog;
-import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Message;
-import android.support.design.widget.Snackbar;
 
 import com.devpaul.bluetoothutillib.broadcasts.BluetoothBroadcastReceiver;
 import com.devpaul.bluetoothutillib.broadcasts.BluetoothPairingReceiver;
 import com.devpaul.bluetoothutillib.broadcasts.BluetoothStateReceiver;
 import com.devpaul.bluetoothutillib.broadcasts.FoundDeviceReceiver;
 import com.devpaul.bluetoothutillib.dialogs.DeviceDialog;
 import com.devpaul.bluetoothutillib.handlers.BluetoothHandler;
+import com.devpaul.bluetoothutillib.handlers.DefaultBluetoothHandler;
 import com.devpaul.bluetoothutillib.utils.BluetoothUtility;
 import com.devpaul.bluetoothutillib.utils.SimpleBluetoothListener;
 
@@ -102,11 +100,6 @@ public void onDeviceUnpaired(BluetoothDevice device) {
      */
     private Context mContext;
 
-    /**
-     * Reference to the calling activity.
-     */
-    private Activity mActivity;
-
     /**
      * {@code BluetoothUtility used by SimpleBluetooth}
      */
@@ -157,20 +150,29 @@ public void onDeviceUnpaired(BluetoothDevice device) {
      */
     private boolean connectWithService = false;
 
+    /**
+     * Boolean for showing or hiding snackbars.
+     */
     private boolean shouldShowSnackbars = false;
 
+    /**
+     * Default handler for Simple bluetooth.
+     */
+    private BluetoothHandler mHandler;
+
     /**
      * Constructor for {@code SimpleBluetooth}
      * Allows for easy handling for setting up connections and bluetooth servers to connect to.
      * @param context context from the calling activity
-     * @param refActivity reference to the calling activity. Context and activity should match.
      */
-    public SimpleBluetooth(Context context, Activity refActivity) {
+    public SimpleBluetooth(Context context, SimpleBluetoothListener listener) {
         //initialize fields.
         this.progressDialog = new ProgressDialog(context);
         this.mContext = context;
-        this.mActivity = refActivity;
-        this.bluetoothUtility = new BluetoothUtility(mContext, mActivity, mHandler);
+        this.mListener = listener;
+        this.mHandler = new DefaultBluetoothHandler(listener, context);
+        this.mHandler.setShowSnackbars(shouldShowSnackbars);
+        this.bluetoothUtility = new BluetoothUtility(mContext, mHandler);
         //register the state change receiver.
         this.curType = InputStreamType.NORMAL;
         this.bluetoothStateReceiver = BluetoothStateReceiver
@@ -186,20 +188,18 @@ public SimpleBluetooth(Context context, Activity refActivity) {
      * Constructor for {@code SimpleBluetooth} Use this constructor to provide your own custom bluetooth
      * handler.
      * @param context the context of the calling activity.
-     * @param refActivity reference to the calling activity. Context and activity should match.
      * @param handler custom {@code BluetoothHandler} for bluetooth event call backs.
      */
-    public SimpleBluetooth(Context context, Activity refActivity, BluetoothHandler handler) {
+    public SimpleBluetooth(Context context, BluetoothHandler handler) {
         //initialize fields.
         this.progressDialog = new ProgressDialog(context);
         this.mContext = context;
-        this.mActivity = refActivity;
         this.customHandler = handler;
         this.curType = InputStreamType.NORMAL;
         //check the handler.
         if(customHandler == null) throw
                 new NullPointerException("Custom BluetoothHandler cannot be null!");
-        this.bluetoothUtility = new BluetoothUtility(mContext, mActivity, customHandler);
+        this.bluetoothUtility = new BluetoothUtility(mContext, customHandler);
         //register the state change receiver.
         this.bluetoothStateReceiver = BluetoothStateReceiver
                 .register(mContext, stateRecieverCallback);
@@ -232,51 +232,9 @@ public void setInputStreamType(InputStreamType type) {
      */
     public void setShouldShowSnackbars(boolean show) {
         shouldShowSnackbars = show;
+        mHandler.setShowSnackbars(show);
         bluetoothUtility.setShouldShowSnackbars(show);
     }
-    /**
-     * Default handler for Simple bluetooth.
-     */
-    private BluetoothHandler mHandler = new BluetoothHandler() {
-        @Override
-        public void handleMessage(Message message) {
-            switch (message.what) {
-                case MESSAGE_READ:
-                    byte[] readBuf = (byte[]) message.obj;
-                    String readMessage = new String(readBuf);
-                    if(readBuf != null && readBuf.length > 0) {
-                        if(mListener != null)
-                            mListener.onBluetoothDataReceived(readBuf, readMessage);
-                    }
-                    break;
-                case MESSAGE_WAIT_FOR_CONNECTION:
-                    if(progressDialog != null) {
-                        progressDialog.setTitle("");
-                        progressDialog.setMessage("Waiting...");
-                        progressDialog.show();
-                    }
-                    break;
-                case MESSAGE_CONNECTION_MADE:
-                    if(progressDialog != null) {
-                        if(progressDialog.isShowing()) {
-                            progressDialog.dismiss();
-                            if(shouldShowSnackbars) {
-                                Snackbar.make(mActivity.findViewById(android.R.id.content), "Device connected.",
-                                        Snackbar.LENGTH_SHORT).show();
-                            }
-                        }
-                    }
-                    break;
-                case MESSAGE_A2DP_PROXY_RECEIVED:
-                    BluetoothA2dp bluetoothA2dp = (BluetoothA2dp) message.obj;
-                    bluetoothUtility.connectA2DPProxy(bluetoothA2dp, a2dpDevice);
-                    break;
-                default:
-                    break;
-            }
-
-        }
-    };
 
     /**
      * Method that must be called to set everything up for this class.
@@ -336,8 +294,10 @@ public void sendData(byte[] data) {
      *                    OnActivityResult.
      */
     public void scan(int requestCode) {
-        Intent deviceDialog = new Intent(mActivity, DeviceDialog.class);
-        mActivity.startActivityForResult(deviceDialog, requestCode);
+        Intent deviceDialog = new Intent(mContext, DeviceDialog.class);
+        if(mContext instanceof Activity) {
+            ((Activity)mContext).startActivityForResult(deviceDialog, requestCode);
+        }
     }
 
     /**
@@ -418,12 +378,11 @@ public void connectToBluetoothServer(String macAddress) {
     public void connectToA2DPDevice(String deviceName) {
         if(!isInitialized) {
             throw new IllegalStateException("Must initialize before using any other method in class" +
-                    "SimpleBluetooth! Call initializeSimpleBluetooth()");
+                    "SimpleBluetooth. Call initializeSimpleBluetooth()");
         } else {
             a2dpDevice = bluetoothUtility.findDeviceByName(deviceName);
             bluetoothUtility.setUpA2DPConnection();
         }
-
     }
 
     /**
diff --git a/btutillib/src/main/java/com/devpaul/bluetoothutillib/abstracts/BaseBluetoothActivity.java b/btutillib/src/main/java/com/devpaul/bluetoothutillib/abstracts/BaseBluetoothActivity.java
@@ -18,7 +18,6 @@
  * - Connecting to a device.
  * - Receiving data from the device.
  * - Sending data to the device.
- *
  */
 public abstract class BaseBluetoothActivity extends Activity {
 
@@ -35,11 +34,10 @@ public abstract class BaseBluetoothActivity extends Activity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        simpleBluetooth = new SimpleBluetooth(this, this);
+        simpleBluetooth = new SimpleBluetooth(this, getSimpleBluetoothListener());
         if(simpleBluetooth.initializeSimpleBluetooth()) {
             onBluetoothEnabled();
         }
-        simpleBluetooth.setSimpleBluetoothListener(getSimpleBluetoothListener());
         super.onCreate(savedInstanceState);
     }
 
@@ -98,5 +96,4 @@ public SimpleBluetooth getSimpleBluetooth() {
         return this.simpleBluetooth;
     }
 
-
 }
diff --git a/btutillib/src/main/java/com/devpaul/bluetoothutillib/abstracts/SupportBaseBluetoothActivity.java b/btutillib/src/main/java/com/devpaul/bluetoothutillib/abstracts/SupportBaseBluetoothActivity.java
@@ -33,11 +33,10 @@ public abstract class SupportBaseBluetoothActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        simpleBluetooth = new SimpleBluetooth(this, this);
+        simpleBluetooth = new SimpleBluetooth(this, getSimpleBluetoothListener());
         if(simpleBluetooth.initializeSimpleBluetooth()) {
             onBluetoothEnabled();
         }
-        simpleBluetooth.setSimpleBluetoothListener(getSimpleBluetoothListener());
         super.onCreate(savedInstanceState);
     }
 
diff --git a/btutillib/src/main/java/com/devpaul/bluetoothutillib/handlers/BluetoothHandler.java b/btutillib/src/main/java/com/devpaul/bluetoothutillib/handlers/BluetoothHandler.java
@@ -1,16 +1,40 @@
 package com.devpaul.bluetoothutillib.handlers;
 
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Context;
 import android.os.Handler;
-import android.os.Message;
+
+import com.devpaul.bluetoothutillib.utils.SimpleBluetoothListener;
 
 /**
  * Created by Paul Tsouchlos
  * A handler for receiving messages from the bluetooth device.
  */
-public abstract class BluetoothHandler extends Handler {
+public class BluetoothHandler extends Handler {
     public static final int MESSAGE_READ = 121;
     public static final int MESSAGE_WAIT_FOR_CONNECTION = 143;
     public static final int MESSAGE_CONNECTION_MADE = 155;
     public static final int MESSAGE_A2DP_PROXY_RECEIVED = 157;
-    public abstract void handleMessage(Message message);
+    public SimpleBluetoothListener mListener;
+    public Activity mActivity;
+    public ProgressDialog dialog;
+    public boolean shouldShowSnackbars;
+
+    /**
+     * Bluetooth Handler class for handling messages from the bluetooth device.
+     * @param listener listener for simple bluetooth.
+     * @param context reference context.
+     */
+    public BluetoothHandler(SimpleBluetoothListener listener, Context context) {
+        this.mListener = listener;
+        if(context instanceof Activity) {
+            this.mActivity = (Activity) context;
+        }
+        dialog = new ProgressDialog(context);
+    }
+
+    public void setShowSnackbars(boolean show) {
+        this.shouldShowSnackbars = show;
+    }
 }
diff --git a/btutillib/src/main/java/com/devpaul/bluetoothutillib/handlers/DefaultBluetoothHandler.java b/btutillib/src/main/java/com/devpaul/bluetoothutillib/handlers/DefaultBluetoothHandler.java
@@ -0,0 +1,66 @@
+package com.devpaul.bluetoothutillib.handlers;
+
+import android.bluetooth.BluetoothA2dp;
+import android.content.Context;
+import android.os.Message;
+import android.support.design.widget.Snackbar;
+
+import com.devpaul.bluetoothutillib.utils.SimpleBluetoothListener;
+
+/**
+ * Created by Paul on 3/21/2016.
+ *
+ * Default handler for SimpleBluetooth.
+ */
+public class DefaultBluetoothHandler extends BluetoothHandler {
+
+    /**
+     * Default bluetooth handler for SimpleBluetooth. This should work fine for most cases.
+     * Override if you need more message.what options.
+     * @param listener the simple bluetooth listener.
+     * @param context reference context.
+     */
+    public DefaultBluetoothHandler(SimpleBluetoothListener listener, Context context) {
+        super(listener, context);
+    }
+
+    @Override
+    public void handleMessage(Message message) {
+        switch (message.what) {
+            case MESSAGE_READ:
+                byte[] readBuf = (byte[]) message.obj;
+                String readMessage = new String(readBuf);
+                if(readBuf.length > 0) {
+                    if(mListener != null)
+                        mListener.onBluetoothDataReceived(readBuf, readMessage);
+                }
+                break;
+            case MESSAGE_WAIT_FOR_CONNECTION:
+                if(dialog != null) {
+                    dialog.setTitle("");
+                    dialog.setMessage("Waiting...");
+                    dialog.show();
+                }
+                break;
+            case MESSAGE_CONNECTION_MADE:
+                if(dialog != null) {
+                    if(dialog.isShowing()) {
+                        dialog.dismiss();
+                        if(shouldShowSnackbars && mActivity != null) {
+                            Snackbar.make(mActivity.findViewById(android.R.id.content), "Device connected.",
+                                    Snackbar.LENGTH_SHORT).show();
+                        }
+                    }
+                }
+                break;
+            case MESSAGE_A2DP_PROXY_RECEIVED:
+                BluetoothA2dp device = (BluetoothA2dp) message.obj;
+                if(device != null && mListener != null) {
+                    mListener.onBluetoothA2DPRequested(device);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+}
diff --git a/btutillib/src/main/java/com/devpaul/bluetoothutillib/utils/BluetoothUtility.java b/btutillib/src/main/java/com/devpaul/bluetoothutillib/utils/BluetoothUtility.java
diff --git a/btutillib/src/main/java/com/devpaul/bluetoothutillib/utils/SimpleBluetoothListener.java b/btutillib/src/main/java/com/devpaul/bluetoothutillib/utils/SimpleBluetoothListener.java

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`* - Connecting to a device.`
`19`	`19`	`* - Receiving data from the device.`
`20`	`20`	`* - Sending data to the device.`
`21`		`- *`
`22`	`21`	`*/`
`23`	`22`	`public abstract class BaseBluetoothActivity extends Activity {`
`24`	`23`
`@@ -35,11 +34,10 @@ public abstract class BaseBluetoothActivity extends Activity {`
`35`	`34`
`36`	`35`	`@Override`
`37`	`36`	`protected void onCreate(Bundle savedInstanceState) {`
`38`		`- simpleBluetooth = new SimpleBluetooth(this, this);`
	`37`	`+ simpleBluetooth = new SimpleBluetooth(this, getSimpleBluetoothListener());`
`39`	`38`	`if(simpleBluetooth.initializeSimpleBluetooth()) {`
`40`	`39`	`onBluetoothEnabled();`
`41`	`40`	`}`
`42`		`- simpleBluetooth.setSimpleBluetoothListener(getSimpleBluetoothListener());`
`43`	`41`	`super.onCreate(savedInstanceState);`
`44`	`42`	`}`
`45`	`43`
`@@ -98,5 +96,4 @@ public SimpleBluetooth getSimpleBluetooth() {`
`98`	`96`	`return this.simpleBluetooth;`
`99`	`97`	`}`
`100`	`98`
`101`		`-`
`102`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,10 @@ public abstract class SupportBaseBluetoothActivity extends AppCompatActivity {`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`protected void onCreate(Bundle savedInstanceState) {`
`36`		`- simpleBluetooth = new SimpleBluetooth(this, this);`
	`36`	`+ simpleBluetooth = new SimpleBluetooth(this, getSimpleBluetoothListener());`
`37`	`37`	`if(simpleBluetooth.initializeSimpleBluetooth()) {`
`38`	`38`	`onBluetoothEnabled();`
`39`	`39`	`}`
`40`		`- simpleBluetooth.setSimpleBluetoothListener(getSimpleBluetoothListener());`
`41`	`40`	`super.onCreate(savedInstanceState);`
`42`	`41`	`}`
`43`	`42`