TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-22 04:28:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fix: Disable typing and message requests in read-only open groups
This commit is contained in:
Morgan Pretty 2023-01-24 14:52:41 +11:00 committed by GitHub
commit 63debb34e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -158,7 +158,8 @@ class VisibleMessageView : LinearLayout {
binding.profilePictureView.root.update(message.individualRecipient) binding.profilePictureView.root.update(message.individualRecipient)
binding.profilePictureView.root.setOnClickListener { binding.profilePictureView.root.setOnClickListener {
if (thread.isOpenGroupRecipient) { 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) val intent = Intent(context, ConversationActivityV2::class.java)
intent.putExtra(ConversationActivityV2.FROM_GROUP_THREAD_ID, threadID) intent.putExtra(ConversationActivityV2.FROM_GROUP_THREAD_ID, threadID)
intent.putExtra(ConversationActivityV2.ADDRESS, Address.fromSerialized(senderSessionID)) intent.putExtra(ConversationActivityV2.ADDRESS, Address.fromSerialized(senderSessionID))

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

@ -81,7 +81,7 @@ object OpenGroupManager {
if (threadID < 0) { if (threadID < 0) {
threadID = GroupManager.createOpenGroup(openGroupID, context, null, info.name).threadId 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) threadDB.setOpenGroupChat(openGroup, threadID)
return info return info
} }

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

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

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

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