rusefi
/
Android-DFU-Library
mirror of https://github.com/rusefi/Android-DFU-Library.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug fixed: Skipping connecting if DFU aborted before

This commit is contained in:
Aleksander Nowakowski 2016-09-23 10:55:13 +02:00
parent e6ce2550b8
commit d7fe722fbf
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java
View File

@ -917,12 +917,20 @@ public abstract class DfuBaseService extends IntentService implements DfuProgres
// Looks like a second is not enough. The ACL_DISCONNECTED broadcast sometimes comes later (on Android 7.0)
waitFor(1000);
mProgressInfo = new DfuProgressInfo(this);
if (mAborted) {
logi("Upload aborted");
sendLogBroadcast(LOG_LEVEL_WARNING, "Upload aborted");
mProgressInfo.setProgress(PROGRESS_ABORTED);
return;
}
/*
* Now let's connect to the device.
* All the methods below are synchronous. The mLock object is used to wait for asynchronous calls.
*/
sendLogBroadcast(LOG_LEVEL_VERBOSE, "Connecting to DFU target...");
mProgressInfo = new DfuProgressInfo(this);
mProgressInfo.setProgress(PROGRESS_CONNECTING);
final BluetoothGatt gatt = connect(deviceAddress);