From 32c4ad9ecba32e111aff9a7e98f2f6c76b6ea36a Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 12 Feb 2020 19:09:23 +0100 Subject: [PATCH 1/2] Use vendor prefix for non merged MSC --- .../api/session/room/model/message/MessageOptionsContent.kt | 4 ++-- .../android/api/session/room/model/message/MessageType.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt index b9aba45123..b4014b1b97 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt @@ -21,8 +21,8 @@ import im.vector.matrix.android.api.session.events.model.Content import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent // Possible values for optionType -const val OPTION_TYPE_POLL = "m.pool" -const val OPTION_TYPE_BUTTONS = "m.buttons" +const val OPTION_TYPE_POLL = "org.matrix.pool" +const val OPTION_TYPE_BUTTONS = "org.matrix.buttons" /** * Polls and bot buttons are m.room.message events with a msgtype of m.options, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt index d75cd7f8dc..c244500c9e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt @@ -25,9 +25,9 @@ object MessageType { const val MSGTYPE_VIDEO = "m.video" const val MSGTYPE_LOCATION = "m.location" const val MSGTYPE_FILE = "m.file" - const val MSGTYPE_OPTIONS = "m.options" - const val MSGTYPE_RESPONSE = "m.response" - const val MSGTYPE_POLL_CLOSED = "m.poll_closed" + const val MSGTYPE_OPTIONS = "org.matrix.options" + const val MSGTYPE_RESPONSE = "org.matrix.response" + const val MSGTYPE_POLL_CLOSED = "org.matrix.poll_closed" const val MSGTYPE_VERIFICATION_REQUEST = "m.key.verification.request" // Add, in local, a fake message type in order to StickerMessage can inherit Message class // Because sticker isn't a message type but a event type without msgtype field From 21bac0f867938a014623096def43ca3a032186c8 Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 12 Feb 2020 22:31:13 +0100 Subject: [PATCH 2/2] Fix / typo in poll --- .../api/session/room/model/message/MessageOptionsContent.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt index b4014b1b97..33b133afaf 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageOptionsContent.kt @@ -21,7 +21,7 @@ import im.vector.matrix.android.api.session.events.model.Content import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent // Possible values for optionType -const val OPTION_TYPE_POLL = "org.matrix.pool" +const val OPTION_TYPE_POLL = "org.matrix.poll" const val OPTION_TYPE_BUTTONS = "org.matrix.buttons" /**