MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-26 18:45:49 +01:00
Code Releases Wiki Activity

Improved logging in bonding and tried to recover from weirdness

Browse Source
This commit is contained in:
TaaviE 2021-05-30 01:00:48 +03:00
parent 6f79fc7afa
commit df3ee872ae
7 changed files with 71 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
View File

@ -18,6 +18,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.activities;
import static nodomain.freeyourgadget.gadgetbridge.util.GB.toast;
import android.Manifest;
import android.app.Activity;
import android.bluetooth.BluetoothAdapter;
@ -77,8 +79,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
import static nodomain.freeyourgadget.gadgetbridge.util.GB.toast;
public class DiscoveryActivity extends AbstractGBActivity implements AdapterView.OnItemClickListener, AdapterView.OnItemLongClickListener, BondingInterface {
private static final Logger LOG = LoggerFactory.getLogger(DiscoveryActivity.class);
@ -97,6 +97,7 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
private ProgressBar bluetoothProgress;
private ProgressBar bluetoothLEProgress;
private DeviceCandidateAdapter deviceCandidateAdapter;
private GBDeviceCandidate deviceTarget;
private final BluetoothAdapter.LeScanCallback leScanCallback = new BluetoothAdapter.LeScanCallback() {
@Override
public void onLeScan(BluetoothDevice device, int rssi, byte[] scanRecord) {
@ -183,7 +184,6 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
}
}
};
private BluetoothDevice bluetoothTarget;
public void logMessageContent(byte[] value) {
if (value != null) {
@ -744,7 +744,7 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
}
try {
this.bluetoothTarget = deviceCandidate.getDevice();
this.deviceTarget = deviceCandidate;
BondingUtil.initiateCorrectBonding(this, deviceCandidate);
} catch (Exception e) {
LOG.error("Error pairing device: " + deviceCandidate.getMacAddress());
@ -777,8 +777,8 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
finish();
}
public BluetoothDevice getCurrentTarget() {
return this.bluetoothTarget;
public GBDeviceCandidate getCurrentTarget() {
return this.deviceTarget;
}
public void unregisterBroadcastReceivers() {

9
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/lenovo/LenovoWatchPairingActivity.java
View File

@ -17,7 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.devices.lenovo;
import android.bluetooth.BluetoothDevice;
import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@ -43,8 +44,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils;
import nodomain.freeyourgadget.gadgetbridge.util.BondingInterface;
import nodomain.freeyourgadget.gadgetbridge.util.BondingUtil;
import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
public class LenovoWatchPairingActivity extends AbstractGBActivity implements BondingInterface {
private static final Logger LOG = LoggerFactory.getLogger(LenovoWatchPairingActivity.class);
@ -107,8 +106,8 @@ public class LenovoWatchPairingActivity extends AbstractGBActivity implements Bo
}
@Override
public BluetoothDevice getCurrentTarget() {
return this.deviceCandidate.getDevice();
public GBDeviceCandidate getCurrentTarget() {
return this.deviceCandidate;
}
@Override

10
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java
View File

@ -17,6 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver;
@ -49,8 +51,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
public class MiBandPairingActivity extends AbstractGBActivity implements BondingInterface {
private static final Logger LOG = LoggerFactory.getLogger(MiBandPairingActivity.class);
@ -137,7 +137,7 @@ public class MiBandPairingActivity extends AbstractGBActivity implements Bonding
message.setText(getString(R.string.pairing, deviceCandidate));
if (!BondingUtil.shouldUseBonding()) {
BondingUtil.attemptToFirstConnect(getCurrentTarget());
BondingUtil.attemptToFirstConnect(getCurrentTarget().getDevice());
return;
}
@ -177,8 +177,8 @@ public class MiBandPairingActivity extends AbstractGBActivity implements Bonding
}
@Override
public BluetoothDevice getCurrentTarget() {
return this.deviceCandidate.getDevice();
public GBDeviceCandidate getCurrentTarget() {
return this.deviceCandidate;
}
@Override

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebblePairingActivity.java
View File

@ -17,6 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver;
@ -54,8 +56,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.BondingUtil;
import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
public class PebblePairingActivity extends AbstractGBActivity implements BondingInterface {
private static final Logger LOG = LoggerFactory.getLogger(PebblePairingActivity.class);
@ -174,15 +174,15 @@ public class PebblePairingActivity extends AbstractGBActivity implements Bonding
}
// If it's not a LE Pebble, initiate a connection when bonding is complete
if (!BondingUtil.isLePebble(getCurrentTarget()) && success) {
BondingUtil.attemptToFirstConnect(getCurrentTarget());
if (!BondingUtil.isLePebble(getCurrentTarget().getDevice()) && success) {
BondingUtil.attemptToFirstConnect(getCurrentTarget().getDevice());
}
finish();
}
@Override
public BluetoothDevice getCurrentTarget() {
return this.deviceCandidate.getDevice();
public GBDeviceCandidate getCurrentTarget() {
return this.deviceCandidate;
}
@Override

9
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/watch9/Watch9PairingActivity.java
View File

@ -16,7 +16,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.devices.watch9;
import android.bluetooth.BluetoothDevice;
import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@ -41,8 +42,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils;
import nodomain.freeyourgadget.gadgetbridge.util.BondingInterface;
import nodomain.freeyourgadget.gadgetbridge.util.BondingUtil;
import static nodomain.freeyourgadget.gadgetbridge.util.BondingUtil.STATE_DEVICE_CANDIDATE;
public class Watch9PairingActivity extends AbstractGBActivity implements BondingInterface {
private static final Logger LOG = LoggerFactory.getLogger(Watch9PairingActivity.class);
@ -98,8 +97,8 @@ public class Watch9PairingActivity extends AbstractGBActivity implements Bonding
}
@Override
public BluetoothDevice getCurrentTarget() {
return this.deviceCandidate.getDevice();
public GBDeviceCandidate getCurrentTarget() {
return this.deviceCandidate;
}
@Override

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingInterface.java
View File

@ -33,9 +33,10 @@
package nodomain.freeyourgadget.gadgetbridge.util;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
public interface BondingInterface {
/**
* Called when pairing is complete
@ -45,7 +46,7 @@ public interface BondingInterface {
/**
* Should return the device that is currently being paired
**/
BluetoothDevice getCurrentTarget();
GBDeviceCandidate getCurrentTarget();
/**
* This forces bonding activities to encapsulate the removal

71
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/BondingUtil.java
View File

@ -14,27 +14,14 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Copyright (C) 2020 Andreas Shimokawa, Carsten Pfeiffer, Daniele
Gobbetti, Taavi Eomäe
This file is part of Gadgetbridge.
Gadgetbridge is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Gadgetbridge 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 Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.util;
import static androidx.core.app.ActivityCompat.startIntentSenderForResult;
import static nodomain.freeyourgadget.gadgetbridge.util.GB.toast;
import android.app.Activity;
import android.app.AlertDialog;
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
import android.companion.AssociationRequest;
import android.companion.BluetoothDeviceFilter;
@ -54,6 +41,8 @@ import androidx.annotation.RequiresApi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Locale;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
@ -61,9 +50,6 @@ import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
import static androidx.core.app.ActivityCompat.startIntentSenderForResult;
import static nodomain.freeyourgadget.gadgetbridge.util.GB.toast;
public class BondingUtil {
public static final String STATE_DEVICE_CANDIDATE = "stateDeviceCandidate";
@ -81,7 +67,7 @@ public class BondingUtil {
if (GBDevice.ACTION_DEVICE_CHANGED.equals(intent.getAction())) {
GBDevice device = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE);
LOG.debug("Pairing receiver: device changed: " + device);
if (activity.getCurrentTarget().getAddress().equals(device.getAddress())) {
if (activity.getCurrentTarget().getDevice().getAddress().equals(device.getAddress())) {
if (device.isInitialized()) {
LOG.info("Device is initialized, finish things up");
activity.onBondingComplete(true);
@ -103,7 +89,7 @@ public class BondingUtil {
public void onReceive(Context context, Intent intent) {
if (BluetoothDevice.ACTION_BOND_STATE_CHANGED.equals(intent.getAction())) {
BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
String bondingMacAddress = bondingInterface.getCurrentTarget().getAddress();
String bondingMacAddress = bondingInterface.getCurrentTarget().getDevice().getAddress();
LOG.info("Bond state changed: " + device + ", state: " + device.getBondState() + ", expected address: " + bondingMacAddress);
if (bondingMacAddress != null && bondingMacAddress.equals(device.getAddress())) {
@ -115,13 +101,13 @@ public class BondingUtil {
if (isLePebble(device)) {
// Do not initiate connection to LE Pebble!
} else {
attemptToFirstConnect(bondingInterface.getCurrentTarget());
attemptToFirstConnect(bondingInterface.getCurrentTarget().getDevice());
}
return;
}
case BluetoothDevice.BOND_NONE: {
LOG.info("Not bonded with " + device.getAddress() + ", attempting to connect anyway.");
attemptToFirstConnect(bondingInterface.getCurrentTarget());
attemptToFirstConnect(bondingInterface.getCurrentTarget().getDevice());
return;
}
case BluetoothDevice.BOND_BONDING: {
@ -235,14 +221,41 @@ public class BondingUtil {
* Tries to create a BluetoothDevice bond
* Do not call directly, use createBond(Activity, GBDeviceCandidate) instead!
*/
private static void bluetoothBond(BondingInterface context, BluetoothDevice device) {
private static void bluetoothBond(BondingInterface context, GBDeviceCandidate candidate) {
BluetoothDevice device = candidate.getDevice();
if (device.createBond()) {
// Async, results will be delivered via a broadcast
LOG.info("Bonding in progress...");
} else {
LOG.error(String.format(Locale.getDefault(),
"Bonding failed immediately! %1$s (%2$s) %3$d",
device.getName(),
device.getAddress(),
device.getType())
);
BluetoothClass bluetoothClass = device.getBluetoothClass();
if (bluetoothClass != null) {
LOG.error(String.format(Locale.getDefault(),
"BluetoothClass: %1$s",
bluetoothClass.toString()));
}
// Theoretically we shouldn't be doing this
// because this function shouldn't've been called
// with an already bonded device
if (device.getBondState() == BluetoothDevice.BOND_BONDED) {
LOG.warn("For some reason the device is already bonded, but let's try first connect");
attemptToFirstConnect(context.getCurrentTarget().getDevice());
} else if (device.getBondState() == BluetoothDevice.BOND_BONDING) {
LOG.warn("Device is still bonding after an error");
// TODO: Not sure we can handle this better, it's weird already.
} else {
LOG.warn("Bonding failed immediately and no bond was made");
toast(context.getContext(), context.getContext().getString(R.string.discovery_bonding_failed_immediately, device.getName()), Toast.LENGTH_SHORT, GB.ERROR);
}
}
}
/**
* Handles the activity result and checks if there's anything CompanionDeviceManager-related going on
@ -256,7 +269,7 @@ public class BondingUtil {
data.getParcelableExtra(CompanionDeviceManager.EXTRA_DEVICE);
if (deviceToPair != null) {
if (bondingInterface.getCurrentTarget().getAddress().equals(deviceToPair.getAddress())) {
if (bondingInterface.getCurrentTarget().getDevice().getAddress().equals(deviceToPair.getAddress())) {
if (deviceToPair.getBondState() != BluetoothDevice.BOND_BONDED) {
BondingUtil.bluetoothBond(bondingInterface, bondingInterface.getCurrentTarget());
} else {
@ -300,7 +313,7 @@ public class BondingUtil {
LOG.info("The device has already been bonded through CompanionDeviceManager, using regular");
// If it's already "associated", we should immediately pair
// because the callback is never called (AFAIK?)
BondingUtil.bluetoothBond(bondingInterface, deviceCandidate.getDevice());
BondingUtil.bluetoothBond(bondingInterface, deviceCandidate);
return;
}
}
@ -353,7 +366,7 @@ public class BondingUtil {
// TODO: It would theoretically be nice to check if it's already been granted,
// but re-bond works
} else {
attemptToFirstConnect(bondingInterface.getCurrentTarget());
attemptToFirstConnect(bondingInterface.getCurrentTarget().getDevice());
return;
}
} else if (bondState == BluetoothDevice.BOND_BONDING) {
@ -367,7 +380,7 @@ public class BondingUtil {
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
companionDeviceManagerBond(bondingInterface, deviceCandidate);
} else {
bluetoothBond(bondingInterface, deviceCandidate.getDevice());
bluetoothBond(bondingInterface, deviceCandidate);
}
}