diff --git a/app/src/debug/java/no/nordicsemi/android/nrftoolbox/NrfToolboxApplication.kt b/app/src/debug/java/no/nordicsemi/android/nrftoolbox/NrfToolboxApplication.kt
index 24cfd5e9..3ab3b539 100644
--- a/app/src/debug/java/no/nordicsemi/android/nrftoolbox/NrfToolboxApplication.kt
+++ b/app/src/debug/java/no/nordicsemi/android/nrftoolbox/NrfToolboxApplication.kt
@@ -51,5 +51,7 @@ class NrfToolboxApplication : Application() {
super.onCreate()
analytics.logEvent(AppOpenEvent)
+
+ uartServer.start(this)
}
}
diff --git a/lib_service/src/main/AndroidManifest.xml b/lib_service/src/main/AndroidManifest.xml
index 54555f08..3931a3c2 100644
--- a/lib_service/src/main/AndroidManifest.xml
+++ b/lib_service/src/main/AndroidManifest.xml
@@ -34,7 +34,9 @@
-
+
+
+
\ No newline at end of file
diff --git a/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt b/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt
index 4337189d..e4f203aa 100644
--- a/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt
+++ b/lib_service/src/main/java/no/nordicsemi/android/service/NotificationService.kt
@@ -37,8 +37,6 @@ import android.app.NotificationManager
import android.app.PendingIntent
import android.content.Intent
import android.os.Build
-import android.os.Build.VERSION.SDK_INT
-import android.os.Parcelable
import androidx.annotation.RequiresApi
import androidx.core.app.NotificationCompat
import androidx.core.content.ContextCompat
@@ -135,11 +133,6 @@ abstract class NotificationService : LifecycleService() {
nm.cancel(NOTIFICATION_ID)
}
- inline fun Intent.parcelable(key: String): T? = when {
- SDK_INT >= 33 -> getParcelableExtra(key, T::class.java)
- else -> @Suppress("DEPRECATION") getParcelableExtra(key) as? T
- }
-
companion object {
private const val NOTIFICATION_ID = 200
}
diff --git a/profile_cgms/src/main/AndroidManifest.xml b/profile_cgms/src/main/AndroidManifest.xml
index b1ff5f80..10b325bc 100644
--- a/profile_cgms/src/main/AndroidManifest.xml
+++ b/profile_cgms/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-
-
-
-
+
-
\ No newline at end of file
+
diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt
index 23a4fdee..724527de 100644
--- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt
+++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt
@@ -33,6 +33,7 @@ package no.nordicsemi.android.cgms.repository
import android.annotation.SuppressLint
import android.content.Intent
+import androidx.core.content.IntentCompat
import androidx.lifecycle.lifecycleScope
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.catch
@@ -107,7 +108,7 @@ internal class CGMService : NotificationService() {
repository.setServiceRunning(true)
- val device = intent!!.getParcelableExtra(DEVICE_DATA)!!
+ val device = IntentCompat.getParcelableExtra(intent!!, DEVICE_DATA, ServerDevice::class.java)!!
startGattClient(device)
diff --git a/profile_csc/src/main/AndroidManifest.xml b/profile_csc/src/main/AndroidManifest.xml
index 31ce6f56..dfa65a53 100644
--- a/profile_csc/src/main/AndroidManifest.xml
+++ b/profile_csc/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-
-