From 95a58dd96bd9ab8a00a6d67043895103bd8e8bed Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Thu, 18 Aug 2016 10:19:28 +0200 Subject: [PATCH 1/3] Gradle 2.14.1 --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1d6f329..7ecf6f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jun 30 16:41:24 CEST 2016 +#Thu Aug 18 10:00:25 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip From 8bd2296081c3db8e61f6941a76d65c75060b1c76 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Thu, 25 Aug 2016 16:15:04 +0200 Subject: [PATCH 2/3] Cancel DFU when connecting failed --- .../main/java/no/nordicsemi/android/dfu/DfuBaseService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java b/dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java index 9731f62..e46daf8 100644 --- a/dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java +++ b/dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java @@ -1291,6 +1291,12 @@ public abstract class DfuBaseService extends IntentService { updateProgressNotification(ERROR_BLUETOOTH_DISABLED); return; } + if (mConnectionState == STATE_DISCONNECTED) { + loge("Device got disconnected before service discovery finished"); + sendLogBroadcast(LOG_LEVEL_INFO, "Disconnected"); + terminateConnection(gatt, ERROR_DEVICE_DISCONNECTED); + return; + } if (mError > 0) { // error occurred final int error = mError & ~ERROR_CONNECTION_STATE_MASK; loge("An error occurred while connecting to the device:" + error); From c92e9c0b519d775f08c7425793ebb9a9f53181da Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Thu, 25 Aug 2016 16:15:34 +0200 Subject: [PATCH 3/3] Build tools 24.0.2 and support library 24.2.0 --- dfu/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dfu/build.gradle b/dfu/build.gradle index bcf3efd..3fa46b3 100644 --- a/dfu/build.gradle +++ b/dfu/build.gradle @@ -41,7 +41,7 @@ ext { android { compileSdkVersion 24 - buildToolsVersion '24.0.0' + buildToolsVersion '24.0.2' defaultConfig { minSdkVersion 18 @@ -59,7 +59,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:support-v4:24.0.0' + compile 'com.android.support:support-v4:24.2.0' compile 'com.google.code.gson:gson:2.5' } /*