Add and use SKBluetoothData and SKBluetoothDeviceData

Author: minoskt

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKBluetoothData.java

@@ -21,17 +21,29 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import java.util.ArrayList;
+
 public class SKBluetoothData extends SKAbstractData {
 
     @SuppressWarnings("unused")
     private static final String TAG = "SKBluetoothData";
 
-    public SKBluetoothData(long timestamp) {
+    private final ArrayList<SKBluetoothDeviceData> mBluetoothDevices;
+
+    public SKBluetoothData(long timestamp, ArrayList<SKBluetoothDeviceData> bluetoothDevices) {
+
         super(timestamp);
+
+        this.mBluetoothDevices = bluetoothDevices;
     }
 
     @Override
     public String getDataInCSV() {
         return null;
     }
+
+    @SuppressWarnings("unused")
+    public ArrayList<SKBluetoothDeviceData> getBluetoothDevices() {
+        return this.mBluetoothDevices;
+    }
 }

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKBluetoothDeviceData.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2015. Queen Mary University of London
+ * Kleomenis Katevas, k.katevas@qmul.ac.uk
+ *
+ * This file is part of SensingKit-Android library.
+ * For more information, please visit http://www.sensingkit.org
+ *
+ * SensingKit-Android is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SensingKit-Android is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with SensingKit-Android.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sensingkit.sensingkitlib.data;
+
+import java.util.Locale;
+
+public class SKBluetoothDeviceData extends SKAbstractData {
+
+    @SuppressWarnings("unused")
+    private static final String TAG = "SKBluetoothDeviceData";
+
+    protected final String name;
+    protected final String address;
+    protected final int rssi;
+
+    public SKBluetoothDeviceData(long timestamp, String name, String address, int rssi) {
+
+        super(timestamp);
+
+        this.name = name;
+        this.address = address;
+        this.rssi = rssi;
+    }
+
+    @Override
+    public String getDataInCSV() {
+        return String.format(Locale.US, "%d,%s,%s,%d", this.timestamp, this.name, this.address, this.rssi);
+    }
+
+    @SuppressWarnings("unused")
+    public String getName() {
+        return this.name;
+    }
+
+    @SuppressWarnings("unused")
+    public String getAddress() {
+        return this.address;
+    }
+
+    @SuppressWarnings("unused")
+    public int getRssi() {
+        return this.rssi;
+    }
+}

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/modules/SKBluetooth.java

@@ -27,25 +27,29 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.util.Log;
 
 import org.sensingkit.sensingkitlib.SKException;
 import org.sensingkit.sensingkitlib.SKExceptionErrorCode;
 import org.sensingkit.sensingkitlib.SKSensorModuleType;
 import org.sensingkit.sensingkitlib.data.SKAbstractData;
 import org.sensingkit.sensingkitlib.data.SKBluetoothData;
+import org.sensingkit.sensingkitlib.data.SKBluetoothDeviceData;
+
+import java.util.ArrayList;
 
 public class SKBluetooth extends SKAbstractSensorModule {
 
     @SuppressWarnings("unused")
     private static final String TAG = "SKBluetooth";
 
-    private BluetoothAdapter mBluetoothAdapter;
+    private final BluetoothAdapter mBluetoothAdapter;
+    private ArrayList<SKBluetoothDeviceData> mBluetoothDevices;
 
     public SKBluetooth(Context context) throws SKException {
         super(context, SKSensorModuleType.BLUETOOTH);
 
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        mBluetoothDevices = new ArrayList<>();
 
         if (mBluetoothAdapter == null) {
             throw new SKException(TAG, "Bluetooth sensor module is not supported from the device.", SKExceptionErrorCode.UNKNOWN_ERROR);
@@ -71,14 +75,16 @@ public void onReceive(Context context, Intent intent) {
                 int rssi = (int) intent.getShortExtra(BluetoothDevice.EXTRA_RSSI, Short.MIN_VALUE);
 
                 // Create SKBluetoothDevice and add to mBluetoothDevices array
-                Log.i(TAG, "Device Found: " + name + ", " + address + ", " + rssi);
+                SKBluetoothDeviceData deviceData = new SKBluetoothDeviceData(System.currentTimeMillis(), name, address, rssi);
+                mBluetoothDevices.add(deviceData);
 
             } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {  // Discovery Finished
 
                 // Build the data object
-                SKAbstractData data = new SKBluetoothData(System.currentTimeMillis());
+                SKAbstractData data = new SKBluetoothData(System.currentTimeMillis(), mBluetoothDevices);
 
                 // Clean the arrayList
+                mBluetoothDevices = new ArrayList<>();
 
                 // Submit sensor data object
                 submitSensorData(data);
@@ -127,6 +133,7 @@ public void stopSensing() {
     }
 
     private void registerLocalBroadcastManager() {
+
         // Register receivers for ACTION_FOUND and ACTION_DISCOVERY_FINISHED
         IntentFilter foundFilter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
         IntentFilter finishedFilter = new IntentFilter(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);