misc refactor

shrimqy · shrimqy · commit cfc5bf411559 · 2025-02-24T19:49:07.000+05:30
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.PROJECT_MEDIA"/>
 
     <uses-permission android:name="android.permission.RECEIVE_SENSITIVE_NOTIFICATIONS"
         tools:ignore="ProtectedPermissions" />
diff --git a/app/src/main/java/com/castle/sefirah/di/AppModule.kt b/app/src/main/java/com/castle/sefirah/di/AppModule.kt
@@ -20,8 +20,8 @@ import sefirah.domain.repository.NetworkManager
 import sefirah.domain.repository.PlaybackRepository
 import sefirah.domain.repository.PreferencesRepository
 import sefirah.domain.repository.SocketFactory
-import sefirah.media.MediaHandler
-import sefirah.media.MediaService
+import sefirah.projection.media.MediaHandler
+import sefirah.projection.media.MediaService
 import sefirah.network.NetworkManagerImpl
 import sefirah.network.NsdService
 import sefirah.network.sftp.SftpServer
diff --git a/app/src/main/java/com/castle/sefirah/presentation/main/ConnectionViewModel.kt b/app/src/main/java/com/castle/sefirah/presentation/main/ConnectionViewModel.kt
@@ -131,13 +131,13 @@ class ConnectionViewModel @Inject constructor(
                     }
                     is ConnectionState.Error -> {
                         _isRefreshing.value = false
-                        withContext(Dispatchers.Main.immediate) {
-                            Toast.makeText(
-                                getApplication(),
-                                "Error: ${state.message}",
-                                Toast.LENGTH_LONG
-                            ).show()
-                        }
+//                        withContext(Dispatchers.Main.immediate) {
+//                            Toast.makeText(
+//                                getApplication(),
+//                                "Error: ${state.message}",
+//                                Toast.LENGTH_LONG
+//                            ).show()
+//                        }
                         connectionStateJob?.cancel()
                     }
                 }
diff --git a/app/src/main/java/com/castle/sefirah/presentation/sync/SyncViewModel.kt b/app/src/main/java/com/castle/sefirah/presentation/sync/SyncViewModel.kt
@@ -3,7 +3,6 @@ package com.castle.sefirah.presentation.sync
 import android.app.Application
 import android.content.Context
 import android.content.Intent
-import android.util.Log
 import android.widget.Toast
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -97,35 +96,24 @@ class SyncViewModel @Inject constructor(
                         }
                         is ConnectionState.Disconnected -> {
                             _isRefreshing.value = false
-                            Toast.makeText(
-                                context,
-                                "Connection failed: Device declined pairing or is unavailable",
-                                Toast.LENGTH_LONG
-                            ).show()
                             connectionStateJob?.cancel() // Stop collecting after failure
                         }
                         ConnectionState.Connecting -> {
                             _isRefreshing.value = true
                         }
                         is ConnectionState.Error -> {
                             _isRefreshing.value = false
-                            Toast.makeText(
-                                context,
-                                "Connection error occurred",
-                                Toast.LENGTH_LONG
-                            ).show()
+//                            Toast.makeText(
+//                                context,
+//                                state.message,
+//                                Toast.LENGTH_LONG
+//                            ).show()
                             connectionStateJob?.cancel()
                         }
                     }
                 }
             } catch (e: Exception) {
-                Log.e(TAG, "Error saving to service: ${e.message}", e)
                 _isRefreshing.value = false
-                Toast.makeText(
-                    context,
-                    "Failed to initiate connection",
-                    Toast.LENGTH_LONG
-                ).show()
             }
         }
     }
diff --git a/core/common/src/main/res/values/strings.xml b/core/common/src/main/res/values/strings.xml
@@ -143,4 +143,5 @@
     <string name="manual_connect">Manual Connect</string>
     <string name="auto_connect">Auto Connect</string>
     <string name="restricted_settings_title">Restricted settings</string>
+    <string name="connection_error">Connection failed: Device declined pairing or is unavailable</string>
 </resources>
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -35,8 +35,7 @@ dependencies {
 
     api(projects.feature.notification)
     api(projects.feature.clipboard)
-    api(projects.feature.media)
-    api(projects.feature.screen)
+    api(projects.feature.projection)
 
     implementation(libs.core.ktx)
     implementation(libs.kotlinx.serialization.json)
diff --git a/core/network/src/main/java/sefirah/network/NetworkService.kt b/core/network/src/main/java/sefirah/network/NetworkService.kt
@@ -39,6 +39,7 @@ import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeoutOrNull
 import sefirah.clipboard.ClipboardHandler
+import sefirah.common.R
 import sefirah.common.notifications.NotificationCenter
 import sefirah.data.repository.AppRepository
 import sefirah.domain.model.ConnectionState
@@ -50,7 +51,6 @@ import sefirah.domain.model.SocketType
 import sefirah.domain.repository.PlaybackRepository
 import sefirah.domain.repository.PreferencesRepository
 import sefirah.domain.repository.SocketFactory
-import sefirah.media.MediaHandler
 import sefirah.network.NetworkDiscovery.NetworkAction
 import sefirah.network.extensions.handleDeviceInfo
 import sefirah.network.extensions.handleMessage
@@ -60,6 +60,7 @@ import sefirah.network.util.ECDHHelper
 import sefirah.network.util.MessageSerializer
 import sefirah.network.util.getInstalledApps
 import sefirah.notification.NotificationHandler
+import sefirah.projection.media.MediaHandler
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -148,31 +149,43 @@ class NetworkService : Service() {
                 sendDeviceInfo(remoteInfo)
 
                 // Wait for device info
-                withTimeoutOrNull(60000) { // 30 seconds timeout
+                val state = withTimeoutOrNull(30000) { // 30 seconds timeout
                     readChannel?.readUTF8Line()?.let { jsonMessage ->
-//                        Log.d(TAG, "Raw received data: $jsonMessage")
-                        val deviceInfo = messageSerializer.deserialize(jsonMessage) as? DeviceInfo
-                        if (deviceInfo == null) {
+                        val message = messageSerializer.deserialize(jsonMessage)
+                        if (message == null) {
                             Log.e(TAG, "Invalid device info received")
-                            return@withTimeoutOrNull null
+                            return@withTimeoutOrNull ConnectionState.Error(getString(R.string.connection_error))
+                        }
+                        when (message) {
+                            is DeviceInfo -> {
+                                connectedDevice = remoteInfo
+                                handleDeviceInfo(message, remoteInfo, connectedIpAddress!!)
+                                return@withTimeoutOrNull ConnectionState.Connected
+                            }
+                            else -> {
+                                Log.w(TAG, "Authentication rejected")
+                                return@withTimeoutOrNull ConnectionState.Error(getString(R.string.connection_error))
+                            }
                         }
-                        connectedDevice = remoteInfo
-                        handleDeviceInfo(deviceInfo, remoteInfo, connectedIpAddress!!)
-                        return@withTimeoutOrNull Unit
                     }
+                    null 
                 } ?: run {
                     Log.e(TAG, "Timeout waiting for device info")
-                    _connectionState.value = ConnectionState.Disconnected()
+                    _connectionState.value = ConnectionState.Error(getString(R.string.connection_error))
                     stop(false)
                     return@launch
                 }
-                _connectionState.value = ConnectionState.Connected
-                startListening()
-                if (remoteInfo.avatar == null) {
-                    sendInstalledApps()
+                _connectionState.value = state
+                if (state == ConnectionState.Connected) {
+                    startListening()
+                    if (remoteInfo.avatar == null) {
+                        sendInstalledApps()
+                    }
+                    // Setup complete
+                    finalizeConnection()
+                } else {
+                    stop(true)
                 }
-                // Setup complete
-                finalizeConnection()
             } catch (e: Exception) {
                 Log.e(TAG, "Error in connecting", e)
                 _connectionState.value = ConnectionState.Disconnected()
diff --git a/core/network/src/main/java/sefirah/network/extensions/MessageHandler.kt b/core/network/src/main/java/sefirah/network/extensions/MessageHandler.kt
@@ -1,5 +1,6 @@
 package sefirah.network.extensions
 
+import android.bluetooth.BluetoothClass.Device
 import android.content.Context
 import android.content.Intent
 import android.media.AudioManager
@@ -30,7 +31,7 @@ import sefirah.network.NetworkService
 import sefirah.network.NetworkService.Companion.TAG
 import sefirah.network.util.ECDHHelper
 
-suspend fun NetworkService.handleMessage(message: SocketMessage) {
+fun NetworkService.handleMessage(message: SocketMessage) {
     when (message) {
         is Misc -> handleMisc(message)
         is NotificationMessage -> notificationHandler.removeNotification(message.notificationKey)
diff --git a/feature/projection/.gitignore b/feature/projection/.gitignore
diff --git a/feature/projection/build.gradle.kts b/feature/projection/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace = "sefirah.media"
+    namespace = "sefirah.projection"
 }
 
 dependencies {
diff --git a/feature/projection/src/main/AndroidManifest.xml b/feature/projection/src/main/AndroidManifest.xml
diff --git a/feature/projection/src/main/java/sefirah/projection/media/MediaHandler.kt b/feature/projection/src/main/java/sefirah/projection/media/MediaHandler.kt
@@ -1,4 +1,4 @@
-package sefirah.media
+package sefirah.projection.media
 
 import sefirah.domain.model.PlaybackData
 
diff --git a/feature/projection/src/main/java/sefirah/projection/media/MediaService.kt b/feature/projection/src/main/java/sefirah/projection/media/MediaService.kt
@@ -1,4 +1,4 @@
-package sefirah.media
+package sefirah.projection.media
 
 import android.content.Context
 import android.media.AudioManager
diff --git a/feature/projection/src/main/java/sefirah/projection/screen/Controller.kt b/feature/projection/src/main/java/sefirah/projection/screen/Controller.kt
@@ -0,0 +1,11 @@
+package sefirah.projection.screen
+
+import android.app.Service
+import android.content.Intent
+import android.os.IBinder
+
+class ScreenControllerService: Service() {
+    override fun onBind(p0: Intent?): IBinder? {
+        return null
+    }
+}
diff --git a/feature/screen/.gitignore b/feature/screen/.gitignore
diff --git a/feature/screen/build.gradle.kts b/feature/screen/build.gradle.kts
diff --git a/feature/screen/src/main/AndroidManifest.xml b/feature/screen/src/main/AndroidManifest.xml
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -34,6 +34,5 @@ include(":data")
 include(":data")
 
 include(":feature:clipboard")
-include(":feature:media")
+include(":feature:projection")
 include(":feature:notification")
-include(":feature:screen")

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ package com.castle.sefirah.presentation.sync`
`3`	`3`	`import android.app.Application`
`4`	`4`	`import android.content.Context`
`5`	`5`	`import android.content.Intent`
`6`		`-import android.util.Log`
`7`	`6`	`import android.widget.Toast`
`8`	`7`	`import androidx.lifecycle.ViewModel`
`9`	`8`	`import androidx.lifecycle.viewModelScope`
`@@ -97,35 +96,24 @@ class SyncViewModel @Inject constructor(`
`97`	`96`	`}`
`98`	`97`	`is ConnectionState.Disconnected -> {`
`99`	`98`	`_isRefreshing.value = false`
`100`		`- Toast.makeText(`
`101`		`- context,`
`102`		`- "Connection failed: Device declined pairing or is unavailable",`
`103`		`- Toast.LENGTH_LONG`
`104`		`- ).show()`
`105`	`99`	`connectionStateJob?.cancel() // Stop collecting after failure`
`106`	`100`	`}`
`107`	`101`	`ConnectionState.Connecting -> {`
`108`	`102`	`_isRefreshing.value = true`
`109`	`103`	`}`
`110`	`104`	`is ConnectionState.Error -> {`
`111`	`105`	`_isRefreshing.value = false`
`112`		`- Toast.makeText(`
`113`		`- context,`
`114`		`- "Connection error occurred",`
`115`		`- Toast.LENGTH_LONG`
`116`		`- ).show()`
	`106`	`+// Toast.makeText(`
	`107`	`+// context,`
	`108`	`+// state.message,`
	`109`	`+// Toast.LENGTH_LONG`
	`110`	`+// ).show()`
`117`	`111`	`connectionStateJob?.cancel()`
`118`	`112`	`}`
`119`	`113`	`}`
`120`	`114`	`}`
`121`	`115`	`} catch (e: Exception) {`
`122`		`- Log.e(TAG, "Error saving to service: ${e.message}", e)`
`123`	`116`	`_isRefreshing.value = false`
`124`		`- Toast.makeText(`
`125`		`- context,`
`126`		`- "Failed to initiate connection",`
`127`		`- Toast.LENGTH_LONG`
`128`		`- ).show()`
`129`	`117`	`}`
`130`	`118`	`}`
`131`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`android {`
`6`		`- namespace = "sefirah.media"`
	`6`	`+ namespace = "sefirah.projection"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package sefirah.media`
	`1`	`+package sefirah.projection.media`
`2`	`2`
`3`	`3`	`import sefirah.domain.model.PlaybackData`
`4`	`4`