Merge branch 'release/v2.4.5'

Apolline-Lille · May 27, 2018 · 35f05d4 · 35f05d4
2 parents a021754 + 5b841bf
commit 35f05d4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 27
 
-        versionCode 21
-        versionName "2.4.4"
+        versionCode 22
+        versionName "2.4.5"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         javaCompileOptions {

diff --git a/app/src/main/java/science/apolline/view/activity/MainActivity.kt b/app/src/main/java/science/apolline/view/activity/MainActivity.kt
@@ -116,6 +116,9 @@ class MainActivity : RootActivity(), NavigationView.OnNavigationItemSelectedList
         } else {
             val backStackEntryCount = supportFragmentManager.backStackEntryCount
             if (backStackEntryCount == 1) {
+                if (IOIOService.getServiceStatus()){
+                    stopService(Intent(applicationContext, IOIOService::class.java))
+                }
                 val intent = Intent(this, SplashScreen::class.java)
                 startActivity(intent)
                 finish()

diff --git a/app/src/main/java/science/apolline/view/activity/SplashScreen.kt b/app/src/main/java/science/apolline/view/activity/SplashScreen.kt
@@ -32,7 +32,9 @@ import science.apolline.root.RootActivity
 import com.github.ivbaranov.rxbluetooth.predicates.BtPredicate
 import com.fondesa.kpermissions.extension.permissionsBuilder
 import com.fondesa.kpermissions.request.PermissionRequest
+import ioio.lib.util.android.IOIOService
 import org.jetbrains.anko.*
+import science.apolline.service.sensor.IOIOService.Companion.getServiceStatus
 import science.apolline.utils.CheckUtility
 
 
@@ -56,6 +58,11 @@ class SplashScreen : RootActivity(), AnkoLogger {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (getServiceStatus()){
+            val intent = Intent(this, MainActivity::class.java)
+            startActivity(intent)
+            finish()
+        }
         mPrefs = PreferenceManager.getDefaultSharedPreferences(applicationContext)
         EXTRA_DEVICE_ADDRESS = mPrefs.getString("device_uuid", "ffffffff-ffff-ffff-ffff-ffffffffffff")
         SENSOR_MAC_ADDRESS = mPrefs.getString("sensor_mac_address", "ff-ff-ff-ff-ff-ff")

diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt
@@ -0,0 +1 @@
+- Fix some bugs.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/22.txt b/fastlane/metadata/android/fr-FR/changelogs/22.txt
@@ -0,0 +1 @@
+- Correction de quelques bugs.