Move callback interfaces into their own packages

agg23 · agg23 · commit 549e30278a36 · 2025-08-15T09:39:27.000-07:00
diff --git a/bridge-settings/src/main/java/com/penumbraos/bridge_settings/SettingsProvider.kt b/bridge-settings/src/main/java/com/penumbraos/bridge_settings/SettingsProvider.kt
@@ -1,8 +1,8 @@
 package com.penumbraos.bridge_settings
 
 import android.util.Log
-import com.penumbraos.bridge.ISettingsCallback
 import com.penumbraos.bridge.ISettingsProvider
+import com.penumbraos.bridge.callback.ISettingsCallback
 import com.penumbraos.bridge_settings.providers.safeCallback
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/IEsimProvider.aidl b/bridge-shared/aidl/com/penumbraos/bridge/IEsimProvider.aidl
@@ -1,6 +1,6 @@
 package com.penumbraos.bridge;
 
-import com.penumbraos.bridge.IEsimCallback;
+import com.penumbraos.bridge.callback.IEsimCallback;
 
 interface IEsimProvider {
     void getProfiles(IEsimCallback callback);
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/IHttpProvider.aidl b/bridge-shared/aidl/com/penumbraos/bridge/IHttpProvider.aidl
@@ -1,6 +1,6 @@
 package com.penumbraos.bridge;
 
-import com.penumbraos.bridge.IHttpCallback;
+import com.penumbraos.bridge.callback.IHttpCallback;
 
 interface IHttpProvider {
     void makeHttpRequest(String requestId, String url, String method, String body, in Map headers, IHttpCallback callback);
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/ISettingsProvider.aidl b/bridge-shared/aidl/com/penumbraos/bridge/ISettingsProvider.aidl
@@ -1,6 +1,6 @@
 package com.penumbraos.bridge;
 
-import com.penumbraos.bridge.ISettingsCallback;
+import com.penumbraos.bridge.callback.ISettingsCallback;
 import com.penumbraos.bridge.types.SystemSettingInfo;
 import com.penumbraos.bridge.types.ActionDefinition;
 import com.penumbraos.bridge.types.AppActionInfo;
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/IShellProvider.aidl b/bridge-shared/aidl/com/penumbraos/bridge/IShellProvider.aidl
@@ -1,6 +1,6 @@
 package com.penumbraos.bridge;
 
-import com.penumbraos.bridge.IShellCallback;
+import com.penumbraos.bridge.callback.IShellCallback;
 
 interface IShellProvider {
     void executeCommand(String command, String workingDirectory, IShellCallback callback);
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/ISttProvider.aidl b/bridge-shared/aidl/com/penumbraos/bridge/ISttProvider.aidl
@@ -1,6 +1,6 @@
 package com.penumbraos.bridge;
 
-import com.penumbraos.bridge.ISttRecognitionListener;
+import com.penumbraos.bridge.callback.ISttRecognitionListener;
 
 interface ISttProvider {
     void initialize(in ISttRecognitionListener callback);
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/ITouchpadProvider.aidl b/bridge-shared/aidl/com/penumbraos/bridge/ITouchpadProvider.aidl
@@ -1,6 +1,6 @@
 package com.penumbraos.bridge;
 
-import com.penumbraos.bridge.ITouchpadCallback;
+import com.penumbraos.bridge.callback.ITouchpadCallback;
 
 interface ITouchpadProvider {
     void registerCallback(ITouchpadCallback callback);
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/IWebSocketProvider.aidl b/bridge-shared/aidl/com/penumbraos/bridge/IWebSocketProvider.aidl
@@ -1,6 +1,6 @@
 package com.penumbraos.bridge;
 
-import com.penumbraos.bridge.IWebSocketCallback;
+import com.penumbraos.bridge.callback.IWebSocketCallback;
 
 interface IWebSocketProvider {
     void openWebSocket(String requestId, String url, in Map headers, IWebSocketCallback callback);
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/callback/IEsimCallback.aidl b/bridge-shared/aidl/com/penumbraos/bridge/callback/IEsimCallback.aidl
@@ -1,4 +1,4 @@
-package com.penumbraos.bridge;
+package com.penumbraos.bridge.callback;
 
 import com.penumbraos.bridge.types.EsimProfile;
 import com.penumbraos.bridge.types.EsimOperationResult;
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/callback/IHttpCallback.aidl b/bridge-shared/aidl/com/penumbraos/bridge/callback/IHttpCallback.aidl
@@ -1,4 +1,4 @@
-package com.penumbraos.bridge;
+package com.penumbraos.bridge.callback;
 
 interface IHttpCallback {
     oneway void onHeaders(String requestId, int statusCode, in Map headers);
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/callback/ISettingsCallback.aidl b/bridge-shared/aidl/com/penumbraos/bridge/callback/ISettingsCallback.aidl
@@ -1,4 +1,4 @@
-package com.penumbraos.bridge;
+package com.penumbraos.bridge.callback;
 
 interface ISettingsCallback {
     void onSettingChanged(String appId, String category, String key, String value);
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/callback/IShellCallback.aidl b/bridge-shared/aidl/com/penumbraos/bridge/callback/IShellCallback.aidl
@@ -1,4 +1,4 @@
-package com.penumbraos.bridge;
+package com.penumbraos.bridge.callback;
 
 interface IShellCallback {
     void onOutput(String output);
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/callback/ISttRecognitionListener.aidl b/bridge-shared/aidl/com/penumbraos/bridge/callback/ISttRecognitionListener.aidl
@@ -1,4 +1,4 @@
-package com.penumbraos.bridge;
+package com.penumbraos.bridge.callback;
 
 interface ISttRecognitionListener {
     void onReadyForSpeech(in Bundle params);
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/callback/ITouchpadCallback.aidl b/bridge-shared/aidl/com/penumbraos/bridge/callback/ITouchpadCallback.aidl
@@ -1,4 +1,4 @@
-package com.penumbraos.bridge;
+package com.penumbraos.bridge.callback;
 
 import android.view.InputEvent;
 
diff --git a/bridge-shared/aidl/com/penumbraos/bridge/callback/IWebSocketCallback.aidl b/bridge-shared/aidl/com/penumbraos/bridge/callback/IWebSocketCallback.aidl
@@ -1,4 +1,4 @@
-package com.penumbraos.bridge;
+package com.penumbraos.bridge.callback;
 
 interface IWebSocketCallback {
     oneway void onOpen(String requestId, in Map headers);
diff --git a/bridge-shell/src/main/java/com/penumbraos/bridge_shell/ShellProvider.kt b/bridge-shell/src/main/java/com/penumbraos/bridge_shell/ShellProvider.kt
@@ -1,22 +1,21 @@
 package com.penumbraos.bridge_shell
 
 import android.util.Log
-import com.penumbraos.bridge.IShellCallback
 import com.penumbraos.bridge.IShellProvider
+import com.penumbraos.bridge.callback.IShellCallback
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeoutOrNull
 import java.io.BufferedReader
 import java.io.File
 import java.io.InputStreamReader
-import java.util.concurrent.TimeUnit
 
 private const val TAG = "ShellProvider"
 private const val DEFAULT_TIMEOUT_MS = 30000
 
 class ShellProvider : IShellProvider.Stub() {
-    
+
     private val scope = CoroutineScope(Dispatchers.IO)
 
     override fun executeCommand(
@@ -45,10 +44,10 @@ class ShellProvider : IShellProvider.Stub() {
         callback: IShellCallback
     ) {
         Log.d(TAG, "Executing command: $command")
-        
+
         try {
             val processBuilder = ProcessBuilder("/bin/sh", "-c", command)
-            
+
             workingDirectory?.let { wd ->
                 val workDir = File(wd)
                 if (workDir.exists() && workDir.isDirectory) {
@@ -62,7 +61,7 @@ class ShellProvider : IShellProvider.Stub() {
             }
 
             val process = processBuilder.start()
-            
+
             val result = withTimeoutOrNull(timeoutMs.toLong()) {
                 val outputReader = BufferedReader(InputStreamReader(process.inputStream))
                 val errorReader = BufferedReader(InputStreamReader(process.errorStream))
@@ -99,10 +98,10 @@ class ShellProvider : IShellProvider.Stub() {
                 errorThread.start()
 
                 val exitCode = process.waitFor()
-                
+
                 outputThread.join()
                 errorThread.join()
-                
+
                 exitCode
             }
 
@@ -117,7 +116,7 @@ class ShellProvider : IShellProvider.Stub() {
                     callback.onComplete(-1)
                 }
             }
-            
+
         } catch (e: Exception) {
             Log.e(TAG, "Error executing command", e)
             safeCallback {
diff --git a/bridge-system/src/main/java/com/penumbraos/bridge_system/provider/EsimProvider.kt b/bridge-system/src/main/java/com/penumbraos/bridge_system/provider/EsimProvider.kt
@@ -2,8 +2,8 @@ package com.penumbraos.bridge_system.provider
 
 import android.content.Context
 import android.util.Log
-import com.penumbraos.bridge.IEsimCallback
 import com.penumbraos.bridge.IEsimProvider
+import com.penumbraos.bridge.callback.IEsimCallback
 import com.penumbraos.bridge.types.EsimOperationResult
 import com.penumbraos.bridge.types.EsimProfile
 import com.penumbraos.bridge_system.esim.FridaCallbackHandler
@@ -191,6 +191,7 @@ class EsimProvider(
                                     )
                                     callback.onOperationResult(operationResult.toEsimOperationResult())
                                 }
+
                                 "ProfileInfoControler" -> {
                                     // For profile operations, create a simple operation result  
                                     val operationResult = OperationResult(
@@ -200,8 +201,12 @@ class EsimProvider(
                                     )
                                     callback.onOperationResult(operationResult.toEsimOperationResult())
                                 }
+
                                 else -> {
-                                    Log.w(TAG, "Unhandled setSysProp callback for pending operation: $pendingOperationType")
+                                    Log.w(
+                                        TAG,
+                                        "Unhandled setSysProp callback for pending operation: $pendingOperationType"
+                                    )
                                     callback.onError("Unhandled setSysProp result for $pendingOperationType")
                                 }
                             }
diff --git a/bridge-system/src/main/java/com/penumbraos/bridge_system/provider/HttpProvider.kt b/bridge-system/src/main/java/com/penumbraos/bridge_system/provider/HttpProvider.kt
@@ -1,8 +1,8 @@
 package com.penumbraos.bridge_system.provider
 
 import android.util.Log
-import com.penumbraos.bridge.IHttpCallback
 import com.penumbraos.bridge.IHttpProvider
+import com.penumbraos.bridge.callback.IHttpCallback
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.OkHttpClient
diff --git a/bridge-system/src/main/java/com/penumbraos/bridge_system/provider/SttProvider.kt b/bridge-system/src/main/java/com/penumbraos/bridge_system/provider/SttProvider.kt
@@ -10,7 +10,7 @@ import android.speech.RecognizerIntent
 import android.speech.SpeechRecognizer
 import android.util.Log
 import com.penumbraos.bridge.ISttProvider
-import com.penumbraos.bridge.ISttRecognitionListener
+import com.penumbraos.bridge.callback.ISttRecognitionListener
 
 private const val TAG = "SttProvider"
 
diff --git a/bridge-system/src/main/java/com/penumbraos/bridge_system/provider/TouchpadProvider.kt b/bridge-system/src/main/java/com/penumbraos/bridge_system/provider/TouchpadProvider.kt
@@ -7,8 +7,8 @@ import android.util.Log
 import android.view.InputChannel
 import android.view.InputEvent
 import android.view.InputEventReceiver
-import com.penumbraos.bridge.ITouchpadCallback
 import com.penumbraos.bridge.ITouchpadProvider
+import com.penumbraos.bridge.callback.ITouchpadCallback
 
 private const val TOUCHPAD_MONITOR_NAME = "Humane Touchpad Monitor"
 private const val TOUCHPAD_DISPLAY_ID = 3344
@@ -23,7 +23,7 @@ class TouchpadProvider(private val looper: Looper) :
     inner class EventListener(inputChannel: InputChannel) :
         InputEventReceiver(inputChannel, looper) {
         override fun onInputEvent(event: InputEvent?) {
-            if (event != null && event.isFromSource(TOUCHPAD_EVENT_SOURCE)) {
+            if (event != null) {
                 val callbacksToRemove = mutableListOf<ITouchpadCallback>()
                 callbacks.forEach { callback ->
                     safeCallback(TAG, {
diff --git a/bridge-system/src/main/java/com/penumbraos/bridge_system/provider/WebSocketProvider.kt b/bridge-system/src/main/java/com/penumbraos/bridge_system/provider/WebSocketProvider.kt
@@ -1,8 +1,8 @@
 package com.penumbraos.bridge_system.provider
 
 import android.util.Log
-import com.penumbraos.bridge.IWebSocketCallback
 import com.penumbraos.bridge.IWebSocketProvider
+import com.penumbraos.bridge.callback.IWebSocketCallback
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
diff --git a/cli/src/main/java/com/penumbraos/cli/SettingsCommand.kt b/cli/src/main/java/com/penumbraos/cli/SettingsCommand.kt
@@ -5,8 +5,8 @@ import android.util.Log
 import com.penumbraos.appprocessmocks.Common
 import com.penumbraos.appprocessmocks.MockContext
 import com.penumbraos.bridge.IBridge
-import com.penumbraos.bridge.ISettingsCallback
 import com.penumbraos.bridge.ISettingsProvider
+import com.penumbraos.bridge.callback.ISettingsCallback
 import com.penumbraos.bridge.external.connectToBridge
 import kotlinx.coroutines.*
 import kotlin.coroutines.resume
diff --git a/sdk/src/main/java/com/penumbraos/sdk/api/EsimClient.kt b/sdk/src/main/java/com/penumbraos/sdk/api/EsimClient.kt
diff --git a/sdk/src/main/java/com/penumbraos/sdk/api/HttpClient.kt b/sdk/src/main/java/com/penumbraos/sdk/api/HttpClient.kt
diff --git a/sdk/src/main/java/com/penumbraos/sdk/api/SettingsClient.kt b/sdk/src/main/java/com/penumbraos/sdk/api/SettingsClient.kt
diff --git a/sdk/src/main/java/com/penumbraos/sdk/api/ShellClient.kt b/sdk/src/main/java/com/penumbraos/sdk/api/ShellClient.kt
diff --git a/sdk/src/main/java/com/penumbraos/sdk/api/TouchpadClient.kt b/sdk/src/main/java/com/penumbraos/sdk/api/TouchpadClient.kt
diff --git a/sdk/src/main/java/com/penumbraos/sdk/api/WebSocketClient.kt b/sdk/src/main/java/com/penumbraos/sdk/api/WebSocketClient.kt
diff --git a/sdk/src/main/java/com/penumbraos/sdk/api/types/SttRecognitionListener.kt b/sdk/src/main/java/com/penumbraos/sdk/api/types/SttRecognitionListener.kt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.penumbraos.bridge;`
	`1`	`+package com.penumbraos.bridge.callback;`
`2`	`2`
`3`	`3`	`import com.penumbraos.bridge.types.EsimProfile;`
`4`	`4`	`import com.penumbraos.bridge.types.EsimOperationResult;`