Refactoring get url address

Author: anton-knyazev

lib/src/main/java/com/omegar/libs/testconnect/SocketClient.kt

@@ -10,6 +10,7 @@ import org.java_websocket.client.WebSocketClient
 import org.java_websocket.handshake.ServerHandshake
 import java.io.ByteArrayOutputStream
 import java.net.URI
+import java.nio.ByteBuffer
 import kotlin.coroutines.CoroutineContext
 
 /**
@@ -54,13 +55,37 @@ internal class SocketClient(
     }
 
     fun sendLog(logText: String) {
-        if (!isClosed) {
+        if (isOpen) {
             send("$HEADER_LOG:$logText")
         }
     }
 
+    override fun send(text: String?) {
+        try {
+            super.send(text)
+        } catch (e: Throwable) {
+            e.printStackTrace()
+        }
+    }
+
+    override fun send(data: ByteArray?) {
+        try {
+            super.send(data)
+        } catch (e: Throwable) {
+            e.printStackTrace()
+        }
+    }
+
+    override fun send(bytes: ByteBuffer?) {
+        try {
+            super.send(bytes)
+        } catch (e: Throwable) {
+            e.printStackTrace()
+        }
+    }
+
     fun sendScreenshot(bitmap: Bitmap) {
-        if (!isClosed) {
+        if (isOpen) {
             val stream = ByteArrayOutputStream()
             stream.write("$HEADER_SEND_SCREENSHOT:".toByteArray())
             bitmap.compress(Bitmap.CompressFormat.JPEG, 80, stream)

lib/src/main/java/com/omegar/libs/testconnect/TestConnector.kt

@@ -6,6 +6,7 @@ import android.content.pm.PackageManager.NameNotFoundException
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
+import android.net.Uri
 import android.os.Build
 import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
@@ -62,10 +63,11 @@ internal object TestConnector : Callback, CoroutineScope {
         }
 
     fun init(context: Context) {
-        if (BuildConfig.DEBUG) {
+        val serverAddress = if (BuildConfig.DEBUG) context.getServerAddress() else null
+        if (serverAddress != null) {
             logCatcher = LogCatcher()
             socketClient = SocketClient(
-                url = "ws://192.168.10.57:8080/ws",
+                url = serverAddress,
                 deviceName = context.deviceName,
                 appName = context.appName,
                 appVersion = context.appVersion,
@@ -77,6 +79,22 @@ internal object TestConnector : Callback, CoroutineScope {
         }
     }
 
+    private fun Context.getServerAddress(): String? {
+        try {
+            val serverAddressUri: Uri = OmegaTestConnectContract.CONTENT_URI
+            val projection = arrayOf(OmegaTestConnectContract.COLUMN_SERVER_ADDRESS)
+            val cursor = contentResolver.query(serverAddressUri, projection, null, null, null)
+            if (cursor != null && cursor.moveToFirst()) {
+                val serverAddress = cursor.getString(cursor.getColumnIndexOrThrow(OmegaTestConnectContract.COLUMN_SERVER_ADDRESS))
+                cursor.close()
+                return serverAddress
+            }
+        } catch (e: Throwable) {
+            e.printStackTrace()
+        }
+        return null
+    }
+
     override fun startLog() {
         logJob = launch {
             logCatcher?.flow?.collect {
@@ -116,4 +134,11 @@ internal object TestConnector : Callback, CoroutineScope {
             null
         }
     }
+
+    object OmegaTestConnectContract {
+
+        const val COLUMN_SERVER_ADDRESS = "server_address"
+        const val AUTHORITY = "com.omega.testconnectprovider"
+        val CONTENT_URI = Uri.parse("content://$AUTHORITY/server_address")
+    }
 }