From 4ca632e3b2b18399877ff88b9e54025d6688946e Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Tue, 10 Nov 2015 11:30:08 +0100
Subject: [PATCH] Version 1.16.1

DFU Library imported from jcenter. Few other changes.
---
 .idea/gradle.xml                              |   1 -
 .idea/modules.xml                             |   1 -
 .idea/vcs.xml                                 |   4 +-
 app/app.iml                                   |  30 +++---
 app/build.gradle                              |  20 ++--
 .../nrftoolbox/profile/BleManager.java        |  42 ++++-----
 .../proximity/ProximityManager.java           |  88 ++++++++++++------
 app/src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 4518 -> 0 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 12851 bytes
 build.gradle                                  |   2 +-
 common/build.gradle                           |   2 +-
 common/common.iml                             |   4 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 settings.gradle                               |   5 +-
 wear/build.gradle                             |   6 +-
 wear/wear.iml                                 |   9 +-
 16 files changed, 130 insertions(+), 88 deletions(-)
 delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index c99df1f69..e67a6ec33 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,7 +8,6 @@
         <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
-            <option value="$PROJECT_DIR$/../DFULibrary/dfu" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/common" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bfd895e81..0a2137262 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,7 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/common/common.iml" filepath="$PROJECT_DIR$/common/common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/../DFULibrary/dfu/dfu.iml" filepath="$PROJECT_DIR$/../DFULibrary/dfu/dfu.iml" />
       <module fileurl="file://$PROJECT_DIR$/nRFToolbox.iml" filepath="$PROJECT_DIR$/nRFToolbox.iml" />
       <module fileurl="file://$PROJECT_DIR$/wear/wear.iml" filepath="$PROJECT_DIR$/wear/wear.iml" />
     </modules>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 0f4165692..94a25f7f4 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../DFULibrary" vcs="Git" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 517941ff1..8bfaffd12 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -71,11 +71,15 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.8.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/7.8.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/8.3.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.3.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/8.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/no.nordicsemi.android.support.v18/scanner/0.1.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/no.nordicsemi.android/dfu/0.6/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/no.nordicsemi.android/log/2.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
@@ -94,19 +98,21 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-wearable-8.3.0" level="project" />
+    <orderEntry type="library" exported="" name="log-2.0.0" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
-    <orderEntry type="library" exported="" name="design-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="dfu-0.6" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="stax-1.2.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-wearable-7.8.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-8.3.0" level="project" />
     <orderEntry type="library" exported="" name="scanner-0.1.1" level="project" />
     <orderEntry type="library" exported="" name="achartengine-1.1.0" level="project" />
     <orderEntry type="library" exported="" name="simple-xml-2.7.1" level="project" />
-    <orderEntry type="library" exported="" name="log-2.0.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-base-7.8.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-basement-8.3.0" level="project" />
     <orderEntry type="module" module-name="common" exported="" />
-    <orderEntry type="module" module-name="dfu" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5eb16d6f0..d4d0c76b5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
         targetSdkVersion 23
-        versionCode 39
-        versionName "1.16.0"
+        versionCode 40
+        versionName "1.16.1"
     }
     buildTypes {
         release {
@@ -21,9 +21,9 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.google.android.gms:play-services-wearable:7.8.0'
-    compile 'com.android.support:appcompat-v7:23.0.1'
-    compile 'com.android.support:design:23.0.1'
+    compile 'com.google.android.gms:play-services-wearable:8.3.0'
+    compile 'com.android.support:appcompat-v7:23.1.0'
+    compile 'com.android.support:design:23.1.0'
     compile 'no.nordicsemi.android.support.v18:scanner:0.1.1'
     compile 'no.nordicsemi.android:log:2.0.0'
     compile('org.simpleframework:simple-xml:2.7.1') {
@@ -31,7 +31,15 @@ dependencies {
         exclude group: 'xpp3', module: 'xpp3'
     }
     compile files('libs/achartengine-1.1.0.jar')
-    compile project(':dfu')
     compile project(':common')
     wearApp project(':wear')
+
+    // The DFU Library is imported automatically from jcenter.
+    compile 'no.nordicsemi.android:dfu:0.6'
+    // If you want to make some changes in the DFU Library, clone the https://github.com/NordicSemiconductor/Android-DFU-Library project into DFULibrary folder,
+    // add it as a module in Project Structure and uncomment the following line:
+
+    // compile project(':dfu')
+
+    // Also uncomment selected lines in settings.gradle
 }
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java
index 340aaf5a6..47cf5dbc0 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java
@@ -862,24 +862,6 @@ private void nextRequest() {
 				}
 			}
 		}
-
-		/**
-		 * Converts the connection state to String value
-		 * @param state the connection state
-		 * @return state as String
-		 */
-		private String stateToString(final int state) {
-			switch (state) {
-				case BluetoothProfile.STATE_CONNECTED:
-					return "CONNECTED";
-				case BluetoothProfile.STATE_CONNECTING:
-					return "CONNECTING";
-				case BluetoothProfile.STATE_DISCONNECTING:
-					return "DISCONNECTING";
-				default:
-					return "DISCONNECTED";
-			}
-		}
 	}
 
 	private static final int PAIRING_VARIANT_PIN = 0;
@@ -890,7 +872,7 @@ private String stateToString(final int state) {
 	private static final int PAIRING_VARIANT_DISPLAY_PIN = 5;
 	private static final int PAIRING_VARIANT_OOB_CONSENT = 6;
 
-	private String pairingVariantToString(final int variant) {
+	protected String pairingVariantToString(final int variant) {
 		switch (variant) {
 			case PAIRING_VARIANT_PIN:
 				return "PAIRING_VARIANT_PIN";
@@ -911,7 +893,7 @@ private String pairingVariantToString(final int variant) {
 		}
 	}
 
-	private String bondStateToString(final int state) {
+	protected String bondStateToString(final int state) {
 		switch (state) {
 			case BluetoothDevice.BOND_NONE:
 				return "BOND_NONE";
@@ -924,7 +906,7 @@ private String bondStateToString(final int state) {
 		}
 	}
 
-	private String getWriteType(final int type) {
+	protected String getWriteType(final int type) {
 		switch (type) {
 			case BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT:
 				return "WRITE REQUEST";
@@ -936,4 +918,22 @@ private String getWriteType(final int type) {
 				return "UNKNOWN: " + type;
 		}
 	}
+
+	/**
+	 * Converts the connection state to String value
+	 * @param state the connection state
+	 * @return state as String
+	 */
+	protected String stateToString(final int state) {
+		switch (state) {
+			case BluetoothProfile.STATE_CONNECTED:
+				return "CONNECTED";
+			case BluetoothProfile.STATE_CONNECTING:
+				return "CONNECTING";
+			case BluetoothProfile.STATE_DISCONNECTING:
+				return "DISCONNECTING";
+			default:
+				return "DISCONNECTED";
+		}
+	}
 }
diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManager.java
index 358607a4a..230918877 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManager.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManager.java
@@ -39,6 +39,7 @@
 import java.util.Queue;
 import java.util.UUID;
 
+import no.nordicsemi.android.error.GattError;
 import no.nordicsemi.android.log.Logger;
 import no.nordicsemi.android.nrftoolbox.profile.BleManager;
 import no.nordicsemi.android.nrftoolbox.parser.AlertLevelParser;
@@ -102,7 +103,7 @@ private void addLinklossService() {
 		 * This method must be called in UI thread. It works fine on Nexus devices but if called from other thread (f.e. from onServiceAdded in gatt server callback) it hangs the app. 
 		 */
 		final BluetoothGattCharacteristic linklossAlertLevel = new BluetoothGattCharacteristic(ALERT_LEVEL_CHARACTERISTIC_UUID, BluetoothGattCharacteristic.PROPERTY_WRITE
-				| BluetoothGattCharacteristic.PROPERTY_READ, BluetoothGattCharacteristic.PERMISSION_WRITE);
+				| BluetoothGattCharacteristic.PROPERTY_READ, BluetoothGattCharacteristic.PERMISSION_WRITE | BluetoothGattCharacteristic.PERMISSION_READ);
 		linklossAlertLevel.setValue(HIGH_ALERT);
 		final BluetoothGattService linklossService = new BluetoothGattService(LINKLOSS_SERVICE_UUID, BluetoothGattService.SERVICE_TYPE_PRIMARY);
 		linklossService.addCharacteristic(linklossAlertLevel);
@@ -122,7 +123,7 @@ public void run() {
 					if (IMMEDIATE_ALERT_SERVICE_UUID.equals(service.getUuid()))
 						addLinklossService();
 					else {
-						Logger.i(mLogSession, "[Proximity Server] Gatt server started");
+						Logger.i(mLogSession, "[Server] Gatt server started");
 						ProximityManager.super.connect(mDeviceToConnect);
 						mDeviceToConnect = null;
 					}
@@ -132,32 +133,56 @@ public void run() {
 
 		@Override
 		public void onConnectionStateChange(final BluetoothDevice device, final int status, final int newState) {
-			if (status == BluetoothGatt.GATT_SUCCESS && newState == BluetoothGatt.STATE_CONNECTED) {
-				Logger.i(mLogSession, "[Server] Device with address " + device.getAddress() + " connected");
-			} else {
-				if (newState == BluetoothGatt.STATE_DISCONNECTED) {
-					Logger.i(mLogSession, "[Server] Device disconnected");
+			Logger.d(mLogSession, "[Server callback] Connection state changed with status: " + status + " and new state: " + stateToString(newState) + " (" + newState + ")");
+			if (status == BluetoothGatt.GATT_SUCCESS) {
+				if (newState == BluetoothGatt.STATE_CONNECTED) {
+					Logger.i(mLogSession, "[Server] Device with address " + device.getAddress() + " connected");
 				} else {
-					Logger.e(mLogSession, "[Server] Connection state changed with error " + status);
+					Logger.i(mLogSession, "[Server] Device disconnected");
 				}
+			} else {
+				Logger.e(mLogSession, "[Server] Error " + status + " (0x" + Integer.toHexString(status) + "): " + GattError.parseConnectionError(status));
 			}
 		}
 
 		@Override
 		public void onCharacteristicReadRequest(final BluetoothDevice device, final int requestId, final int offset, final BluetoothGattCharacteristic characteristic) {
-			Logger.i(mLogSession, "[Server] Read request for characteristic " + characteristic.getUuid() + " (requestId = " + requestId + ", offset = " + offset + ")");
-			Logger.v(mLogSession, "[Server] Sending response: SUCCESS");
-			Logger.d(mLogSession, "[Server] sendResponse(GATT_SUCCESS, " + ParserUtils.parse(characteristic.getValue()) + ")");
-			mBluetoothGattServer.sendResponse(device, requestId, BluetoothGatt.GATT_SUCCESS, offset, characteristic.getValue());
+			Logger.d(mLogSession, "[Server callback] Read request for characteristic " + characteristic.getUuid() + " (requestId=" + requestId + ", offset=" + offset + ")");
+			Logger.i(mLogSession, "[Server] READ request for characteristic " + characteristic.getUuid() + " received");
+
+			byte[] value = characteristic.getValue();
+			if (value != null && offset > 0) {
+				byte[] offsetValue = new byte[value.length - offset];
+				System.arraycopy(value, offset, offsetValue, 0, offsetValue.length);
+				value = offsetValue;
+			}
+			if (value != null)
+				Logger.d(mLogSession, "server.sendResponse(GATT_SUCCESS, value=" + ParserUtils.parse(value) + ")");
+			else
+				Logger.d(mLogSession, "server.sendResponse(GATT_SUCCESS, value=null)");
+			mBluetoothGattServer.sendResponse(device, requestId, BluetoothGatt.GATT_SUCCESS, offset, value);
+			Logger.v(mLogSession, "[Server] Response sent");
 		}
 
 		@Override
 		public void onCharacteristicWriteRequest(final BluetoothDevice device, final int requestId, final BluetoothGattCharacteristic characteristic, final boolean preparedWrite,
 												 final boolean responseNeeded, final int offset, final byte[] value) {
-			Logger.i(mLogSession, "[Server] Write request to characteristic " + characteristic.getUuid() + " (requestId = " + requestId + ", value = " + ParserUtils.parse(value) + ", offset = " + offset + ")");
-			characteristic.setValue(value);
+			Logger.d(mLogSession, "[Server callback] Write request to characteristic " + characteristic.getUuid()
+					+ " (requestId=" + requestId + ", prepareWrite=" + preparedWrite + ", responseNeeded=" + responseNeeded + ", offset=" + offset + ", value=" + ParserUtils.parse(value) + ")");
+			final String writeType = !responseNeeded ? "WRITE NO RESPONSE" : "WRITE COMMAND";
+			Logger.i(mLogSession, "[Server] " + writeType + " request for characteristic " + characteristic.getUuid() + " received, value: " + ParserUtils.parse(value));
 
-			if (value != null && value.length == 1) { // small validation
+			if (offset == 0) {
+				characteristic.setValue(value);
+			} else {
+				final byte[] currentValue = characteristic.getValue();
+				final byte[] newValue = new byte[currentValue.length + value.length];
+				System.arraycopy(currentValue, 0, newValue, 0, currentValue.length);
+				System.arraycopy(value, 0, newValue, offset, value.length);
+				characteristic.setValue(newValue);
+			}
+
+			if (!preparedWrite && value != null && value.length == 1) { // small validation
 				if (value[0] != NO_ALERT[0]) {
 					Logger.a(mLogSession, "[Server] Immediate alarm request received: " + AlertLevelParser.parse(characteristic));
 					mCallbacks.onAlarmTriggered();
@@ -166,39 +191,44 @@ public void onCharacteristicWriteRequest(final BluetoothDevice device, final int
 					mCallbacks.onAlarmStopped();
 				}
 			}
-			if (responseNeeded) {
-				Logger.v(mLogSession, "[Server] Sending response: SUCCESS");
-				Logger.d(mLogSession, "[Server] sendResponse(GATT_SUCCESS)");
-				mBluetoothGattServer.sendResponse(device, requestId, BluetoothGatt.GATT_SUCCESS, offset, null);
-			}
+
+			Logger.d(mLogSession, "server.sendResponse(GATT_SUCCESS, offset=" + offset + ", value=" + ParserUtils.parse(value) + ")");
+			mBluetoothGattServer.sendResponse(device, requestId, BluetoothGatt.GATT_SUCCESS, offset, null);
+			Logger.v(mLogSession, "[Server] Response sent");
 		}
 
 		@Override
 		public void onDescriptorReadRequest(final BluetoothDevice device, final int requestId, final int offset, final BluetoothGattDescriptor descriptor) {
-			Logger.i(mLogSession, "[Server] Write request to descriptor " + descriptor.getUuid() + " (requestId = " + requestId + ", offset = " + offset + ")");
+			Logger.d(mLogSession, "[Server callback] Write request to descriptor " + descriptor.getUuid() + " (requestId=" + requestId + ", offset=" + offset + ")");
+			Logger.i(mLogSession, "[Server] READ request for descriptor " + descriptor.getUuid() + " received");
 			// This method is not supported
-			Logger.v(mLogSession, "[Server] Sending response: REQUEST_NOT_SUPPORTED");
-			Logger.d(mLogSession, "[Server] sendResponse(GATT_REQUEST_NOT_SUPPORTED)");
+			Logger.w(mLogSession, "[Server] Operation not supported");
+			Logger.d(mLogSession, "[Server] server.sendResponse(GATT_REQUEST_NOT_SUPPORTED)");
 			mBluetoothGattServer.sendResponse(device, requestId, BluetoothGatt.GATT_REQUEST_NOT_SUPPORTED, offset, null);
+			Logger.v(mLogSession, "[Server] Response sent");
 		}
 
 		@Override
 		public void onDescriptorWriteRequest(final BluetoothDevice device, final int requestId, final BluetoothGattDescriptor descriptor, final boolean preparedWrite,
 											 final boolean responseNeeded, final int offset, final byte[] value) {
-			Logger.i(mLogSession, "[Server] Write request to descriptor " + descriptor.getUuid() + " (requestId = " + requestId + ", value = " + ParserUtils.parse(value) + ", offset = " + offset + ")");
+			Logger.d(mLogSession, "[Server callback] Write request to descriptor " + descriptor.getUuid()
+					+ " (requestId=" + requestId + ", prepareWrite=" + preparedWrite + ", responseNeeded=" + responseNeeded + ", offset=" + offset + ", value=" + ParserUtils.parse(value) + ")");
+			Logger.i(mLogSession, "[Server] READ request for descriptor " + descriptor.getUuid() + " received");
 			// This method is not supported
-			Logger.v(mLogSession, "[Server] Sending response: REQUEST_NOT_SUPPORTED");
-			Logger.d(mLogSession, "[Server] sendResponse(GATT_REQUEST_NOT_SUPPORTED)");
+			Logger.w(mLogSession, "[Server] Operation not supported");
+			Logger.d(mLogSession, "[Server] server.sendResponse(GATT_REQUEST_NOT_SUPPORTED)");
 			mBluetoothGattServer.sendResponse(device, requestId, BluetoothGatt.GATT_REQUEST_NOT_SUPPORTED, offset, null);
+			Logger.v(mLogSession, "[Server] Response sent");
 		}
 
 		@Override
 		public void onExecuteWrite(final BluetoothDevice device, final int requestId, final boolean execute) {
-			Logger.i(mLogSession, "[Server] Execute write request (requestId = " + requestId + ")");
+			Logger.d(mLogSession, "[Server callback] Execute write request (requestId=" + requestId + ", execute=" + execute + ")");
 			// This method is not supported
-			Logger.v(mLogSession, "[Server] Sending response: REQUEST_NOT_SUPPORTED");
-			Logger.d(mLogSession, "[Server] sendResponse(GATT_REQUEST_NOT_SUPPORTED)");
+			Logger.w(mLogSession, "[Server] Operation not supported");
+			Logger.d(mLogSession, "[Server] server.sendResponse(GATT_REQUEST_NOT_SUPPORTED)");
 			mBluetoothGattServer.sendResponse(device, requestId, BluetoothGatt.GATT_REQUEST_NOT_SUPPORTED, 0, null);
+			Logger.v(mLogSession, "[Server] Response sent");
 		}
 	};
 
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 8f8df29d538f165b06c56e93353d1f8d84a45c23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4518
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
Ef)>4?*Z=?k

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0dc75c6b7dac6b2d44d35d42d660db98e8fd21c
GIT binary patch
literal 12851
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

literal 0
HcmV?d00001

diff --git a/build.gradle b/build.gradle
index 1b7886d14..c6371d6cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/common/build.gradle b/common/build.gradle
index 514483db8..4a626da54 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -42,5 +42,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23.0.1'
+    compile 'com.android.support:support-v4:23.1.0'
 }
diff --git a/common/common.iml b/common/common.iml
index 353bc47d3..ac05559df 100644
--- a/common/common.iml
+++ b/common/common.iml
@@ -89,7 +89,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f82986859..f64777bde 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 15 10:34:57 CEST 2015
+#Mon Nov 02 11:30:44 CET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
diff --git a/settings.gradle b/settings.gradle
index 3c5b78f1f..af2c9907a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
 include ':app', ':wear', ':common'
 
-include ':dfu'
-project(':dfu').projectDir = file('../DFULibrary/dfu')
+// Uncomment these lines if you want to import the DFULibrary as a project, not from jcenter
+// include ':dfu'
+// project(':dfu').projectDir = file('../DFULibrary/dfu')
\ No newline at end of file
diff --git a/wear/build.gradle b/wear/build.gradle
index 21286ff06..be142af2e 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 20
         targetSdkVersion 23
-        versionCode 39
-        versionName "1.16.0"
+        versionCode 40
+        versionName "1.16.1"
     }
     buildTypes {
         release {
@@ -23,7 +23,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.google.android.support:wearable:1.3.0'
-    compile 'com.google.android.gms:play-services-wearable:7.8.0'
+    compile 'com.google.android.gms:play-services-wearable:8.3.0'
     compile 'no.nordicsemi.android.support.v18:scanner:0.1.1'
     compile project(':common')
 }
diff --git a/wear/wear.iml b/wear/wear.iml
index d2ec81bef..10964c235 100644
--- a/wear/wear.iml
+++ b/wear/wear.iml
@@ -90,13 +90,14 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="play-services-wearable-7.8.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-8.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-wearable-8.3.0" level="project" />
     <orderEntry type="library" exported="" name="scanner-0.1.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-base-7.8.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="wearable-1.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-basement-8.3.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
     <orderEntry type="module" module-name="common" exported="" />
   </component>
 </module>
\ No newline at end of file