100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Android bug fix for handling quotations when communicating with webview
Rich Turner9a6ec680a503
diff --git a/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt b/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.ktindex 14b2d3674..b6ed489e6 100644--- a/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt+++ b/console/android/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt@@ -25,6 +25,7 @@ import androidx.appcompat.widget.PopupMenuimport androidx.core.content.ContextCompatimport androidx.preference.PreferenceManagerimport com.fasterxml.jackson.core.JsonProcessingException+import com.fasterxml.jackson.databind.JsonNodeimport com.fasterxml.jackson.databind.ObjectMapperimport com.fasterxml.jackson.module.kotlin.jacksonObjectMapperimport com.google.android.material.floatingactionbutton.FloatingActionButton@@ -44,7 +45,7 @@ import java.util.logging.Loggeropen class OrMainActivity : Activity() {private lateinit var binding: ActivityOrMainBinding-+ private var mapper = jacksonObjectMapper()private val connectivityChangeReceiver: ConnectivityChangeReceiver =ConnectivityChangeReceiver()private var timeOutHandler: Handler? = null@@ -114,7 +115,7 @@ open class OrMainActivity : Activity() {progressBar?.progress = 1if (intent.hasExtra(APP_CONFIG_KEY)) {- appConfig = jacksonObjectMapper().readValue(+ appConfig = mapper.readValue(intent.getStringExtra(APP_CONFIG_KEY),ORAppConfig::class.java)@@ -773,9 +774,13 @@ open class OrMainActivity : Activity() {}private fun notifyClient(data: Map<String, Any?>?) {- LOG.info("notifyClient with message: $data")try {- val jsonString = ObjectMapper().writeValueAsString(data)+ var jsonString = mapper.writeValueAsString(data)++ // Double escape quotes (this is needed for browsers to be able to parse the response)+ jsonString = jsonString.replace("\\\"", "\\\\\"")++ LOG.info("notifyClient with message: $jsonString")runOnUiThread {binding.webView.evaluateJavascript(String.format(@@ -799,8 +804,14 @@ open class OrMainActivity : Activity() {editor.apply()}- private fun retrieveData(key: String?): String? {- return sharedPreferences!!.getString(key, null)+ private fun retrieveData(key: String?): Any? {+ var str = sharedPreferences!!.getString(key, null) ?: return null+ // Parse data JSON+ return try {+ mapper.readTree(str)+ } catch (e: JsonProcessingException) {+ str+ }}private fun onConnectivityChanged(connectivity: Boolean) {@@ -832,4 +843,4 @@ open class OrMainActivity : Activity() {const val CONSOLE_ID_KEY = "consoleId"const val APP_CONFIG_KEY = "APP_CONFIG_KEY"}-}\ No newline at end of file+}