Merge pull request #236 from smswithoutborders/add-slack

Adjust message compose to accommodate slack

Author: sherlockwisdom

app/src/main/java/com/example/sw0b_001/ui/views/compose/MessageComposeView.kt

@@ -13,6 +13,7 @@ import android.util.Log
 import android.widget.Toast
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContract
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
@@ -57,6 +58,7 @@ import androidx.navigation.NavController
 import com.example.sw0b_001.Database.Datastore
 import com.example.sw0b_001.Models.ComposeHandlers
 import com.example.sw0b_001.Models.GatewayClients.GatewayClientsCommunications
+import com.example.sw0b_001.Models.Platforms.AvailablePlatforms
 import com.example.sw0b_001.Models.Platforms.PlatformsViewModel
 import com.example.sw0b_001.Models.Platforms.StoredPlatformsEntity
 import com.example.sw0b_001.Models.Publishers
@@ -79,8 +81,42 @@ import java.nio.charset.StandardCharsets
 import java.util.Locale
 
 
+class PickPhoneNumberContract : ActivityResultContract<Unit, Uri?>() {
+    override fun createIntent(context: Context, input: Unit): Intent =
+        Intent(Intent.ACTION_PICK, ContactsContract.CommonDataKinds.Phone.CONTENT_URI)
+
+    override fun parseResult(resultCode: Int, intent: Intent?): Uri? {
+        return if (resultCode == Activity.RESULT_OK) intent?.data else null
+    }
+}
+
 data class MessageContent(val from: String, val to: String, val message: String)
 
+data class RecipientFieldInfo(val label: String, val hint: String)
+
+@Composable
+private fun getRecipientFieldInfo(platform: AvailablePlatforms?): RecipientFieldInfo {
+    if (platform?.protocol_type == "pnba") {
+        return RecipientFieldInfo(
+            label = stringResource(R.string.recipient_number),
+            hint = stringResource(R.string.always_add_the_dialing_code_if_absent_e_g_237)
+        )
+    }
+
+    return when (platform?.name) {
+        "slack" -> RecipientFieldInfo(
+            label = stringResource(R.string.slack_recipient),
+            hint = stringResource(R.string.slack_hint)
+        )
+        // Add other platform-specific cases here
+
+        else -> RecipientFieldInfo(
+            label = stringResource(R.string.recipient_account),
+            hint = stringResource(R.string.recipient_account_format_hint)
+        )
+    }
+}
+
 object MessageComposeHandler {
     fun decomposeMessage(contentBytes: ByteArray): MessageContent {
         return try {
@@ -134,18 +170,22 @@ fun MessageComposeView(
         }
     } else null
 
-    var recipientNumber by remember { mutableStateOf(decomposedMessage?.to ?: "") }
+    var recipientAccount by remember { mutableStateOf(decomposedMessage?.to ?: "") }
     var message by remember { mutableStateOf( decomposedMessage?.message ?: "") }
     var from by remember { mutableStateOf( decomposedMessage?.from ?: "") }
 
     var showSelectAccountModal by remember { mutableStateOf(!inspectMode) }
     var selectedAccount by remember { mutableStateOf<StoredPlatformsEntity?>(null) }
+    val fieldInfo = getRecipientFieldInfo(platform = platformsViewModel.platform)
+    val isPnba = platformsViewModel.platform?.protocol_type == "pnba"
+
+
 
     val launcher = rememberLauncherForActivityResult(
-        ActivityResultContracts.PickContact()
+        contract = PickPhoneNumberContract()
     ) { uri ->
         uri?.let {
-            recipientNumber = getContactDetails(context, uri)
+            recipientAccount = getPhoneNumberFromUri(context, it)
         }
     }
 
@@ -185,12 +225,16 @@ fun MessageComposeView(
                     }
                 },
                 actions = {
+
+                    val isSendEnabled = recipientAccount.isNotEmpty() && message.isNotEmpty() &&
+                            (if (isPnba) verifyPhoneNumberFormat(recipientAccount) else true)
+
                     IconButton(onClick = {
                         processSend(
                             context = context,
                             messageContent = MessageContent(
                                 from = from,
-                                to = recipientNumber,
+                                to = recipientAccount,
                                 message = message
                             ),
                             account = selectedAccount!!,
@@ -212,8 +256,7 @@ fun MessageComposeView(
                             }
                         )
                     },
-                        enabled = recipientNumber.isNotEmpty() && message.isNotEmpty() &&
-                                verifyPhoneNumberFormat(recipientNumber)) {
+                        enabled = isSendEnabled) {
                         Icon(Icons.AutoMirrored.Filled.Send, contentDescription = stringResource(R.string.send))
                     }
                 },
@@ -249,42 +292,45 @@ fun MessageComposeView(
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 OutlinedTextField(
-                    value = recipientNumber,
-                    onValueChange = { recipientNumber = it },
-                    label = { Text(stringResource(R.string.recipient_number), style = MaterialTheme.typography.bodyMedium) },
+                    value = recipientAccount,
+                    onValueChange = { recipientAccount = it },
+                    label = { Text(fieldInfo.label, style = MaterialTheme.typography.bodyMedium) },
                     modifier = Modifier.weight(1f),
-                    isError = recipientNumber.isNotEmpty() && !verifyPhoneNumberFormat(recipientNumber),
+                    isError = if (isPnba) recipientAccount.isNotEmpty() && !verifyPhoneNumberFormat(recipientAccount) else false,
                     keyboardOptions = KeyboardOptions(
-                        keyboardType = KeyboardType.Phone,
+                        keyboardType = if (isPnba) KeyboardType.Phone else KeyboardType.Text,
                         imeAction = ImeAction.Next
                     )
                 )
+
                 Spacer(modifier = Modifier.width(8.dp))
-                IconButton(onClick = {
-                    if(readContactPermissions.status.isGranted) {
-                        launcher.launch(null)
-                    } else {
-                        readContactPermissions.launchPermissionRequest()
-                    }
+                if (isPnba) {
+                    IconButton(onClick = {
+                        if(readContactPermissions.status.isGranted) {
+                            launcher.launch(Unit)
+                        } else {
+                            readContactPermissions.launchPermissionRequest()
+                        }
 
-                }) {
-                    Icon(
-                        imageVector = Icons.Filled.Contacts,
-                        contentDescription = stringResource(R.string.select_contact),
-                        tint = MaterialTheme.colorScheme.primary,
-                    )
+                    }) {
+                        Icon(
+                            imageVector = Icons.Filled.Contacts,
+                            contentDescription = stringResource(R.string.select_contact),
+                            tint = MaterialTheme.colorScheme.primary,
+                        )
+                    }
                 }
             }
 
             Spacer(modifier = Modifier.height(4.dp))
 
-            // Dialing Code Hint
             Text(
-                text = stringResource(R.string.always_add_the_dialing_code_if_absent_e_g_237),
+                text = fieldInfo.hint,
                 style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.onSurfaceVariant
             )
 
+
             Spacer(modifier = Modifier.height(16.dp))
 
             // Message Body
@@ -312,29 +358,38 @@ fun verifyPhoneNumberFormat(phoneNumber: String): Boolean {
 
 
 private fun createMessageByteBuffer(
-    from: String, to: String, message: String
+    from: String, to: String, message: String,
+    accessToken: String? = null, refreshToken: String? = null
 ): ByteBuffer {
-    // Define size constants
     val BYTE_SIZE_LIMIT = 255
     val SHORT_SIZE_LIMIT = 65535
 
     // Convert strings to byte arrays
     val fromBytes = from.toByteArray(StandardCharsets.UTF_8)
     val toBytes = to.toByteArray(StandardCharsets.UTF_8)
     val bodyBytes = message.toByteArray(StandardCharsets.UTF_8)
+    val accessTokenBytes = accessToken?.toByteArray(StandardCharsets.UTF_8)
+    val refreshTokenBytes = refreshToken?.toByteArray(StandardCharsets.UTF_8)
+
 
     // Get sizes for validation
     val fromSize = fromBytes.size
     val toSize = toBytes.size
     val bodySize = bodyBytes.size
+    val accessTokenSize = accessTokenBytes?.size ?: 0
+    val refreshTokenSize = refreshTokenBytes?.size ?: 0
 
     // Validate field sizes
     if (fromSize > BYTE_SIZE_LIMIT) throw IllegalArgumentException("From field exceeds maximum size of $BYTE_SIZE_LIMIT bytes")
     if (toSize > SHORT_SIZE_LIMIT) throw IllegalArgumentException("To field exceeds maximum size of $SHORT_SIZE_LIMIT bytes")
     if (bodySize > SHORT_SIZE_LIMIT) throw IllegalArgumentException("Body field exceeds maximum size of $SHORT_SIZE_LIMIT bytes")
+    if (accessTokenSize > SHORT_SIZE_LIMIT) throw IllegalArgumentException("Access Token exceeds maximum size of $SHORT_SIZE_LIMIT bytes")
+    if (refreshTokenSize > SHORT_SIZE_LIMIT) throw IllegalArgumentException("Refresh Token exceeds maximum size of $SHORT_SIZE_LIMIT bytes")
 
+
+    // Update total size to include tokens
     val totalSize = 1 + 2 + 2 + 2 + 1 + 2 + 2 + 2 +
-            fromSize + toSize + bodySize
+            fromSize + toSize + bodySize + accessTokenSize + refreshTokenSize
 
     // Allocate buffer and set byte order
     val buffer = ByteBuffer.allocate(totalSize).order(ByteOrder.LITTLE_ENDIAN)
@@ -346,13 +401,16 @@ private fun createMessageByteBuffer(
     buffer.putShort(0)
     buffer.put(0.toByte())
     buffer.putShort(bodySize.toShort())
-    buffer.putShort(0)
-    buffer.putShort(0)
+    buffer.putShort(accessTokenSize.toShort())
+    buffer.putShort(refreshTokenSize.toShort())
 
     // Write field values
     buffer.put(fromBytes)
     buffer.put(toBytes)
     buffer.put(bodyBytes)
+    accessTokenBytes?.let { buffer.put(it) }
+    refreshTokenBytes?.let { buffer.put(it) }
+
 
     buffer.flip()
     return buffer
@@ -371,15 +429,22 @@ private fun processSend(
             val AD = Publishers.fetchPublisherPublicKey(context)
                 ?: return@launch onFailure("Could not fetch publisher key.")
 
+            val platform = Datastore.getDatastore(context).availablePlatformsDao().fetch(account.name!!)
+                ?: return@launch onFailure("Could not find platform details for '${account.name}'.")
+
+
+            val accessToken = if (platform.protocol_type == "oauth2") account.accessToken else null
+            val refreshToken = if (platform.protocol_type == "oauth2") account.refreshToken else null
+            Log.d("MessageComposeView", "Access Token: $accessToken, Refresh Token: $refreshToken")
+
             val contentFormatV2Bytes = createMessageByteBuffer(
                 from = messageContent.from,
                 to = messageContent.to,
-                message = messageContent.message
+                message = messageContent.message,
+                accessToken = accessToken,
+                refreshToken = refreshToken
             ).array()
 
-            val platform = Datastore.getDatastore(context).availablePlatformsDao().fetch(account.name!!)
-                ?: return@launch onFailure("Could not find platform details for '${account.name}'.")
-
             val languageCode = Locale.getDefault().language.take(2).lowercase()
             val validLanguageCode = if (languageCode.length == 2) languageCode else "en"
 
@@ -407,45 +472,26 @@ private fun processSend(
     }
 }
 
-fun getContactDetails(context: Context, contactUri: Uri): String {
-    val contentResolver: ContentResolver = context.contentResolver
-    val contactDetails = mutableMapOf<String, String?>()
+private fun getPhoneNumberFromUri(context: Context, uri: Uri): String {
+    var phoneNumber: String? = null
+    val projection: Array<String> = arrayOf(ContactsContract.CommonDataKinds.Phone.NUMBER)
 
     try {
-        val cursor: Cursor? = contentResolver.query(contactUri, null, null, null, null)
+        val cursor: Cursor? = context.contentResolver.query(uri, projection, null, null, null)
         cursor?.use {
             if (it.moveToFirst()) {
-                val id = it.getString(it.getColumnIndexOrThrow(ContactsContract.Contacts._ID))
-                val name = it.getString(it.getColumnIndexOrThrow(ContactsContract.Contacts.DISPLAY_NAME))
-
-                contactDetails["id"] = id
-                contactDetails["name"] = name
-
-                // Retrieve phone numbers
-                val hasPhone = it.getInt(it.getColumnIndexOrThrow(ContactsContract.Contacts.HAS_PHONE_NUMBER))
-                if (hasPhone > 0) {
-                    val phoneCursor = contentResolver.query(
-                        ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
-                        null,
-                        ContactsContract.CommonDataKinds.Phone.CONTACT_ID + " = ?",
-                        arrayOf(id),
-                        null
-                    )
-                    phoneCursor?.use { phone ->
-                        if (phone.moveToFirst()) {
-                            return phone.getString(phone.getColumnIndexOrThrow(
-                                ContactsContract.CommonDataKinds.Phone.NUMBER))
-                        }
-                    }
+                val numberIndex = it.getColumnIndex(ContactsContract.Contacts.CONTENT_URI.toString())
+                if (numberIndex >= 0) {
+                    phoneNumber = it.getString(numberIndex)
                 }
-
             }
         }
     } catch (e: Exception) {
         e.printStackTrace()
+        Log.e("getPhoneNumberFromUri", "Failed to get phone number from URI", e)
     }
 
-    return ""
+    return phoneNumber ?: ""
 }
 
 

app/src/main/res/values-ar/strings.xml

@@ -317,5 +317,9 @@
     <string name="message_">رسالة</string>
     <string name="message_content_could_not_be_displayed">تعذر عرض محتوى الرسالة</string>
     <string name="text_message">رسالة نصية</string>
+    <string name="recipient_account">حساب المستلم</string>
+    <string name="recipient_account_format_hint">تأكد من أن حساب المستلم بالتنسيق الصحيح.</string>
+    <string name="slack_recipient">قناة أو مستخدم سلاك</string>
+    <string name="slack_hint">للقنوات: استخدم #الاسم أو مُعرّف (مثال: #عام أو C123ABC). للرسائل الخاصة: استخدم @اسم_المستخدم، أو بريد إلكتروني، أو مُعرّف مستخدم (مثال: @jane أو @user@gmail.com أو U456DEF).</string>
 
 </resources>

app/src/main/res/values-de/strings.xml

@@ -315,5 +315,9 @@
     <string name="message_">Nachricht</string>
     <string name="message_content_could_not_be_displayed">Nachrichteninhalt konnte nicht angezeigt werden</string>
     <string name="text_message">Textnachricht</string>
+    <string name="recipient_account">Empfängerkonto</string>
+    <string name="recipient_account_format_hint">Stellen Sie sicher, dass das Empfängerkonto im richtigen Format ist.</string>
+    <string name="slack_recipient">Slack-Kanal oder -Benutzer</string>
+    <string name="slack_hint">Für Kanäle: Verwenden Sie #Name oder eine ID (z.B. #general oder C123ABC). Für DMs: Verwenden Sie @Benutzername, eine E-Mail-Adresse oder eine Benutzer-ID (z.B. @jane oder @user@gmail.com oder U456DEF).</string>
 
 </resources>

app/src/main/res/values-es/strings.xml

@@ -316,5 +316,9 @@
     <string name="message_">Mensaje</string>
     <string name="message_content_could_not_be_displayed">No se pudo mostrar el contenido del mensaje</string>
     <string name="text_message">Mensaje de texto</string>
+    <string name="recipient_account">Cuenta del destinatario</string>
+    <string name="recipient_account_format_hint">Asegúrese de que la cuenta del destinatario esté en el formato correcto.</string>
+    <string name="slack_recipient">Canal o usuario de Slack</string>
+    <string name="slack_hint">Para canales: use #nombre o una ID (ej., #general o C123ABC). Para MD: use @nombredeusuario, un correo electrónico o una ID de usuario (ej., @jane o @user@gmail.com o U456DEF).</string>
 
 </resources>

app/src/main/res/values-fa/strings.xml

@@ -316,5 +316,9 @@
     <string name="message_">پیام</string>
     <string name="message_content_could_not_be_displayed">محتوای پیام قابل نمایش نبود</string>
     <string name="text_message">پیام متنی</string>
+    <string name="recipient_account">حساب گیرنده</string>
+    <string name="recipient_account_format_hint">اطمینان حاصل کنید که فرمت حساب گیرنده صحیح باشد.</string>
+    <string name="slack_recipient">کانال یا کاربر Slack</string>
+    <string name="slack_hint">برای کانال‌ها: از #نام یا یک شناسه (مثلا #general یا C123ABC) استفاده کنید. برای پیام‌های مستقیم: از @نام‌کاربری، یک ایمیل یا شناسه کاربری (مثلا @jane یا @user@gmail.com یا U456DEF) استفاده کنید.</string>
 
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -316,4 +316,8 @@
     <string name="message_">Message</string>
     <string name="message_content_could_not_be_displayed">Le contenu du message n\'a pas pu être affiché</string>
     <string name="text_message">Message texte</string>
+    <string name="recipient_account">Compte du destinataire</string>
+    <string name="recipient_account_format_hint">Assurez-vous que le compte du destinataire est au bon format.</string>
+    <string name="slack_recipient">Canal ou utilisateur Slack</string>
+    <string name="slack_hint">Pour les canaux : utilisez #nom ou un ID (par ex., #general ou C123ABC). Pour les MP : utilisez @nomutilisateur, une adresse e-mail ou un ID utilisateur (par ex., @jane ou @user@gmail.com ou U456DEF).</string>
 </resources>

app/src/main/res/values-hi/strings.xml

@@ -321,5 +321,9 @@
     <string name="message_">संदेश</string>
     <string name="message_content_could_not_be_displayed">संदेश की सामग्री प्रदर्शित नहीं की जा सकी</string>
     <string name="text_message">पाठ संदेश</string>
+    <string name="recipient_account">प्राप्तकर्ता का खाता</string>
+    <string name="recipient_account_format_hint">सुनिश्चित करें कि प्राप्तकर्ता का खाता सही प्रारूप में है।</string>
+    <string name="slack_recipient">स्लैक चैनल या उपयोगकर्ता</string>
+    <string name="slack_hint">चैनलों के लिए: #नाम या एक आईडी का उपयोग करें (जैसे, #general या C123ABC)। डीएम के लिए: @उपयोगकर्ता नाम, एक ईमेल, या एक उपयोगकर्ता आईडी का उपयोग करें (जैसे, @jane या @user@gmail.com या U456DEF)।</string>
 
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -320,5 +320,9 @@
     <string name="message_">메시지</string>
     <string name="message_content_could_not_be_displayed">메시지 내용을 표시할 수 없습니다</string>
     <string name="text_message">문자 메시지</string>
+    <string name="recipient_account">수신자 계정</string>
+    <string name="recipient_account_format_hint">수신자 계정이 올바른 형식인지 확인하십시오.</string>
+    <string name="slack_recipient">Slack 채널 또는 사용자</string>
+    <string name="slack_hint">채널: #이름 또는 ID(예: #general 또는 C123ABC)를 사용하세요. DM: @사용자이름, 이메일 또는 사용자 ID(예: @jane 또는 @user@gmail.com 또는 U456DEF)를 사용하세요.</string>
 
 </resources>