Fix crashes observed on Firebase console (#130)

* Switch getParcelableExtra to IntentCompat * Fix MissingForegroundServiceTypeException * Fix UART server * Move foreground service permissions to one place
NordicSemiconductor · Oct 16, 2023 · 391a4e0 · 391a4e0
1 parent 9c1ac06
commit 391a4e0
Show file tree

Hide file tree

Showing 18 changed files with 67 additions and 184 deletions.
diff --git 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
@@ -34,7 +34,9 @@
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
+
 </manifest>
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
@@ -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 <reified T : Parcelable> 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
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2022, Nordic Semiconductor
   ~ All rights reserved.
   ~
@@ -31,8 +30,10 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
     <application>
-        <service android:name=".repository.CGMService" />
+        <service
+            android:name=".repository.CGMService"
+            android:exported="false"
+            android:foregroundServiceType="connectedDevice" />
     </application>
-</manifest>
+</manifest>
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
@@ -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<ServerDevice>(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
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2022, Nordic Semiconductor
   ~ All rights reserved.
   ~
@@ -37,7 +36,10 @@
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <application>
-        <service android:name=".repository.CSCService" />
+        <service
+            android:name=".repository.CSCService"
+            android:exported="false"
+            android:foregroundServiceType="connectedDevice" />
     </application>
 
 </manifest>
diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCService.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCService.kt
@@ -33,6 +33,7 @@ package no.nordicsemi.android.csc.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
@@ -73,7 +74,7 @@ internal class CSCService : NotificationService() {
 
         repository.setServiceRunning(true)
 
-        val device = intent!!.getParcelableExtra<ServerDevice>(DEVICE_DATA)!!
+        val device = IntentCompat.getParcelableExtra(intent!!, DEVICE_DATA, ServerDevice::class.java)!!
 
         startGattClient(device)
 

diff --git a/profile_hrs/src/main/AndroidManifest.xml b/profile_hrs/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2022, Nordic Semiconductor
   ~ All rights reserved.
   ~
@@ -33,7 +32,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
-        <service android:name=".service.HRSService" />
+        <service
+            android:name=".service.HRSService"
+            android:exported="false"
+            android:foregroundServiceType="connectedDevice" />
     </application>
 
 </manifest>
diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSService.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSService.kt
@@ -33,6 +33,7 @@ package no.nordicsemi.android.hrs.service
 
 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
@@ -75,7 +76,7 @@ internal class HRSService : NotificationService() {
 
         repository.setServiceRunning(true)
 
-        val device = intent!!.getParcelableExtra<ServerDevice>(DEVICE_DATA)!!
+        val device = IntentCompat.getParcelableExtra(intent!!, DEVICE_DATA, ServerDevice::class.java)!!
 
         startGattClient(device)
 

diff --git a/profile_hts/src/main/AndroidManifest.xml b/profile_hts/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2022, Nordic Semiconductor
   ~ All rights reserved.
   ~
@@ -33,7 +32,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
-        <service android:name=".repository.HTSService" />
+        <service
+            android:name=".repository.HTSService"
+            android:exported="false"
+            android:foregroundServiceType="connectedDevice" />
     </application>
 
 </manifest>
diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt
@@ -33,6 +33,7 @@ package no.nordicsemi.android.hts.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
@@ -73,7 +74,7 @@ internal class HTSService : NotificationService() {
 
         repository.setServiceRunning(true)
 
-        val device = intent!!.getParcelableExtra<ServerDevice>(DEVICE_DATA)!!
+        val device = IntentCompat.getParcelableExtra(intent!!, DEVICE_DATA, ServerDevice::class.java)!!
 
         startGattClient(device)
 

diff --git a/profile_prx/src/main/AndroidManifest.xml b/profile_prx/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2022, Nordic Semiconductor
   ~ All rights reserved.
   ~
@@ -33,6 +32,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
-        <service android:name=".repository.PRXService"/>
+        <service
+            android:name=".repository.PRXService"
+            android:exported="false"
+            android:foregroundServiceType="connectedDevice" />
     </application>
 </manifest>
diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt
@@ -33,6 +33,7 @@ package no.nordicsemi.android.prx.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
@@ -92,7 +93,7 @@ internal class PRXService : NotificationService() {
 
         repository.setServiceRunning(true)
 
-        val device = intent!!.getParcelableExtra<ServerDevice>(DEVICE_DATA)!!
+        val device = IntentCompat.getParcelableExtra(intent!!, DEVICE_DATA, ServerDevice::class.java)!!
 
         startServer(device)
 

diff --git a/profile_rscs/src/main/AndroidManifest.xml b/profile_rscs/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2022, Nordic Semiconductor
   ~ All rights reserved.
   ~
@@ -33,6 +32,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
-        <service android:name=".repository.RSCSService"/>
+        <service
+            android:name=".repository.RSCSService"
+            android:exported="false"
+            android:foregroundServiceType="connectedDevice" />
     </application>
 </manifest>
diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt
@@ -33,6 +33,7 @@ package no.nordicsemi.android.rscs.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
@@ -73,7 +74,7 @@ internal class RSCSService : NotificationService() {
 
         repository.setServiceRunning(true)
 
-        val device = intent!!.getParcelableExtra<ServerDevice>(DEVICE_DATA)!!
+        val device = IntentCompat.getParcelableExtra(intent!!, DEVICE_DATA, ServerDevice::class.java)!!
 
         startGattClient(device)
 

diff --git a/profile_uart/src/main/AndroidManifest.xml b/profile_uart/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2022, Nordic Semiconductor
   ~ All rights reserved.
   ~
@@ -33,7 +32,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
-        <service android:name=".repository.UARTService" />
+        <service
+            android:name=".repository.UARTService"
+            android:exported="false"
+            android:foregroundServiceType="connectedDevice" />
     </application>
 
 </manifest>