app/build.gradle.kts

@@ -52,7 +52,6 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
     implementation(libs.ktor.client.core)
     implementation(libs.ktor.client.cio)
-    implementation(libs.ktor.client.websockets)
     implementation(libs.androidx.camera.core)
     implementation(libs.androidx.camera.camera2)
     implementation(libs.androidx.camera.lifecycle)
@@ -61,7 +60,7 @@ dependencies {
     implementation(libs.androidx.camera.mlkit.vision)
     implementation(libs.androidx.camera.extensions)
     implementation(libs.material3)
-    implementation(libs.stream.webrtc.android)
+    implementation(libs.opencsv)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

app/src/main/java/com/example/tvcontroller/MainActivity.kt

@@ -5,9 +5,6 @@ import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.camera.core.ImageAnalysis
-import androidx.camera.view.CameraController
-import androidx.camera.view.LifecycleCameraController
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Icon
@@ -24,13 +21,8 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.example.tvcontroller.ui.theme.TVControllerTheme
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
 import com.example.tvcontroller.services.BluetoothService
 import com.example.tvcontroller.services.CameraService
 import com.example.tvcontroller.services.ControllerService
@@ -38,10 +30,6 @@ import com.example.tvcontroller.services.DeviceService
 import com.example.tvcontroller.ui.views.CameraView
 import com.example.tvcontroller.ui.views.RemoteView
 import com.example.tvcontroller.ui.views.SettingsView
-import com.example.tvcontroller.webrtc.CameraXCapturer
-import com.example.tvcontroller.webrtc.RtcPeerConnection
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 
 const val TAG = "MainActivity"
@@ -54,22 +42,10 @@ class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val lifecycleOwner: LifecycleOwner = this
+        bluetoothService = BluetoothService(this.applicationContext)
-        val rtcPeerConnection = RtcPeerConnection(applicationContext)
+        deviceService = DeviceService(this.applicationContext)
-        val cameraController =
+        cameraService = CameraService(this.applicationContext)
-            LifecycleCameraController(applicationContext).apply {
+        controllerService = ControllerService(this.applicationContext, bluetoothService)
-                setEnabledUseCases(CameraController.IMAGE_ANALYSIS)
-                setImageAnalysisAnalyzer(
-                    ContextCompat.getMainExecutor(applicationContext),
-                    rtcPeerConnection.cameraXCapturer
-                )
-                bindToLifecycle(lifecycleOwner)
-
-            }
-        bluetoothService = BluetoothService(applicationContext)
-        deviceService = DeviceService(applicationContext)
-        cameraService = CameraService(applicationContext)
-        controllerService = ControllerService(applicationContext, bluetoothService)
         checkPermissions()
         enableEdgeToEdge()
         setContent {
@@ -77,9 +53,7 @@ class MainActivity : ComponentActivity() {
                 TvControllerApp(
                     deviceService = deviceService,
                     controllerService = controllerService,
-                    bluetoothService = bluetoothService,
+                    bluetoothService = bluetoothService
-                    rtcPeerConnection = rtcPeerConnection,
-                    cameraController = cameraController
                 )
             }
         }
@@ -102,9 +76,7 @@ fun TvControllerApp(
     navController: NavHostController = rememberNavController(),
     deviceService: DeviceService,
     controllerService: ControllerService,
-    bluetoothService: BluetoothService,
+    bluetoothService: BluetoothService
-    rtcPeerConnection: RtcPeerConnection,
-    cameraController: LifecycleCameraController
 ) {
     val backStackEntry by navController.currentBackStackEntryAsState()
     val currentScreen = Screen.valueOf(backStackEntry?.destination?.route ?: Screen.Camera.name)
@@ -150,11 +122,11 @@ fun TvControllerApp(
     }) { innerPadding ->
         NavHost(
             navController = navController,
-            startDestination = Screen.Settings.name,
+            startDestination = Screen.Remote.name,
             modifier = Modifier.padding(innerPadding)
         ) {
             composable(route = Screen.Camera.name) {
-                CameraView(cameraController)
+                CameraView()
             }
             composable(route = Screen.Remote.name) {
                 RemoteView(
@@ -164,8 +136,7 @@ fun TvControllerApp(
             composable(route = Screen.Settings.name) {
                 SettingsView(
                     deviceService = deviceService,
-                    bluetoothService = bluetoothService,
+                    bluetoothService = bluetoothService
-                    rtcPeerConnection = rtcPeerConnection
                 )
             }
         }

app/src/main/java/com/example/tvcontroller/services/ControllerService.kt

@@ -2,7 +2,9 @@ package com.example.tvcontroller.services
 
 import android.content.Context
 import android.util.Log
+import com.example.tvcontroller.R
 import com.example.tvcontroller.data.RemoteCommand
+import com.opencsv.CSVReader
 import org.json.JSONObject
 
 
@@ -36,6 +38,21 @@ class ControllerService(
     }
 
     fun loadCommands() {
+        Log.i("ControllerService", "Loading commands");
+        var inputStream = context.resources.openRawResource(R.raw.samsung)
+        var csvReader = CSVReader(inputStream.reader())
+        csvReader.forEach { nextLine ->
+            if (nextLine.size < 5) return@forEach
+            if (nextLine[0] == "functionname") return@forEach
+            var remoteCommand = RemoteCommand()
+            remoteCommand.functionName = nextLine[0]
+            remoteCommand.protocol = "samsung"
+            remoteCommand.device = nextLine[2]
+            remoteCommand.subdevice = nextLine[3]
+            remoteCommand.function = nextLine[4]
+            samsungCommands[remoteCommand.functionName!!] = remoteCommand
+        }
+        Log.i("ControllerService", "Commands loaded: ${samsungCommands.size}")
     }
 
     companion object {

app/src/main/java/com/example/tvcontroller/services/DeviceService.kt

@@ -8,25 +8,18 @@ import io.ktor.client.engine.cio.*
 import io.ktor.client.*
 import io.ktor.client.call.body
 import io.ktor.client.plugins.cookies.HttpCookies
-import io.ktor.client.plugins.websocket.WebSockets
-import io.ktor.client.plugins.websocket.webSocket
 import io.ktor.client.request.headers
 import io.ktor.client.request.request
 import io.ktor.client.request.setBody
 import io.ktor.client.statement.HttpResponse
 import io.ktor.http.HttpMethod
-import io.ktor.websocket.Frame
-import io.ktor.websocket.readText
-import kotlinx.coroutines.runBlocking
 import org.json.JSONObject
 
 private const val SHARED_PREFERENCES_NAME = "devices";
-private const val TAG = "DeviceService"
 
 class DeviceService(private val context: Context) {
     private var client = HttpClient(CIO) {
         install(HttpCookies)
-        install(WebSockets)
     }
     private var serverAddress: String = ""
     private var token: String = ""
@@ -37,7 +30,7 @@ class DeviceService(private val context: Context) {
     }
 
     suspend fun registerIntegration(name: String, code: String) {
-        Log.i(TAG, "Creating integration for $name with code $code at $serverAddress")
+        Log.i("DeviceService", "Creating integration for $name with code $code at $serverAddress")
         val requestJson = JSONObject()
         requestJson.put("name", name)
         requestJson.put("code", code)
@@ -56,21 +49,21 @@ class DeviceService(private val context: Context) {
             val responseJson = JSONObject(body)
             if (response.status.value != 200) {
                 val error = responseJson.getString("error")
-                Log.e(TAG, "Error getting integration: ${response.status.value} $error")
+                Log.e("DeviceService", "Error getting integration: ${response.status.value} $error")
                 return
             }
             token = responseJson.getString("token")
             deviceId = responseJson.getString("id")
             savePreferences()
 
-            Log.i(TAG, "Response: ${response.status.value} $body")
+            Log.i("DeviceService", "Response: ${response.status.value} $body")
         } catch (e: Exception) {
-            Log.e(TAG, "Error registering integration", e)
+            Log.e("DeviceService", "Error registering integration", e)
         }
     }
 
     suspend fun getIntegration(): Integration? {
-        Log.i(TAG, "Getting integration $deviceId at $serverAddress")
+        Log.i("DeviceService", "Getting integration $deviceId at $serverAddress")
         try {
             val response: HttpResponse =
                 client.request("http://$serverAddress/api/integrations/$deviceId") {
@@ -84,7 +77,7 @@ class DeviceService(private val context: Context) {
             val responseJson = JSONObject(body)
             if (response.status.value != 200) {
                 val error = responseJson.getString("error")
-                Log.e(TAG, "Error getting integration: ${response.status.value} $error")
+                Log.e("DeviceService", "Error getting integration: ${response.status.value} $error")
                 return null
             }
             val integration = Integration(
@@ -93,7 +86,7 @@ class DeviceService(private val context: Context) {
             )
             return integration
         } catch (e: Exception) {
-            Log.e(TAG, "Error getting integration", e)
+            Log.e("DeviceService", "Error getting integration", e)
         }
         return null
     }
@@ -103,7 +96,7 @@ class DeviceService(private val context: Context) {
         serverAddress = sharedPreferences.getString("server_address", "")!!
         token = sharedPreferences.getString("token", "")!!
         deviceId = sharedPreferences.getString("device_id", "")!!
-        Log.i(TAG, "Loaded preferences: $serverAddress $token")
+        Log.i("DeviceService", "Loaded preferences: $serverAddress $token")
     }
 
     private fun savePreferences() {
@@ -117,26 +110,6 @@ class DeviceService(private val context: Context) {
         }
     }
 
-    fun connect() {
-        Log.i(TAG, "Connecting to websocket at $serverAddress")
-        runBlocking {
-            // split server address into host and port
-            val (host, port) = serverAddress.split(":")
-            // if no port is specified, assume 80
-            val portInt = if (port.isEmpty()) 80 else port.toInt()
-            client.webSocket(method = HttpMethod.Get, host = host, port = portInt, path = "/ws") {
-                Log.i(TAG, "Listening for incoming websocket messages")
-                while (true) {
-                    val frame = incoming.receive()
-                    if (frame is Frame.Text) {
-                        val message = frame.readText()
-                        Log.i(TAG, "Received message: $message")
-                    }
-                }
-            }
-        }
-    }
-
     fun setServerAddress(url: String) {
         serverAddress = url
     }

app/src/main/java/com/example/tvcontroller/ui/components/CameraPreview.kt

@@ -12,11 +12,13 @@ fun CameraPreview(
     controller: LifecycleCameraController,
     modifier: Modifier = Modifier
 ) {
+    val lifecycleOwner = LocalLifecycleOwner.current
     AndroidView(
         modifier = modifier,
         factory = {
             PreviewView(it).apply {
                 this.controller = controller
+                controller.bindToLifecycle(lifecycleOwner)
             }
         },
     )

app/src/main/java/com/example/tvcontroller/ui/views/CameraView.kt

@@ -1,26 +1,34 @@
 package com.example.tvcontroller.ui.views
 
-import androidx.camera.core.ImageAnalysis
 import androidx.camera.view.CameraController
 import androidx.camera.view.LifecycleCameraController
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
 import com.example.tvcontroller.ui.components.CameraPreview
 
 @Composable
-fun CameraView(cameraController: LifecycleCameraController) {
+fun CameraView() {
+    val context = LocalContext.current
+    val controller = remember {
+        LifecycleCameraController(context).apply {
+            setEnabledUseCases(CameraController.VIDEO_CAPTURE)
+        }
+    }
     Box(
         modifier = Modifier
             .fillMaxSize()
             .padding(all = 16.dp),
     ) {
-        CameraPreview(controller = cameraController, modifier = Modifier.fillMaxSize())
+        CameraPreview(controller = controller, modifier = Modifier.fillMaxSize())
     }
 }

app/src/main/java/com/example/tvcontroller/ui/views/SettingsViewModel.kt

@@ -54,7 +54,6 @@ class SettingsViewModel(
             deviceService.registerIntegration(deviceName, registrationCode)
             updateConnectionState()
             updateDeviceInfo()
-            deviceService.connect()
         }
     }
 

app/src/main/java/com/example/tvcontroller/webrtc/CameraXCapturer.kt

@@ -1,113 +0,0 @@
-package com.example.tvcontroller.webrtc
-
-import android.graphics.ImageFormat.YUV_420_888
-import android.util.Log
-import androidx.camera.core.ImageAnalysis
-import androidx.camera.core.ImageProxy
-import org.webrtc.CapturerObserver
-import org.webrtc.VideoFrame
-import java.nio.ByteBuffer
-
-class CameraXCapturer : ImageAnalysis.Analyzer {
-    private var capturerObserver: CapturerObserver? = null
-
-    fun setCapturerObserver(capturerObserver: CapturerObserver) {
-        this.capturerObserver = capturerObserver
-    }
-
-    override fun analyze(image: ImageProxy) {
-        if (image.format != YUV_420_888) throw Exception("Unsupported format")
-        Log.i("CameraXCapturer", "Received image from CameraX")
-        var videoFrame = imageProxyToVideoFrame(image)
-        capturerObserver?.onFrameCaptured(videoFrame) ?: image.close()
-    }
-
-    fun imageProxyToVideoFrame(image: ImageProxy): VideoFrame {
-        var buffer = object : VideoFrame.I420Buffer {
-            private var refCount = 0
-            override fun getWidth(): Int {
-                return image.width
-            }
-
-            override fun getHeight(): Int {
-                return image.height
-            }
-
-            override fun toI420(): VideoFrame.I420Buffer? {
-                return this
-            }
-
-            override fun retain() {
-                refCount++
-            }
-
-            override fun release() {
-                refCount--
-                if (refCount == 0) {
-                    image.close()
-                }
-            }
-
-            override fun cropAndScale(
-                cropX: Int,
-                cropY: Int,
-                cropWidth: Int,
-                cropHeight: Int,
-                scaleWidth: Int,
-                scaleHeight: Int
-            ): VideoFrame.Buffer? {
-                return this
-            }
-
-            override fun getDataY(): ByteBuffer? {
-                val format = image.format
-                if (format == YUV_420_888) {
-                    return image.planes[0].buffer
-                }
-                return image.planes[0].buffer
-            }
-
-            override fun getDataU(): ByteBuffer? {
-                val format = image.format
-                if (format == YUV_420_888) {
-                    return image.planes[1].buffer
-                }
-                return image.planes[0].buffer
-            }
-
-            override fun getDataV(): ByteBuffer? {
-                val format = image.format
-                if (format == YUV_420_888) {
-                    return image.planes[2].buffer
-                }
-                return image.planes[0].buffer
-            }
-
-            override fun getStrideY(): Int {
-                val format = image.format
-                if (format == YUV_420_888) {
-                    return image.planes[0].pixelStride
-                }
-                return image.planes[0].pixelStride
-            }
-
-            override fun getStrideU(): Int {
-                val format = image.format
-                if (format == YUV_420_888) {
-                    return image.planes[1].pixelStride
-                }
-                return image.planes[0].pixelStride
-            }
-
-            override fun getStrideV(): Int {
-                val format = image.format
-                if (format == YUV_420_888) {
-                    return image.planes[2].pixelStride
-                }
-                return image.planes[0].pixelStride
-            }
-        }
-        var videoFrame = VideoFrame(buffer, 0, 0)
-        return videoFrame
-    }
-}

app/src/main/java/com/example/tvcontroller/webrtc/RtcPeerConnection.kt

@@ -1,138 +0,0 @@
-package com.example.tvcontroller.webrtc
-
-import android.content.Context
-import android.hardware.camera2.CameraManager
-import android.util.Log
-import org.webrtc.AudioTrack
-import org.webrtc.Camera2Capturer
-import org.webrtc.DataChannel
-import org.webrtc.IceCandidate
-import org.webrtc.MediaConstraints
-import org.webrtc.MediaStream
-import org.webrtc.PeerConnection
-import org.webrtc.PeerConnectionFactory
-import org.webrtc.PeerConnectionFactory.InitializationOptions
-import org.webrtc.SdpObserver
-import org.webrtc.SessionDescription
-import org.webrtc.VideoTrack
-
-const val TAG = "RtcPeerConnection"
-
-class RtcPeerConnection(private val context: Context) : PeerConnection.Observer {
-    private val peerConnectionFactory by lazy { initializeFactory() }
-    private val iceServers by lazy { initializeIceServers() }
-    val cameraXCapturer by lazy { CameraXCapturer() }
-    private val audioTrack by lazy { createAudioTrack() }
-    private val videoTrack by lazy { createVideoTrack() }
-    private var peerConnection: PeerConnection? = null
-
-    private fun initializeFactory(): PeerConnectionFactory {
-        val initOptions = InitializationOptions.builder(context).createInitializationOptions()
-        PeerConnectionFactory.initialize(initOptions)
-
-        val options = PeerConnectionFactory.Options()
-        val peerConnectionFactory =
-            PeerConnectionFactory.builder().setOptions(options).createPeerConnectionFactory()
-        return peerConnectionFactory
-    }
-
-    private fun initializeIceServers(): ArrayList<PeerConnection.IceServer> {
-        val iceServers = ArrayList<PeerConnection.IceServer>()
-        iceServers.add(
-            PeerConnection.IceServer.builder("stun:stun.l.google.com:19302").createIceServer()
-        )
-        return iceServers
-    }
-
-    private fun createAudioTrack(): AudioTrack {
-        val audioConstraints = MediaConstraints()
-        val audioSource = peerConnectionFactory.createAudioSource(audioConstraints)
-        val localAudioTrack = peerConnectionFactory.createAudioTrack("audio_track", audioSource)
-        return localAudioTrack
-    }
-
-    private fun createVideoTrack(): VideoTrack {
-        val videoSource = peerConnectionFactory.createVideoSource(false)
-        cameraXCapturer.setCapturerObserver(videoSource.capturerObserver)
-        val localVideoTrack = peerConnectionFactory.createVideoTrack("video_track", videoSource)
-        localVideoTrack.setEnabled(true)
-        return localVideoTrack
-    }
-
-    fun connect() {
-        Log.i(TAG, "Connecting rtc peer connection")
-        var rtcConfig = PeerConnection.RTCConfiguration(iceServers)
-        var peerConnection = peerConnectionFactory.createPeerConnection(rtcConfig, this)
-
-        var mediaConstraints = MediaConstraints()
-        mediaConstraints.mandatory.add(
-            MediaConstraints.KeyValuePair("OfferToReceiveAudio", "true")
-        );
-        mediaConstraints.mandatory.add(
-            MediaConstraints.KeyValuePair("OfferToReceiveVideo", "true")
-        );
-        peerConnection?.addTrack(audioTrack)
-        peerConnection?.addTrack(videoTrack)
-        peerConnection?.createOffer(object : SdpObserver {
-            override fun onCreateSuccess(sessionDescription: SessionDescription?) {
-                Log.i(TAG, "onCreateSuccess: ${sessionDescription?.description}")
-            }
-
-            override fun onSetSuccess() {
-                Log.i(TAG, "onSetSuccess")
-                TODO("Not yet implemented")
-            }
-
-            override fun onCreateFailure(p0: String?) {
-                Log.i(TAG, "onCreateFailure: $p0")
-                TODO("Not yet implemented")
-            }
-
-            override fun onSetFailure(p0: String?) {
-                Log.i(TAG, "onSetFailure: $p0")
-                TODO("Not yet implemented")
-            }
-
-        }, mediaConstraints)
-    }
-
-    override fun onSignalingChange(p0: PeerConnection.SignalingState?) {
-        Log.i(TAG, "onSignalingChange: $p0")
-    }
-
-    override fun onIceConnectionChange(p0: PeerConnection.IceConnectionState?) {
-        Log.i(TAG, "onIceConnectionChange: $p0")
-    }
-
-    override fun onIceConnectionReceivingChange(p0: Boolean) {
-        Log.i(TAG, "onIceConnectionReceivingChange: $p0")
-    }
-
-    override fun onIceGatheringChange(p0: PeerConnection.IceGatheringState?) {
-        Log.i(TAG, "onIceGatheringChange: $p0")
-    }
-
-    override fun onIceCandidate(p0: IceCandidate?) {
-        Log.i(TAG, "onIceCandidate: $p0")
-    }
-
-    override fun onIceCandidatesRemoved(p0: Array<out IceCandidate?>?) {
-        Log.i(TAG, "onIceCandidatesRemoved: $p0")
-    }
-
-    override fun onAddStream(p0: MediaStream?) {
-        Log.i(TAG, "onAddStream: $p0")
-    }
-
-    override fun onRemoveStream(p0: MediaStream?) {
-        Log.i(TAG, "onRemoveStream: $p0")
-    }
-
-    override fun onDataChannel(p0: DataChannel?) {
-        Log.i(TAG, "onDataChannel: $p0")
-    }
-
-    override fun onRenegotiationNeeded() {
-        Log.i(TAG, "onRenegotiationNeeded")
-    }
-}

gradle/libs.versions.toml

@@ -1,18 +1,18 @@
 [versions]
-agp = "8.9.1"
+agp = "8.9.0"
-cameraCore = "1.4.2"
+cameraCore = "1.4.1"
 kotlin = "2.0.0"
-coreKtx = "1.15.0"
+coreKtx = "1.10.1"
 junit = "4.13.2"
-junitVersion = "1.2.1"
+junitVersion = "1.1.5"
-espressoCore = "3.6.1"
+espressoCore = "3.5.1"
 ktor = "3.1.0"
-lifecycleRuntimeKtx = "2.8.7"
+lifecycleRuntimeKtx = "2.6.1"
-activityCompose = "1.10.1"
+activityCompose = "1.8.0"
-composeBom = "2025.03.01"
+composeBom = "2024.04.01"
-material3 = "1.4.0-alpha11"
+material3 = "1.4.0-alpha10"
-navigationCompose = "2.8.9"
+navigationCompose = "2.8.4"
-streamWebrtcAndroid = "1.3.8"
+opencsv = "4.6"
 
 [libraries]
 androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "cameraCore" }
@@ -39,9 +39,8 @@ androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" }
 material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
-stream-webrtc-android = { module = "io.getstream:stream-webrtc-android", version.ref = "streamWebrtcAndroid" }
+opencsv = { module = "com.opencsv:opencsv", version.ref = "opencsv" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }