Merge pull request #990 from ceokot/message-request-fixes

fix: Disable typing and message requests in read-only open groups

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -461,6 +461,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
 
     // called from onCreate
     private fun setUpInputBar() {
+        binding!!.inputBar.isVisible =  viewModel.openGroup == null || viewModel.openGroup?.canWrite == true
         binding!!.inputBar.delegate = this
         binding!!.inputBarRecordingView.delegate = this
         // GIF button

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -158,7 +158,8 @@ class VisibleMessageView : LinearLayout {
                 binding.profilePictureView.root.update(message.individualRecipient)
                 binding.profilePictureView.root.setOnClickListener {
                     if (thread.isOpenGroupRecipient) {
-                        if (IdPrefix.fromValue(senderSessionID) == IdPrefix.BLINDED) {
+                        val openGroup = lokiThreadDb.getOpenGroupChat(threadID)
+                        if (IdPrefix.fromValue(senderSessionID) == IdPrefix.BLINDED && openGroup?.canWrite == true) {
                             val intent = Intent(context, ConversationActivityV2::class.java)
                             intent.putExtra(ConversationActivityV2.FROM_GROUP_THREAD_ID, threadID)
                             intent.putExtra(ConversationActivityV2.ADDRESS, Address.fromSerialized(senderSessionID))

app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt

@@ -81,7 +81,7 @@ object OpenGroupManager {
         if (threadID < 0) {
             threadID = GroupManager.createOpenGroup(openGroupID, context, null, info.name).threadId
         }
-        val openGroup = OpenGroup(server = server, room = room, publicKey = publicKey, name = info.name, imageId = info.imageId, infoUpdates = info.infoUpdates)
+        val openGroup = OpenGroup(server = server, room = room, publicKey = publicKey, name = info.name, imageId = info.imageId, canWrite = info.write, infoUpdates = info.infoUpdates)
         threadDB.setOpenGroupChat(openGroup, threadID)
         return info
     }

libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroup.kt

@@ -13,9 +13,9 @@ data class OpenGroup(
     val publicKey: String,
     val imageId: String?,
     val infoUpdates: Int,
+    val canWrite: Boolean,
 ) {
-
-    constructor(server: String, room: String, publicKey: String, name: String, imageId: String?, infoUpdates: Int) : this(
+    constructor(server: String, room: String, publicKey: String, name: String, imageId: String?, canWrite: Boolean, infoUpdates: Int) : this(
         server = server,
         room = room,
         id = "$server.$room",
@@ -23,6 +23,7 @@ data class OpenGroup(
         publicKey = publicKey,
         imageId = imageId,
         infoUpdates = infoUpdates,
+        canWrite = canWrite
     )
 
     companion object {
@@ -31,14 +32,14 @@ data class OpenGroup(
             return try {
                 val json = JsonUtil.fromJson(jsonAsString)
                 if (!json.has("room")) return null
-                val room = json.get("room").asText().toLowerCase(Locale.US)
-                val server = json.get("server").asText().toLowerCase(Locale.US)
-                val publicKey = json.get("publicKey").asText()
+                val room = json.get("room").asText().lowercase(Locale.US)
+                val server = json.get("server").asText().lowercase(Locale.US)
                 val displayName = json.get("displayName").asText()
+                val publicKey = json.get("publicKey").asText()
                 val imageId = json.get("imageId")?.asText()
+                val canWrite = json.get("canWrite")?.asText()?.toBoolean() ?: true
                 val infoUpdates = json.get("infoUpdates")?.asText()?.toIntOrNull() ?: 0
-                val capabilities = json.get("capabilities")?.asText()?.split(",") ?: emptyList()
-                OpenGroup(server = server, room = room, name = displayName, publicKey = publicKey, imageId = imageId, infoUpdates = infoUpdates)
+                OpenGroup(server = server, room = room, name = displayName, publicKey = publicKey, imageId = imageId, canWrite = canWrite, infoUpdates = infoUpdates)
             } catch (e: Exception) {
                 Log.w("Loki", "Couldn't parse open group from JSON: $jsonAsString.", e);
                 null
@@ -63,6 +64,7 @@ data class OpenGroup(
         "displayName" to name,
         "imageId" to imageId,
         "infoUpdates" to infoUpdates.toString(),
+        "canWrite" to canWrite.toString()
     )
 
     val joinURL: String get() = "$server/$room?public_key=$publicKey"

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt

@@ -125,9 +125,10 @@ class OpenGroupPoller(private val server: String, private val executorService: S
             server = server,
             room = pollInfo.token,
             name = if (pollInfo.details != null) { pollInfo.details.name } else { existingOpenGroup.name },
-            infoUpdates = if (pollInfo.details != null) { pollInfo.details.infoUpdates } else { existingOpenGroup.infoUpdates },
             publicKey = publicKey,
-            imageId = if (pollInfo.details != null) { pollInfo.details.imageId } else { existingOpenGroup.imageId }
+            imageId = if (pollInfo.details != null) { pollInfo.details.imageId } else { existingOpenGroup.imageId },
+            canWrite = pollInfo.write,
+            infoUpdates = if (pollInfo.details != null) { pollInfo.details.infoUpdates } else { existingOpenGroup.infoUpdates }
         )
         // - Open Group changes
         storage.updateOpenGroup(openGroup)