#1394 use system bridge for NFC actions

Author: sds100

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - #761 Detect keys with scancodes. Key Mapper will do this automatically if the key code is unknown
   or you record different physical keys from the same device with the same key code.
+- Redesign the Settings screen
 
 ## Removed
 

sysbridge/src/main/aidl/io/github/sds100/keymapper/sysbridge/ISystemBridge.aidl

@@ -31,4 +31,6 @@ interface ISystemBridge {
    void setDataEnabled(int subId, boolean enable) = 12;
 
    void setBluetoothEnabled(boolean enable) = 13;
+
+   void setNfcEnabled(boolean enable) = 14;
 }

sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge/adb/AdbMdns.kt

@@ -124,9 +124,7 @@ internal class AdbMdns(
     private suspend fun discoverPortInternal(): Int? {
         var port: Int? = null
 
-        if (isDiscovering.value) {
-            cleanup()
-        }
+        cleanup()
 
         // Wait for it to stop discovering
         isDiscovering.first { !it }

sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge/service/SystemBridge.kt

@@ -10,6 +10,8 @@ import android.content.pm.IPackageManager
 import android.content.pm.PackageManager
 import android.hardware.input.IInputManager
 import android.net.wifi.IWifiManager
+import android.nfc.INfcAdapter
+import android.nfc.NfcAdapterApis
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -162,6 +164,7 @@ internal class SystemBridge : ISystemBridge.Stub() {
     private val telephonyManager: ITelephony?
     private val packageManager: IPackageManager
     private val bluetoothManager: IBluetoothManager?
+    private val nfcAdapter: INfcAdapter?
 
     private val processPackageName: String = when (Process.myUid()) {
         Process.ROOT_UID -> "root"
@@ -214,6 +217,14 @@ internal class SystemBridge : ISystemBridge.Stub() {
             bluetoothManager = null
         }
 
+        if (hasSystemFeature(PackageManager.FEATURE_NFC)) {
+            waitSystemService(Context.NFC_SERVICE)
+            nfcAdapter =
+                INfcAdapter.Stub.asInterface(ServiceManager.getService(Context.NFC_SERVICE))
+        } else {
+            nfcAdapter = null
+        }
+
         val applicationInfo = getKeyMapperPackageInfo()
 
         if (applicationInfo == null) {
@@ -535,4 +546,20 @@ internal class SystemBridge : ISystemBridge.Stub() {
             bluetoothManager.disable(attributionSource, true)
         }
     }
+
+    override fun setNfcEnabled(enable: Boolean) {
+        if (nfcAdapter == null) {
+            throw UnsupportedOperationException("NFC not supported")
+        }
+
+        if (enable) {
+            NfcAdapterApis.enable(nfcAdapter, processPackageName)
+        } else {
+            NfcAdapterApis.disable(
+                adapter = nfcAdapter,
+                saveState = true,
+                packageName = processPackageName
+            )
+        }
+    }
 }

system/src/main/java/io/github/sds100/keymapper/system/nfc/AndroidNfcAdapter.kt

@@ -2,25 +2,40 @@ package io.github.sds100.keymapper.system.nfc
 
 import android.content.Context
 import android.nfc.NfcManager
+import android.os.Build
 import androidx.core.content.getSystemService
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.sds100.keymapper.common.utils.KMResult
+import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionManager
 import io.github.sds100.keymapper.system.root.SuAdapter
-import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AndroidNfcAdapter @Inject constructor(
     @ApplicationContext private val context: Context,
     private val suAdapter: SuAdapter,
+    private val systemBridgeConnectionManager: SystemBridgeConnectionManager
 ) : NfcAdapter {
     private val ctx = context.applicationContext
 
-    private val nfcManager: NfcManager by lazy { ctx.getSystemService()!! }
+    private val nfcManager: NfcManager? by lazy { ctx.getSystemService() }
 
-    override fun isEnabled(): Boolean = nfcManager.defaultAdapter.isEnabled
+    override fun isEnabled(): Boolean = nfcManager?.defaultAdapter?.isEnabled ?: false
 
-    override fun enable(): KMResult<*> = suAdapter.execute("svc nfc enable")
+    override fun enable(): KMResult<*> {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            return systemBridgeConnectionManager.run { bridge -> bridge.setNfcEnabled(true) }
+        } else {
+            return suAdapter.execute("svc nfc enable")
+        }
+    }
 
-    override fun disable(): KMResult<*> = suAdapter.execute("svc nfc disable")
+    override fun disable(): KMResult<*> {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            return systemBridgeConnectionManager.run { bridge -> bridge.setNfcEnabled(false) }
+        } else {
+            return suAdapter.execute("svc nfc disable")
+        }
+    }
 }

systemstubs/src/main/java/android/nfc/INfcAdapter.java

@@ -0,0 +1,24 @@
+package android.nfc;
+
+import android.os.Build;
+import android.os.IBinder;
+
+import androidx.annotation.RequiresApi;
+
+public interface INfcAdapter extends android.os.IInterface {
+    boolean enable();
+
+    boolean disable(boolean saveState);
+
+    @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
+    boolean enable(String pkg);
+
+    @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
+    boolean disable(boolean saveState, String pkg);
+
+    abstract class Stub extends android.os.Binder implements INfcAdapter {
+        public static INfcAdapter asInterface(IBinder obj) {
+            throw new RuntimeException("Stub!");
+        }
+    }
+}

systemstubs/src/main/java/android/nfc/NfcAdapterApis.kt

@@ -0,0 +1,21 @@
+package android.nfc
+
+import android.os.Build
+
+object NfcAdapterApis {
+    fun enable(adapter: INfcAdapter, packageName: String) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            adapter.enable(packageName)
+        } else {
+            adapter.enable()
+        }
+    }
+
+    fun disable(adapter: INfcAdapter, saveState: Boolean, packageName: String) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            adapter.disable(saveState, packageName)
+        } else {
+            adapter.disable(saveState)
+        }
+    }
+}