1 files changed, 94 insertions, 68 deletions
diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothMapFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothMapFacade.java
index 01c1bd46..e3fe007b 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothMapFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothMapFacade.java
@@ -16,12 +16,10 @@
 
 package com.googlecode.android_scripting.facade.bluetooth;
 
-import java.util.List;
-
 import android.app.Service;
-import android.bluetooth.BluetoothMap;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothMap;
 import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothUuid;
 import android.os.ParcelUuid;
@@ -32,86 +30,114 @@ import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
 import com.googlecode.android_scripting.rpc.Rpc;
 import com.googlecode.android_scripting.rpc.RpcParameter;
 
+import java.util.List;
+
 public class BluetoothMapFacade extends RpcReceiver {
-  static final ParcelUuid[] MAP_UUIDS = {
-      BluetoothUuid.MAP,
-      BluetoothUuid.MNS,
-      BluetoothUuid.MAS,
-  };
-  private final Service mService;
-  private final BluetoothAdapter mBluetoothAdapter;
+    static final ParcelUuid[] MAP_UUIDS = {
+        BluetoothUuid.MAP,
+        BluetoothUuid.MNS,
+        BluetoothUuid.MAS,
+    };
+    private final Service mService;
+    private final BluetoothAdapter mBluetoothAdapter;
 
-  private static boolean sIsMapReady = false;
-  private static BluetoothMap sMapProfile = null;
+    private static boolean sIsMapReady = false;
+    private static BluetoothMap sMapProfile = null;
 
-  public BluetoothMapFacade(FacadeManager manager) {
-    super(manager);
-    mService = manager.getService();
-    mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-    mBluetoothAdapter.getProfileProxy(mService, new MapServiceListener(),
+    public BluetoothMapFacade(FacadeManager manager) {
+        super(manager);
+        mService = manager.getService();
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        mBluetoothAdapter.getProfileProxy(mService, new MapServiceListener(),
         BluetoothProfile.MAP);
-  }
-
-  class MapServiceListener implements BluetoothProfile.ServiceListener {
-    @Override
-    public void onServiceConnected(int profile, BluetoothProfile proxy) {
-      sMapProfile = (BluetoothMap) proxy;
-      sIsMapReady = true;
     }
 
-    @Override
-    public void onServiceDisconnected(int profile) {
-      sIsMapReady = false;
+    class MapServiceListener implements BluetoothProfile.ServiceListener {
+        @Override
+        public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            sMapProfile = (BluetoothMap) proxy;
+            sIsMapReady = true;
+        }
+
+        @Override
+        public void onServiceDisconnected(int profile) {
+            sIsMapReady = false;
+        }
     }
-  }
 
-  public Boolean mapDisconnect(BluetoothDevice device) {
-    if (sMapProfile.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
-      sMapProfile.setPriority(device, BluetoothProfile.PRIORITY_ON);
+    /**
+     * Disconnect Map Profile.
+     * @param device - the BluetoothDevice object to connect to.
+     * @return if the disconnection was successfull or not.
+     */
+    public Boolean mapDisconnect(BluetoothDevice device) {
+        if (sMapProfile.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
+            sMapProfile.setPriority(device, BluetoothProfile.PRIORITY_ON);
+        }
+        return sMapProfile.disconnect(device);
     }
-    return sMapProfile.disconnect(device);
-  }
 
-  @Rpc(description = "Is Map profile ready.")
-  public Boolean bluetoothMapIsReady() {
+    /**
+     * Is Map profile ready.
+     * @return if Map profile is ready or not.
+     */
+    @Rpc(description = "Is Map profile ready.")
+    public Boolean bluetoothMapIsReady() {
     return sIsMapReady;
-  }
+    }
 
-  @Rpc(description = "Disconnect an MAP device.")
-  public Boolean bluetoothMapDisconnect(
-      @RpcParameter(name = "deviceID", description = "Name or MAC address of a device.")
-      String deviceID)
-      throws Exception {
-    if (sMapProfile == null) return false;
-    List<BluetoothDevice> connectedMapDevices = sMapProfile.getConnectedDevices();
-    Log.d("Connected map devices: " + connectedMapDevices);
-    BluetoothDevice mDevice = BluetoothFacade.getDevice(connectedMapDevices, deviceID);
-    if (!connectedMapDevices.isEmpty() && connectedMapDevices.get(0).equals(mDevice)) {
-        if (sMapProfile.getPriority(mDevice) > BluetoothProfile.PRIORITY_ON) {
-            sMapProfile.setPriority(mDevice, BluetoothProfile.PRIORITY_ON);
+    /**
+     * Disconnect an MAP device.
+     * @param deviceID - Name or MAC address of a bluetooth device.
+     * @return True if the disconnection was successful; otherwise False.
+     */
+    @Rpc(description = "Disconnect an MAP device.")
+    public Boolean bluetoothMapDisconnect(
+            @RpcParameter(name = "deviceID",
+                description = "Name or MAC address of a device.")
+                    String deviceID) throws Exception {
+        if (sMapProfile == null) return false;
+        List<BluetoothDevice> connectedMapDevices =
+                sMapProfile.getConnectedDevices();
+        Log.d("Connected map devices: " + connectedMapDevices);
+        BluetoothDevice mDevice = BluetoothFacade.getDevice(connectedMapDevices, deviceID);
+        if (!connectedMapDevices.isEmpty()
+                && connectedMapDevices.get(0).equals(mDevice)) {
+            if (sMapProfile.getPriority(mDevice)
+                    > BluetoothProfile.PRIORITY_ON) {
+                sMapProfile.setPriority(mDevice, BluetoothProfile.PRIORITY_ON);
+            }
+            return sMapProfile.disconnect(mDevice);
+        } else {
+            return false;
         }
-        return sMapProfile.disconnect(mDevice);
-    } else {
-        return false;
     }
-  }
 
-  @Rpc(description = "Get all the devices connected through MAP.")
-  public List<BluetoothDevice> bluetoothMapGetConnectedDevices() {
-    while (!sIsMapReady);
-    return sMapProfile.getDevicesMatchingConnectionStates(
-          new int[] {BluetoothProfile.STATE_CONNECTED,
-                     BluetoothProfile.STATE_CONNECTING,
-                     BluetoothProfile.STATE_DISCONNECTING});
-  }
+    /**
+     * Get all the devices connected through MAP.
+     * @return List of all the devices connected through MAP.
+     */
+    @Rpc(description = "Get all the devices connected through MAP.")
+    public List<BluetoothDevice> bluetoothMapGetConnectedDevices() {
+        if (!sIsMapReady) return null;
+        return sMapProfile.getDevicesMatchingConnectionStates(
+                new int[] {BluetoothProfile.STATE_CONNECTED,
+                    BluetoothProfile.STATE_CONNECTING,
+                    BluetoothProfile.STATE_DISCONNECTING});
+    }
 
-  @Rpc(description = "Get the currently connected remote Bluetooth device (PCE).")
-  public BluetoothDevice bluetoothMapGetClient() {
-    if (sMapProfile == null) { return null; }
-    return sMapProfile.getClient();
-  }
+    /**
+     * Get the currently connected remote Bluetooth device (PCE).
+     * @return remote Bluetooth device which is currently conencted.
+     */
+    @Rpc(description =
+            "Get the currently connected remote Bluetooth device (PCE).")
+    public BluetoothDevice bluetoothMapGetClient() {
+        if (sMapProfile == null) return null;
+        return sMapProfile.getClient();
+    }
 
-  @Override
-  public void shutdown() {
-  }
+    @Override
+    public void shutdown() {
+    }
 }