Merge pull request #17 from Orange-OpenSource/16-fix-bluetoothgatt

Fix #16

Author: pylapp

project/app/build.gradle

@@ -39,8 +39,8 @@ android {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        versionCode 22
-        versionName "0.6.0"
+        versionCode 23
+        versionName "0.7.0"
         vectorDrawables.useSupportLibrary true
     }
     buildTypes {

project/app/src/main/java/com/orange/labs/orangetrainingbox/ui/MainActivity.kt

@@ -73,7 +73,7 @@ private val BluetoothAdapter.isDisabled: Boolean
  * @author Marc Poppleton
  * @author Pierre-Yves Lapersonne
  * @since 23/10/2018
- * @version 2.1.0
+ * @version 2.1.1
  */
 class MainActivity : AppCompatActivity() {
 
@@ -247,7 +247,9 @@ class MainActivity : AppCompatActivity() {
      */
     override fun onDestroy() {
         super.onDestroy()
-        bluetoothGatt.close()
+        if (::bluetoothGatt.isInitialized) {
+            bluetoothGatt.close()
+        }
     }
 
     /**

project/build.gradle

@@ -27,7 +27,7 @@ buildscript {
         targetSdkVersion = 28
 
         // App dependencies
-        gradleVersion = '3.4.1'
+        gradleVersion = '3.4.2'
         supportLibraryVersion = '1.0.2'
         kotlinVersion = '1.3.11'
         kotlinCoroutinesVersion = '1.0.1'