Merge branch 'develop' into yostyle/notifications_global_settings

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfiguration.kt

@@ -23,7 +23,8 @@ val oidcConfiguration: OidcConfiguration = OidcConfiguration(
     clientName = "Element",
     redirectUri = OidcConfig.redirectUri,
     clientUri = "https://element.io",
-    tosUri = "https://element.io/user-terms-of-service",
+    logoUri = "https://element.io/mobile-icon.png",
+    tosUri = "https://element.io/acceptable-use-policy-terms",
     policyUri = "https://element.io/privacy",
     /**
      * Some homeservers/auth issuers don't support dynamic client registration, and have to be registered manually

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt

@@ -239,7 +239,7 @@ class RustMatrixRoom(
     override suspend fun editMessage(originalEventId: EventId?, transactionId: TransactionId?, message: String): Result<Unit> = withContext(roomDispatcher) {
         if (originalEventId != null) {
             runCatching {
-                innerRoom.edit(/* TODO use content */ message, originalEventId.value, transactionId?.value)
+                innerRoom.edit(messageEventContentFromMarkdown(message), originalEventId.value, transactionId?.value)
             }
         } else {
             runCatching {
@@ -250,10 +250,8 @@ class RustMatrixRoom(
     }
 
     override suspend fun replyMessage(eventId: EventId, message: String): Result<Unit> = withContext(roomDispatcher) {
-        val transactionId = genTransactionId()
-        // val content = messageEventContentFromMarkdown(message)
         runCatching {
-            innerRoom.sendReply(/* TODO use content */ message, eventId.value, transactionId)
+            innerRoom.sendReply(messageEventContentFromMarkdown(message), eventId.value, genTransactionId())
         }
     }
 
@@ -426,6 +424,32 @@ class RustMatrixRoom(
         }
     }
 
+    override suspend fun sendPollResponse(
+        pollStartId: EventId,
+        answers: List<String>
+    ): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.sendPollResponse(
+                pollStartId = pollStartId.value,
+                answers = answers,
+                txnId = genTransactionId(),
+            )
+        }
+    }
+
+    override suspend fun endPoll(
+        pollStartId: EventId,
+        text: String
+    ): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.endPoll(
+                pollStartId = pollStartId.value,
+                text = text,
+                txnId = genTransactionId(),
+            )
+        }
+    }
+
     private suspend fun sendAttachment(files: List<File>, handle: () -> SendAttachmentJoinHandle): Result<MediaUploadHandler> {
         return runCatching {
             MediaUploadHandlerImpl(files, handle())