WIP clean

libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt

@@ -1,5 +1,7 @@
 package org.session.libsession.utilities
 
+import org.session.libsignal.service.api.messages.SignalServiceGroup
+
 object GroupUtil {
     const val CLOSED_GROUP_PREFIX = "__textsecure_group__!"
     const val MMS_GROUP_PREFIX = "__signal_mms_group__!"
@@ -29,6 +31,14 @@ object GroupUtil {
         return (MMS_GROUP_PREFIX + groupID).toByteArray()
     }
 
+    fun getEncodedId(group: SignalServiceGroup): String? {
+        val groupId = group.groupId
+        if (group.groupType == SignalServiceGroup.GroupType.PUBLIC_CHAT) {
+            return getEncodedOpenGroupID(groupId.toString())
+        }
+        return getEncodedGroupID(groupId)
+    }
+
     fun getEncodedGroupID(groupID: ByteArray): String {
         return groupID.toString()
     }

libsession/src/main/java/org/session/libsession/utilities/Util.kt

@@ -1,15 +1,18 @@
 package org.session.libsession.utilities
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
 import android.os.Handler
 import android.os.Looper
+import android.provider.Telephony
 import org.session.libsession.messaging.threads.Address
 import org.session.libsignal.libsignal.logging.Log
 import java.io.Closeable
 import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
+import java.nio.charset.StandardCharsets
 import java.util.*
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.ThreadPoolExecutor
@@ -88,6 +91,11 @@ object Util {
         return executor
     }
 
+    @JvmStatic
+    fun join(list: Array<String?>, delimiter: String?): String {
+        return join(Arrays.asList(*list), delimiter)
+    }
+
     @JvmStatic
     fun join(list: Collection<String?>, delimiter: String?): String {
         val result = StringBuilder()
@@ -99,6 +107,16 @@ object Util {
         return result.toString()
     }
 
+    @JvmStatic
+    fun join(list: LongArray, delimeter: String?): String {
+        val sb = java.lang.StringBuilder()
+        for (j in list.indices) {
+            if (j != 0) sb.append(delimeter)
+            sb.append(list[j])
+        }
+        return sb.toString()
+    }
+
     @JvmStatic
     fun equals(a: Any?, b: Any?): Boolean {
         return a === b || a != null && a == b
@@ -160,4 +178,25 @@ object Util {
         return results
     }
 
+    @JvmStatic
+    fun toIsoString(bytes: ByteArray?): String {
+        return String(bytes!!, StandardCharsets.ISO_8859_1)
+    }
+
+    @JvmStatic
+    fun toIsoBytes(isoString: String): ByteArray {
+        return isoString.toByteArray(StandardCharsets.ISO_8859_1)
+    }
+
+    @JvmStatic
+    fun toUtf8Bytes(utf8String: String): ByteArray {
+        return utf8String.toByteArray(StandardCharsets.UTF_8)
+    }
+
+    @JvmStatic
+    @SuppressLint("NewApi")
+    fun isDefaultSmsProvider(context: Context): Boolean {
+        return context.packageName == Telephony.Sms.getDefaultSmsPackage(context)
+    }
+
 }