Add version check for getDeviceId (#890)

* Add version check for getDeviceId * Add Deprecated annotation for DEVICE_ID add @deprecated("DEVICE_ID will be null on Android Q and above") for DEVICE_ID in ReportField
ACRA · Dec 10, 2021 · 805581c · 805581c
1 parent 8456ef3
commit 805581c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/acra-core/src/main/java/org/acra/collector/DeviceIdCollector.kt b/acra-core/src/main/java/org/acra/collector/DeviceIdCollector.kt
@@ -47,6 +47,7 @@ class DeviceIdCollector : BaseReportFieldCollector(ReportField.DEVICE_ID) {
     @Throws(Exception::class)
     override fun collect(reportField: ReportField, context: Context, config: CoreConfiguration, reportBuilder: ReportBuilder, target: CrashReportData) {
         @Suppress("DEPRECATION")
-        target.put(ReportField.DEVICE_ID, getTelephonyManager(context).deviceId)
+        val deviceId = if(Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) getTelephonyManager(context).deviceId else null
+        target.put(ReportField.DEVICE_ID, deviceId)
     }
-}
+}
diff --git a/acra-javacore/src/main/java/org/acra/ReportField.kt b/acra-javacore/src/main/java/org/acra/ReportField.kt
@@ -171,6 +171,7 @@ enum class ReportField {
     /**
      * Device unique ID (IMEI). Requires READ_PHONE_STATE permission.
      */
+    @Deprecated("DEVICE_ID will be null on Android Q and above")
     DEVICE_ID,
 
     /**
@@ -235,4 +236,4 @@ enum class ReportField {
      * Retrieves the user IP address(es).
      */
     USER_IP
-}
+}