#19 Start refactor for support easly other communication methods

app/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion 25
     defaultConfig {
-        applicationId "io.github.pedalpi.pedalpi_display"
+        applicationId "io.github.pedalpi.displayview"
         minSdkVersion 10
         targetSdkVersion 25
         versionCode 1
@@ -32,10 +32,11 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:25.4.0'
     //implementation 'com.android.support:appcompat-v7:27.0.2'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:support-annotations:27.0.2'
+    implementation 'com.android.support:support-annotations:27.1.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    implementation 'uk.co.chrisjenx:calligraphy:2.3.0'
-    implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
+    implementation 'uk.co.chrisjenx:calligraphy:2.3.0' // Custom font
+    implementation 'com.github.salomonbrys.kotson:kotson:2.5.0' // Use gsom for json
+    implementation 'com.squareup.okhttp3:okhttp:3.10.0' // HttpClient
 }

app/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:name="io.github.pedalpi.displayview.communication.server.App">
+        android:name="io.github.pedalpi.displayview.App">
         <!--<activity android:naio.github.pedalpi.displayview.activity.MainActivity">-->
 
         <!--<uses-library android:name="com.android.future.usb.accessory" />-->

app/src/main/java/io/github/pedalpi/displayview/App.kt

@@ -0,0 +1,15 @@
+package io.github.pedalpi.displayview
+
+import android.app.Application
+import io.github.pedalpi.displayview.communication.adb.AdbCommunication
+import io.github.pedalpi.displayview.communication.base.Communicator
+
+
+class App : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        Communicator.communication = AdbCommunication()
+        Communicator.initialize()
+    }
+}

app/src/main/java/io/github/pedalpi/displayview/activity/MainActivity.kt

@@ -10,12 +10,12 @@ import android.widget.Button
 import android.widget.TextView
 import io.github.pedalpi.displayview.R
 import io.github.pedalpi.displayview.activity.effects.EffectsActivity
-import io.github.pedalpi.displayview.communication.message.request.Messages
-import io.github.pedalpi.displayview.communication.message.response.EventMessage
-import io.github.pedalpi.displayview.communication.message.response.EventType
-import io.github.pedalpi.displayview.communication.message.response.ResponseMessage
-import io.github.pedalpi.displayview.communication.message.response.ResponseVerb
-import io.github.pedalpi.displayview.communication.server.Server
+import io.github.pedalpi.displayview.communication.adb.message.EventMessage
+import io.github.pedalpi.displayview.communication.adb.message.EventType
+import io.github.pedalpi.displayview.communication.base.Communicator
+import io.github.pedalpi.displayview.communication.base.message.Messages
+import io.github.pedalpi.displayview.communication.base.message.ResponseMessage
+import io.github.pedalpi.displayview.communication.base.message.ResponseVerb
 import io.github.pedalpi.displayview.model.Data
 import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper
 
@@ -41,7 +41,7 @@ class MainActivity : AppCompatActivity() {
         number.text = "--"
         name.text = "CONNECTING"
 
-        Server.setOnMessageListener({ onMessage(it) })
+        Communicator.setOnMessageListener({ onMessage(it) })
 
         val button = findViewById(R.id.button) as Button
         button.setOnClickListener({ goToEffectsList() })
@@ -72,7 +72,7 @@ class MainActivity : AppCompatActivity() {
             val pedalboard = Data.currentPedalboard
 
             runOnUiThread({
-                number.text = if (id < 10) "0"+id else id.toString()
+                number.text = if (id < 10) "0$id" else id.toString()
                 name.text = pedalboard.name
             })
         }
@@ -88,7 +88,7 @@ class MainActivity : AppCompatActivity() {
     public override fun onResume() {
         super.onResume()
 
-        Server.setOnMessageListener({ onMessage(it) })
-        Server.sendBroadcast(Messages.CURRENT_PEDALBOARD_DATA)
+        Communicator.setOnMessageListener({ onMessage(it) })
+        Communicator.send(Messages.CURRENT_PEDALBOARD_DATA)
     }
 }

app/src/main/java/io/github/pedalpi/displayview/activity/effects/EffectsActivity.kt

@@ -11,12 +11,12 @@ import com.github.salomonbrys.kotson.int
 import com.github.salomonbrys.kotson.string
 import io.github.pedalpi.displayview.R
 import io.github.pedalpi.displayview.activity.params.ParamsActivity
-import io.github.pedalpi.displayview.communication.message.request.Messages
-import io.github.pedalpi.displayview.communication.message.response.EventMessage
-import io.github.pedalpi.displayview.communication.message.response.EventType
-import io.github.pedalpi.displayview.communication.message.response.ResponseMessage
-import io.github.pedalpi.displayview.communication.message.response.ResponseVerb
-import io.github.pedalpi.displayview.communication.server.Server
+import io.github.pedalpi.displayview.communication.adb.message.EventMessage
+import io.github.pedalpi.displayview.communication.adb.message.EventType
+import io.github.pedalpi.displayview.communication.base.Communicator
+import io.github.pedalpi.displayview.communication.base.message.Messages
+import io.github.pedalpi.displayview.communication.base.message.ResponseMessage
+import io.github.pedalpi.displayview.communication.base.message.ResponseVerb
 import io.github.pedalpi.displayview.model.Data
 
 
@@ -65,7 +65,7 @@ class EffectsActivity : AppCompatActivity() {
     public override fun onResume() {
         super.onResume()
 
-        Server.setOnMessageListener({ onMessage(it) })
+        Communicator.setOnMessageListener({ onMessage(it) })
     }
 
     override fun onSupportNavigateUp(): Boolean {
@@ -82,7 +82,7 @@ class EffectsActivity : AppCompatActivity() {
     }
 
     private fun requestToggleStatusEffect(dto: EffectsListItemDTO) {
-        Server.sendBroadcast(Messages.CURRENT_PEDALBOARD_TOGGLE_EFFECT(dto.effect))
+        Communicator.send(Messages.CURRENT_PEDALBOARD_TOGGLE_EFFECT(dto.effect))
     }
 
     private fun onMessage(message: ResponseMessage) {

app/src/main/java/io/github/pedalpi/displayview/activity/params/ParamsActivity.kt

@@ -10,12 +10,12 @@ import com.github.salomonbrys.kotson.int
 import com.github.salomonbrys.kotson.string
 import io.github.pedalpi.displayview.R
 import io.github.pedalpi.displayview.activity.effects.EffectsActivity
-import io.github.pedalpi.displayview.communication.message.request.Messages
-import io.github.pedalpi.displayview.communication.message.response.EventMessage
-import io.github.pedalpi.displayview.communication.message.response.EventType
-import io.github.pedalpi.displayview.communication.message.response.ResponseMessage
-import io.github.pedalpi.displayview.communication.message.response.ResponseVerb
-import io.github.pedalpi.displayview.communication.server.Server
+import io.github.pedalpi.displayview.communication.adb.message.EventMessage
+import io.github.pedalpi.displayview.communication.adb.message.EventType
+import io.github.pedalpi.displayview.communication.base.Communicator
+import io.github.pedalpi.displayview.communication.base.message.Messages
+import io.github.pedalpi.displayview.communication.base.message.ResponseMessage
+import io.github.pedalpi.displayview.communication.base.message.ResponseVerb
 import io.github.pedalpi.displayview.model.Data
 import io.github.pedalpi.displayview.model.Effect
 import io.github.pedalpi.displayview.model.Param
@@ -43,7 +43,7 @@ class ParamsActivity : AppCompatActivity() {
 
         populateViews()
 
-        Server.setOnMessageListener({ onMessage(it) })
+        Communicator.setOnMessageListener({ onMessage(it) })
     }
 
     private fun populateViews() {
@@ -66,7 +66,7 @@ class ParamsActivity : AppCompatActivity() {
     }
 
     private fun requestChangeParamValue(param: Param) {
-        Server.sendBroadcast(Messages.Companion.PARAM_VALUE_CHANGE(this.index, param))
+        Communicator.send(Messages.Companion.PARAM_VALUE_CHANGE(this.index, param))
     }
 
     private fun onMessage(message: ResponseMessage) {

app/src/main/java/io/github/pedalpi/displayview/activity/resume/ResumeActivity.kt

@@ -14,12 +14,12 @@ import io.github.pedalpi.displayview.R
 import io.github.pedalpi.displayview.activity.ConfigureInformationActivity
 import io.github.pedalpi.displayview.activity.resume.effectsview.EffectsView
 import io.github.pedalpi.displayview.activity.resume.effectview.EffectView
-import io.github.pedalpi.displayview.communication.message.request.Messages
-import io.github.pedalpi.displayview.communication.message.response.EventMessage
-import io.github.pedalpi.displayview.communication.message.response.EventType
-import io.github.pedalpi.displayview.communication.message.response.ResponseMessage
-import io.github.pedalpi.displayview.communication.message.response.ResponseVerb
-import io.github.pedalpi.displayview.communication.server.Server
+import io.github.pedalpi.displayview.communication.adb.message.EventMessage
+import io.github.pedalpi.displayview.communication.adb.message.EventType
+import io.github.pedalpi.displayview.communication.base.Communicator
+import io.github.pedalpi.displayview.communication.base.message.Messages
+import io.github.pedalpi.displayview.communication.base.message.ResponseMessage
+import io.github.pedalpi.displayview.communication.base.message.ResponseVerb
 import io.github.pedalpi.displayview.model.Data
 import io.github.pedalpi.displayview.model.Effect
 import io.github.pedalpi.displayview.model.Param
@@ -58,9 +58,9 @@ class ResumeActivity : AppCompatActivity() {
         this.effectView.onParamValueChange = { requestChangeParamValue(it) }
         this.effectView.onEffectToggleStatus = { onEffectChangeStatus(it) }
 
-        Server.setOnMessageListener { onMessage(it) }
-        Server.setOnConnectedListener { runOnUiThread { progress.setMessage("Reading plugins data") } }
-        Server.setOnDisconnectedListener { runOnUiThread { showLoading("Trying to reconnect") } }
+        Communicator.setOnMessageListener { onMessage(it) }
+        Communicator.setOnConnectedListener { runOnUiThread { progress.setMessage("Reading plugins data") } }
+        Communicator.setOnDisconnectedListener { runOnUiThread { showLoading("Trying to reconnect") } }
         this.update()
 
         if (!Data.isDataLoaded())
@@ -94,11 +94,11 @@ class ResumeActivity : AppCompatActivity() {
     }
 
     private fun requestToggleEffectStatus(effect: Effect) {
-        Server.sendBroadcast(Messages.CURRENT_PEDALBOARD_TOGGLE_EFFECT(effect))
+        Communicator.send(Messages.CURRENT_PEDALBOARD_TOGGLE_EFFECT(effect))
     }
 
     private fun requestChangeParamValue(param: Param) {
-        Server.sendBroadcast(Messages.PARAM_VALUE_CHANGE(param.effect.index, param))
+        Communicator.send(Messages.PARAM_VALUE_CHANGE(param.effect.index, param))
     }
 
     private fun onMessage(message : ResponseMessage) {
@@ -108,7 +108,7 @@ class ResumeActivity : AppCompatActivity() {
             })
 
         } else if (message.request isEquivalentTo Messages.PLUGINS) {
-            Server.sendBroadcast(Messages.CURRENT_PEDALBOARD_DATA)
+            Communicator.send(Messages.CURRENT_PEDALBOARD_DATA)
             runOnUiThread({
                 progress.setMessage("Reading current pedalboard data")
             })
@@ -126,13 +126,13 @@ class ResumeActivity : AppCompatActivity() {
                 update()
 
             } else if (event.type == EventType.BANK) {
-                Server.sendBroadcast(Messages.CURRENT_PEDALBOARD_DATA)
+                Communicator.send(Messages.CURRENT_PEDALBOARD_DATA)
 
             } else if (event.type == EventType.PEDALBOARD) {
-                Server.sendBroadcast(Messages.CURRENT_PEDALBOARD_DATA)
+                Communicator.send(Messages.CURRENT_PEDALBOARD_DATA)
 
             } else if (event.type == EventType.EFFECT) {
-                Server.sendBroadcast(Messages.CURRENT_PEDALBOARD_DATA)
+                Communicator.send(Messages.CURRENT_PEDALBOARD_DATA)
 
             } else if (event.type == EventType.EFFECT_TOGGLE) {
                 this.updateEffectStatus(event.content["effect"].int)

app/src/main/java/io/github/pedalpi/displayview/communication/adb/AdbCommunication.kt

@@ -0,0 +1,41 @@
+package io.github.pedalpi.displayview.communication.adb
+
+import android.util.Log
+import io.github.pedalpi.displayview.communication.adb.server.Server
+import io.github.pedalpi.displayview.communication.base.Communication
+import io.github.pedalpi.displayview.communication.base.message.RequestMessage
+import java.io.IOException
+
+
+class AdbCommunication: Communication() {
+
+    private val server = Server()
+    private var running = false
+
+    override fun initialize() {
+        val runnable = Runnable { this.runServer() }
+        Thread(runnable).start()
+    }
+
+    private fun runServer() {
+        server.start(8888)
+        running = true
+
+        try {
+            while (running)
+                server.waitClient()
+
+        } catch (e: IOException) {
+            Log.e("ERROR", e.message)
+            throw RuntimeException(e)
+        }
+    }
+
+    override fun close() {
+        running = false
+    }
+
+    override fun send(message: RequestMessage) {
+        server.sendBroadcast(message)
+    }
+}

app/src/main/java/io/github/pedalpi/displayview/communication/Client.kt → app/src/main/java/io/github/pedalpi/displayview/communication/adb/Client.kt

@@ -1,11 +1,11 @@
-package io.github.pedalpi.displayview.communication
+package io.github.pedalpi.displayview.communication.adb
 
 import android.util.Log
-import io.github.pedalpi.displayview.communication.message.Identifier
-import io.github.pedalpi.displayview.communication.message.request.RequestMessage
-import io.github.pedalpi.displayview.communication.message.request.RequestVerb
-import io.github.pedalpi.displayview.communication.message.response.ResponseMessage
-import io.github.pedalpi.displayview.communication.server.Server
+import io.github.pedalpi.displayview.communication.adb.message.Identifier
+import io.github.pedalpi.displayview.communication.base.message.RequestMessage
+import io.github.pedalpi.displayview.communication.base.message.RequestVerb
+import io.github.pedalpi.displayview.communication.adb.server.Server
+import io.github.pedalpi.displayview.communication.base.message.ResponseMessage
 import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader

app/src/main/java/io/github/pedalpi/displayview/communication/adb/MessageBuilder.kt

@@ -0,0 +1,38 @@
+package io.github.pedalpi.displayview.communication.adb
+
+import com.google.gson.JsonParser
+import io.github.pedalpi.displayview.communication.adb.message.SerialRequestMessage
+import io.github.pedalpi.displayview.communication.adb.message.Identifier
+import io.github.pedalpi.displayview.communication.adb.message.SerialResponseMessage
+import io.github.pedalpi.displayview.communication.base.message.ResponseMessage
+import io.github.pedalpi.displayview.communication.base.message.ResponseVerb
+import org.json.JSONException
+
+
+object MessageBuilder {
+    fun generate(message: String): SerialResponseMessage {
+        val strings = message.split(" ".toRegex(), 3).toTypedArray()
+
+        val request = getRequestMessage(strings[0].toInt())
+        val type = searchType(strings[1])
+        val data = strings[2]
+
+        return generateMessage(request, type, data)
+    }
+
+    private fun getRequestMessage(identifier: Int) : SerialRequestMessage {
+        return Identifier.instance.remove(identifier)
+    }
+
+    private fun searchType(word: String): ResponseVerb {
+        return ResponseVerb.valueOf(word)
+    }
+
+    private fun generateMessage(request: SerialRequestMessage, type: ResponseVerb, data: String): ResponseMessage {
+        return try {
+            SerialResponseMessage(type, JsonParser().parse(data), request)
+        } catch (e: JSONException) {
+            ResponseMessage.error("Invalid received message", request)
+        }
+    }
+}