mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge.git
synced 2026-07-31 07:44:24 +02:00
Zepp OS: Reset MTU before initialization
Fixes regression introduced by 732cbd9b1, which partially reverted #3219
by accident.
This commit is contained in:
+1
-1
@@ -336,7 +336,7 @@ public abstract class HuamiSupport extends AbstractBTLEDeviceSupport implements
|
|||||||
protected MediaManager mediaManager;
|
protected MediaManager mediaManager;
|
||||||
private boolean heartRateNotifyEnabled;
|
private boolean heartRateNotifyEnabled;
|
||||||
protected static final int MIN_MTU = 23;
|
protected static final int MIN_MTU = 23;
|
||||||
private int mMTU = MIN_MTU;
|
protected int mMTU = MIN_MTU;
|
||||||
// Keep track of the previous MTU before reconnection, so that we can request it after reconnection
|
// Keep track of the previous MTU before reconnection, so that we can request it after reconnection
|
||||||
private int previousMtu = -1;
|
private int previousMtu = -1;
|
||||||
protected int mActivitySampleSize = 4;
|
protected int mActivitySampleSize = 4;
|
||||||
|
|||||||
+5
-2
@@ -80,11 +80,9 @@ import nodomain.freeyourgadget.gadgetbridge.service.SleepAsAndroidSender;
|
|||||||
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
|
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiFWHelper;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
|
import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsCoordinator;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Service;
|
import nodomain.freeyourgadget.gadgetbridge.devices.huami.Huami2021Service;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiCoordinator;
|
|
||||||
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService;
|
import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiService;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsAgpsInstallHandler;
|
import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsAgpsInstallHandler;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsGpxRouteInstallHandler;
|
import nodomain.freeyourgadget.gadgetbridge.devices.huami.zeppos.ZeppOsGpxRouteInstallHandler;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
|
|
||||||
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandCoordinator;
|
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandCoordinator;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.externalevents.CalendarReceiver;
|
import nodomain.freeyourgadget.gadgetbridge.externalevents.CalendarReceiver;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.externalevents.sleepasandroid.SleepAsAndroidAction;
|
import nodomain.freeyourgadget.gadgetbridge.externalevents.sleepasandroid.SleepAsAndroidAction;
|
||||||
@@ -283,6 +281,11 @@ public class ZeppOsSupport extends HuamiSupport implements ZeppOsFileTransferSer
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
|
protected TransactionBuilder initializeDevice(final TransactionBuilder builder) {
|
||||||
|
if (getMTU() != MIN_MTU) {
|
||||||
|
// #3219 - Reset the MTU before re-initializing the device, otherwise initialization will sometimes fail
|
||||||
|
setMtu(MIN_MTU);
|
||||||
|
}
|
||||||
|
|
||||||
characteristicChunked2021Read = getCharacteristic(HuamiService.UUID_CHARACTERISTIC_CHUNKEDTRANSFER_2021_READ);
|
characteristicChunked2021Read = getCharacteristic(HuamiService.UUID_CHARACTERISTIC_CHUNKEDTRANSFER_2021_READ);
|
||||||
if (characteristicChunked2021Read != null && huami2021ChunkedDecoder == null) {
|
if (characteristicChunked2021Read != null && huami2021ChunkedDecoder == null) {
|
||||||
huami2021ChunkedDecoder = new Huami2021ChunkedDecoder(this, force2021Protocol());
|
huami2021ChunkedDecoder = new Huami2021ChunkedDecoder(this, force2021Protocol());
|
||||||
|
|||||||
Reference in New Issue
Block a user