From 5c3595931f53f6bba5cf0aa8dea641e6ad6acd2c Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Sat, 10 Dec 2022 00:45:50 -0300
Subject: [PATCH] use encodeToByteArray / decodeToString methods

---
 app/src/main/java/com/geeksville/mesh/DataPacket.kt       | 8 ++------
 app/src/main/java/com/geeksville/mesh/MainActivity.kt     | 3 ---
 .../main/java/com/geeksville/mesh/service/MeshService.kt  | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/DataPacket.kt b/app/src/main/java/com/geeksville/mesh/DataPacket.kt
index 55b996ea..556987df 100644
--- a/app/src/main/java/com/geeksville/mesh/DataPacket.kt
+++ b/app/src/main/java/com/geeksville/mesh/DataPacket.kt
@@ -4,8 +4,6 @@ import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
-import java.nio.charset.Charset
-
 
 @Parcelize
 enum class MessageStatus : Parcelable {
@@ -43,7 +41,7 @@ data class DataPacket(
      */
     constructor(to: String?, channel: Int, text: String) : this(
         to = to,
-        bytes = text.toByteArray(utf8),
+        bytes = text.encodeToByteArray(),
         dataType = Portnums.PortNum.TEXT_MESSAGE_APP_VALUE,
         channel = channel
     )
@@ -53,7 +51,7 @@ data class DataPacket(
      */
     val text: String?
         get() = if (dataType == Portnums.PortNum.TEXT_MESSAGE_APP_VALUE)
-            bytes?.toString(utf8)
+            bytes?.decodeToString()
         else
             null
 
@@ -159,7 +157,5 @@ data class DataPacket(
         override fun newArray(size: Int): Array<DataPacket?> {
             return arrayOfNulls(size)
         }
-
-        val utf8: Charset = Charset.forName("UTF-8")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
index bf5e7ee1..d20176c6 100644
--- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt
+++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
@@ -52,7 +52,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
-import java.nio.charset.Charset
 import java.text.DateFormat
 import java.util.Date
 import javax.inject.Inject
@@ -106,8 +105,6 @@ eventually:
   make a custom theme: https://github.com/material-components/material-components-android/tree/master/material-theme-builder
 */
 
-val utf8: Charset = Charset.forName("UTF-8")
-
 @AndroidEntryPoint
 class MainActivity : BaseActivity(), Logging {
 
diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
index 5e363a23..038cc7a4 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -211,7 +211,7 @@ class MeshService : Service(), Logging {
 
     private fun updateMessageNotification(message: DataPacket) =
         serviceNotifications.updateMessageNotification(
-            getSenderName(message), message.bytes!!.toString(utf8)
+            getSenderName(message), message.bytes!!.decodeToString()
         )
 
     /**