Rust system bridge

.github/workflows/pull-request.yml

@@ -17,9 +17,6 @@ jobs:
           java-version: 17
           cache: 'gradle'
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-
       - name: Unit tests
         run: bash ./gradlew testDebugUnitTest
 
@@ -46,12 +43,48 @@ jobs:
           java-version: 17
           cache: 'gradle'
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-
       - name: Ktlint check
         run: ./gradlew ktlintCheck
 
+  rust:
+    name: Rust code style and tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+
+      - name: Install Android Rust targets
+        run: |
+          rustup target add armv7-linux-androideabi
+          rustup target add aarch64-linux-android
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            evdev/src/main/rust/evdev_manager/target/
+          key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-rust-
+
+      - name: Check Rust formatting
+        working-directory: evdev/src/main/rust/evdev_manager
+        run: cargo fmt --check
+
+      - name: Run Rust tests
+        working-directory: evdev/src/main/rust/evdev_manager
+        run: cargo test --package evdev_manager_core
+
   apk:
     name: Build APK
     runs-on: ubuntu-latest
@@ -77,6 +110,18 @@ jobs:
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
+        with:
+          ndk-version: "27.2.12479018"
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install Android Rust targets
+        run: |
+          rustup target add armv7-linux-androideabi
+          rustup target add aarch64-linux-android
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
 
       - name: set up Ruby for fastlane
         uses: ruby/setup-ruby@v1

.github/workflows/testing.yml

@@ -23,9 +23,6 @@ jobs:
           java-version: 17
           cache: 'gradle'
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-
       - name: Unit tests
         run: bash ./gradlew testDebugUnitTest
 
@@ -52,12 +49,48 @@ jobs:
           java-version: 17
           cache: 'gradle'
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-
       - name: Ktlint check
         run: ./gradlew ktlintCheck
 
+  rust:
+    name: Rust code style and tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+
+      - name: Install Android Rust targets
+        run: |
+          rustup target add armv7-linux-androideabi
+          rustup target add aarch64-linux-android
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            evdev/src/main/rust/evdev_manager/target/
+          key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-rust-
+
+      - name: Check Rust formatting
+        working-directory: evdev/src/main/rust/evdev_manager
+        run: cargo fmt --check
+
+      - name: Run Rust tests
+        working-directory: evdev/src/main/rust/evdev_manager
+        run: cargo test --package evdev_manager_core
+
   apk:
     name: Generate and upload APK to Discord
     runs-on: ubuntu-latest
@@ -89,6 +122,18 @@ jobs:
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
+        with:
+          ndk-version: "27.2.12479018"
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install Android Rust targets
+        run: |
+          rustup target add armv7-linux-androideabi
+          rustup target add aarch64-linux-android
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
 
       - name: set up Ruby for fastlane
         uses: ruby/setup-ruby@v1

app/build.gradle.kts

@@ -152,6 +152,7 @@ dependencies {
     implementation(project(":data"))
     implementation(project(":sysbridge"))
     implementation(project(":system"))
+    implementation(project(":evdev"))
     compileOnly(project(":systemstubs"))
 
     coreLibraryDesugaring(libs.desugar.jdk.libs)

app/proguard-rules.pro

@@ -116,7 +116,7 @@
 
 # Keep all AIDL interface classes and their methods
 -keep class io.github.sds100.keymapper.sysbridge.ISystemBridge** { *; }
--keep class io.github.sds100.keymapper.sysbridge.IEvdevCallback** { *; }
+-keep class io.github.sds100.keymapper.evdev.IEvdevCallback** { *; }
 -keep class io.github.sds100.keymapper.sysbridge.IShizukuStarterService** { *; }
 
 -keepclassmembers class io.github.sds100.keymapper.sysbridge.shizuku.ShizukuStarterService {
@@ -138,7 +138,8 @@
 -keep class io.github.sds100.keymapper.sysbridge.** extends android.content.ContentProvider { *; }
 
 # Keep parcelable classes used in AIDL
--keep class io.github.sds100.keymapper.common.models.EvdevDeviceHandle { *; }
+-keep class io.github.sds100.keymapper.common.models.GrabbedDeviceHandle { *; }
+-keep class io.github.sds100.keymapper.common.models.EvdevDeviceInfo { *; }
 
 # Keep all rikka.hidden classes and interfaces as they contain AIDL files
 -keep class rikka.hidden.** { *; }

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
     <!--  This is required because sysbridge has a min sdk of 29 since it depends
       on the binder-ndk library. Building will fail without this because the min sdk
       of the app is 26.-->
-    <uses-sdk tools:overrideLibrary="io.github.sds100.keymapper.sysbridge" />
+    <uses-sdk tools:overrideLibrary="io.github.sds100.keymapper.sysbridge, io.github.sds100.keymapper.evdev" />
 
     <application
         android:name="io.github.sds100.keymapper.KeyMapperApp"

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

@@ -0,0 +1,16 @@
+package io.github.sds100.keymapper.sysbridge.service
+
+import android.os.Looper
+
+class SystemBridge : BaseSystemBridge() {
+
+    companion object {
+        @JvmStatic
+        fun main(args: Array<String>) {
+            @Suppress("DEPRECATION")
+            Looper.prepareMainLooper()
+            SystemBridge()
+            Looper.loop()
+        }
+    }
+}

app/version.properties

@@ -1,2 +1,2 @@
 VERSION_NAME=5.0.0-alpha
-VERSION_CODE=197
+VERSION_CODE=198

base/src/main/java/io/github/sds100/keymapper/base/detection/DetectKeyMapsUseCase.kt

@@ -30,7 +30,6 @@ import io.github.sds100.keymapper.data.repositories.PreferenceRepository
 import io.github.sds100.keymapper.system.popup.ToastAdapter
 import io.github.sds100.keymapper.system.vibrator.VibratorAdapter
 import io.github.sds100.keymapper.system.volume.VolumeAdapter
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
@@ -49,17 +48,12 @@ class DetectKeyMapsUseCaseImpl @AssistedInject constructor(
     private val toastAdapter: ToastAdapter,
     private val resourceProvider: ResourceProvider,
     private val vibrator: VibratorAdapter,
-    @Assisted
-    private val coroutineScope: CoroutineScope,
     private val inputEventHub: InputEventHub,
 ) : DetectKeyMapsUseCase {
 
     @AssistedFactory
     interface Factory {
-        fun create(
-            accessibilityService: IAccessibilityService,
-            coroutineScope: CoroutineScope,
-        ): DetectKeyMapsUseCaseImpl
+        fun create(accessibilityService: IAccessibilityService): DetectKeyMapsUseCaseImpl
     }
 
     companion object {
@@ -228,15 +222,15 @@ class DetectKeyMapsUseCaseImpl @AssistedInject constructor(
         }
     }
 
-    override fun imitateEvdevEvent(devicePath: String, type: Int, code: Int, value: Int) {
+    override fun imitateEvdevEvent(deviceId: Int, type: Int, code: Int, value: Int) {
         if (inputEventHub.isSystemBridgeConnected()) {
             Timber.d(
-                "Imitate evdev event, device path: $devicePath, type: $type, code: $code, value: $value",
+                "Imitate evdev event, device id: $deviceId, type: $type, code: $code, value: $value",
             )
-            inputEventHub.injectEvdevEvent(devicePath, type, code, value)
+            inputEventHub.injectEvdevEvent(deviceId, type, code, value)
         } else {
             Timber.w(
-                "Cannot imitate evdev event without system bridge connected. Device path: $devicePath, type: $type, code: $code, value: $value",
+                "Cannot imitate evdev event without system bridge connected.",
             )
         }
     }
@@ -268,5 +262,5 @@ interface DetectKeyMapsUseCase {
         source: Int = InputDevice.SOURCE_UNKNOWN,
     )
 
-    fun imitateEvdevEvent(devicePath: String, type: Int, code: Int, value: Int)
+    fun imitateEvdevEvent(deviceId: Int, type: Int, code: Int, value: Int)
 }

base/src/main/java/io/github/sds100/keymapper/base/detection/KeyMapAlgorithm.kt

@@ -648,13 +648,8 @@ class KeyMapAlgorithm(
                 val event = EvdevEventAlgo(
                     keyCode = inputEvent.androidCode,
                     clickType = null,
-                    devicePath = inputEvent.device.path,
-                    device = EvdevDeviceInfo(
-                        name = inputEvent.device.name,
-                        bus = inputEvent.device.bus,
-                        vendor = inputEvent.device.vendor,
-                        product = inputEvent.device.product,
-                    ),
+                    deviceId = inputEvent.deviceId,
+                    device = inputEvent.deviceInfo,
                     scanCode = inputEvent.code,
                 )
 
@@ -1490,14 +1485,14 @@ class KeyMapAlgorithm(
                         )
                     } else if (event is EvdevEventAlgo) {
                         useCase.imitateEvdevEvent(
-                            devicePath = event.devicePath,
+                            deviceId = event.deviceId,
                             KMEvdevEvent.TYPE_KEY_EVENT,
                             event.scanCode,
                             KMEvdevEvent.VALUE_DOWN,
                         )
 
                         useCase.imitateEvdevEvent(
-                            devicePath = event.devicePath,
+                            deviceId = event.deviceId,
                             KMEvdevEvent.TYPE_KEY_EVENT,
                             event.scanCode,
                             KMEvdevEvent.VALUE_UP,
@@ -1544,20 +1539,20 @@ class KeyMapAlgorithm(
             } else if (event is EvdevEventAlgo) {
                 if (imitateUpKeyEvent) {
                     useCase.imitateEvdevEvent(
-                        devicePath = event.devicePath,
+                        deviceId = event.deviceId,
                         type = KMEvdevEvent.TYPE_KEY_EVENT,
                         code = event.scanCode,
                         value = KMEvdevEvent.VALUE_UP,
                     )
                 } else {
                     useCase.imitateEvdevEvent(
-                        devicePath = event.devicePath,
+                        deviceId = event.deviceId,
                         type = KMEvdevEvent.TYPE_KEY_EVENT,
                         code = event.scanCode,
                         value = KMEvdevEvent.VALUE_DOWN,
                     )
                     useCase.imitateEvdevEvent(
-                        devicePath = event.devicePath,
+                        deviceId = event.deviceId,
                         type = KMEvdevEvent.TYPE_KEY_EVENT,
                         code = event.scanCode,
                         value = KMEvdevEvent.VALUE_UP,
@@ -1944,7 +1939,7 @@ class KeyMapAlgorithm(
     }
 
     private data class EvdevEventAlgo(
-        val devicePath: String,
+        val deviceId: Int,
         val device: EvdevDeviceInfo,
         val scanCode: Int,
         val keyCode: Int,