taler-android

commit bead98777dab64724795be304426aaf01db98e4d
parent 696325e086ea5133000511a49ef957a80bc7bbf7
Author: Iván Ávalos <avalos@disroot.org>
Date:   Sat, 17 Aug 2024 10:00:31 +0200

Catch NullPointerException in NFC service

Diffstat:
M
taler-kotlin-android/src/main/java/net/taler/lib/android/TalerNfcService.kt
 | 
8
+++++---

1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/taler-kotlin-android/src/main/java/net/taler/lib/android/TalerNfcService.kt b/taler-kotlin-android/src/main/java/net/taler/lib/android/TalerNfcService.kt
@@ -304,10 +304,12 @@ class TalerNfcService : HostApduService() {
             val adapter = getDefaultAdapter(activity) ?: return
             val emulation = CardEmulation.getInstance(adapter)
             // TODO: find an alternative for when canonicalName is null
-            TalerNfcService::class.java.canonicalName?.let {
-                val cn = ComponentName(activity.packageName, it)
+            try {
+                val cn = ComponentName(activity, TalerNfcService::class.java)
                 emulation.setPreferredService(activity, cn)
-            } ?: Log.d(TAG, "Not setting this app as the preferred NFC handler!")
+            } catch (e: NullPointerException) {
+                Log.d(TAG, "Not setting this app as the preferred NFC handler!")
+            }
         }
 
         fun unsetDefaultHandler(activity: Activity) {