aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-24 01:44:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugs fixed, error will no longer disconnect from a device, comments added

Browse Source
This commit is contained in:
Aleksander Nowakowski
2016-10-18 15:52:36 +02:00
parent fa3cd61924
commit ea6dfac97c
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileService.java
View File

@@ -422,7 +422,12 @@ public abstract class BleProfileService extends Service implements BleManagerCal
@Override
public void onDeviceDisconnected(final BluetoothDevice device) {
// Do not use the device argument here unless you change calling onDeviceDisconnected from the binder above
// Note 1: Do not use the device argument here unless you change calling onDeviceDisconnected from the binder above
// Note 2: if BleManager#shouldAutoConnect() for this device returned true, this callback will be
// invoked ONLY when user requested disconnection (using Disconnect button). If the device
// disconnects due to a link loss, the onLinklossOccur(BluetoothDevice) method will be called instead.
final Intent broadcast = new Intent(BROADCAST_CONNECTION_STATE);
broadcast.putExtra(EXTRA_DEVICE, mBluetoothDevice);
broadcast.putExtra(EXTRA_CONNECTION_STATE, STATE_DISCONNECTED);
@@ -508,11 +513,6 @@ public abstract class BleProfileService extends Service implements BleManagerCal
broadcast.putExtra(EXTRA_ERROR_MESSAGE, message);
broadcast.putExtra(EXTRA_ERROR_CODE, errorCode);
LocalBroadcastManager.getInstance(this).sendBroadcast(broadcast);
// After receiving an error the device will be automatically disconnected.
// Replace it with other implementation if necessary.
mBleManager.disconnect();
stopSelf();
}
/**

33
app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileService.java
View File

@@ -34,7 +34,6 @@ import android.os.Handler;
import android.os.IBinder;
import android.support.annotation.StringRes;
import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;
import android.widget.Toast;
import java.util.ArrayList;
@@ -85,6 +84,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
@Override
public void onReceive(final Context context, final Intent intent) {
final int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_OFF);
final int previousState = intent.getIntExtra(BluetoothAdapter.EXTRA_PREVIOUS_STATE, BluetoothAdapter.STATE_OFF);
final ILogger logger = getBinder();
final String stateString = "[Broadcast] Action received: " + BluetoothAdapter.ACTION_STATE_CHANGED + ", state changed to " + state2String(state);
@@ -96,7 +96,8 @@ public abstract class BleMulticonnectProfileService extends Service implements B
break;
case BluetoothAdapter.STATE_TURNING_OFF:
case BluetoothAdapter.STATE_OFF:
onBluetoothDisabled();
if (previousState != BluetoothAdapter.STATE_TURNING_OFF && previousState != BluetoothAdapter.STATE_OFF)
onBluetoothDisabled();
break;
}
}
@@ -143,13 +144,16 @@ public abstract class BleMulticonnectProfileService extends Service implements B
*/
@SuppressWarnings("unchecked")
public void connect(final BluetoothDevice device, final ILogSession session) {
// If a device is in managed devices it means that it's already connected, or was connected
// using autoConnect and the link was lost but Android is already trying to connect to it.
if (mManagedDevices.contains(device))
return;
mManagedDevices.add(device);
BleManager<BleManagerCallbacks> manager = mBleManagers.get(device);
if (manager != null) {
if (!manager.isConnected())
manager.connect(device);
// else do nothing, the device is already connected
manager.connect(device);
} else {
mManagedDevices.add(device);
mBleManagers.put(device, manager = initializeManager());
manager.setGattCallbacks(BleMulticonnectProfileService.this);
manager.setLogger(session);
@@ -449,8 +453,13 @@ public abstract class BleMulticonnectProfileService extends Service implements B
@Override
public void onDeviceDisconnected(final BluetoothDevice device) {
// Note: if BleManager#shouldAutoConnect() for this device returned true, this callback will be
// invoked ONLY when user requested disconnection (using Disconnect button). If the device
// disconnects due to a link loss, the onLinklossOccur(BluetoothDevice) method will be called instead.
// We no longer want to keep the device in the service
mManagedDevices.remove(device);
// The BleManager is not removed from the HashMap to keep the device's log session.
// The BleManager is not removed from the HashMap in order to keep the device's log session.
// mBleManagers.remove(device);
// Do not use the device argument here unless you change calling onDeviceDisconnected from the binder above
@@ -458,6 +467,11 @@ public abstract class BleMulticonnectProfileService extends Service implements B
broadcast.putExtra(EXTRA_DEVICE, device);
broadcast.putExtra(EXTRA_CONNECTION_STATE, STATE_DISCONNECTED);
LocalBroadcastManager.getInstance(this).sendBroadcast(broadcast);
// When user disconnected the last device while the activity was not bound the service can be stopped
if (!mBinded && mManagedDevices.isEmpty()) {
stopSelf();
}
}
@Override
@@ -534,11 +548,6 @@ public abstract class BleMulticonnectProfileService extends Service implements B
broadcast.putExtra(EXTRA_ERROR_MESSAGE, message);
broadcast.putExtra(EXTRA_ERROR_CODE, errorCode);
LocalBroadcastManager.getInstance(this).sendBroadcast(broadcast);
// After receiving an error the device will be automatically disconnected.
// Replace it with other implementation if necessary.
final BleManager<BleManagerCallbacks> manager = mBleManagers.get(device);
manager.disconnect();
}
/**