matrix/element-android
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2025-07-28 08:42:00 +03:00
Code Activity

Merge branch 'develop' into feature/bca/rust_flavor

Browse Source
This commit is contained in:
valere
2022-11-30 11:05:32 +01:00
parent bb16d77ec6 4b3e36da91
commit a9b970832e
988 changed files with 30970 additions and 5502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android-flow/build.gradle
View File

@ -6,6 +6,8 @@ plugins {
apply from: '../flavor.gradle'
android {
namespace "org.matrix.android.sdk.flow"
compileSdk versions.compileSdk
defaultConfig {

5
matrix-sdk-android-flow/src/main/AndroidManifest.xml
View File

@ -1,5 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.matrix.android.sdk.flow">
</manifest>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

4
matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowRoom.kt
View File

@ -100,8 +100,8 @@ class FlowRoom(private val room: Room) {
return room.readService().getReadMarkerLive().asFlow()
}
fun liveReadReceipt(): Flow<Optional<String>> {
return room.readService().getMyReadReceiptLive().asFlow()
fun liveReadReceipt(threadId: String?): Flow<Optional<String>> {
return room.readService().getMyReadReceiptLive(threadId).asFlow()
}
fun liveEventReadReceipts(eventId: String): Flow<List<ReadReceipt>> {