Merge pull request #315 from iDevicesInc/SWEET-385

Sweet 385
iDevicesInc · Jun 28, 2017 · ddac71a · ddac71a
2 parents 41532d4 + f7e1797
commit ddac71a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 <b>|</b>&nbsp;<a href="https://github.com/iDevicesInc/SweetBlue/wiki">Wiki</a>
 <b>|</b>
 <a href="https://travis-ci.org/iDevicesInc/SweetBlue">
-  <img align="right" src="https://img.shields.io/badge/version-2.52.08-blue.svg" />
+  <img align="right" src="https://img.shields.io/badge/version-2.52.09-blue.svg" />
   <img align="right" src="https://travis-ci.org/iDevicesInc/SweetBlue.svg?branch=master"/>
 </a>
 <p align="center">

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.daemon=true
 
-SEMVER=2_52_08
+SEMVER=2_52_09
 ANDROID_API_LEVEL=25
 STAGE=script_output
 STANDARD_DIR=sweetblue_standard

diff --git a/library/src/main/java/com/idevicesinc/sweetblue/P_NativeServerWrapper.java b/library/src/main/java/com/idevicesinc/sweetblue/P_NativeServerWrapper.java
@@ -56,7 +56,7 @@ public final void clearImplicitDisconnectIgnoring(final String macAddress)
 
 	public final void closeServer()
 	{
-		if( m_nativeLayer.isServerNull() )
+		if( m_nativeLayer == null || m_nativeLayer.isServerNull() )
 		{
 			m_mngr.ASSERT(false, "Native server is already closed and nulled out.");
 		}
@@ -72,7 +72,7 @@ public final void closeServer()
 
 	public final boolean openServer()
 	{
-		if( !m_nativeLayer.isServerNull() )
+		if( m_nativeLayer != null && !m_nativeLayer.isServerNull() )
 		{
 			m_mngr.ASSERT(false, "Native server is already not null!");
 
@@ -181,7 +181,7 @@ final void updateNativeConnectionState(final String macAddress, final int state)
 
 	final void updateNativeConnectionState(final BluetoothDevice device)
 	{
-		if( m_nativeLayer.isServerNull() )
+		if( m_nativeLayer == null || m_nativeLayer.isServerNull() )
 		{
 			m_mngr.ASSERT(false, "Did not expect native server to be null when implicitly refreshing state.");
 		}

diff --git a/library/src/main/java/com/idevicesinc/sweetblue/utils/Uuids.java b/library/src/main/java/com/idevicesinc/sweetblue/utils/Uuids.java
@@ -58,7 +58,7 @@ public final class Uuids
 	public static final UUID CHARACTERISTIC_PRESENTATION_FORMAT_DESCRIPTOR_UUID		= fromShort("2904");
 
 
-	protected final static String BLUETOOTH_CONNECTED_HASH = "1654fee13cf1381a3153d2280d33a160d8a8911e";
+	protected final static String BLUETOOTH_CONNECTED_HASH = "c45075a2f7ca03b687bd062452513558183196bf";
 
 
 	/**