mirror of
https://github.com/element-hq/element-android
synced 2024-11-27 03:48:12 +03:00
thread read receipts and unread notifications support is added to hom… (#7386)
This commit is contained in:
Nikita Fedrunov
GitHub
parent
2a977f341b
commit
113d0ff540
8 changed files with 59 additions and 1 deletions
|
|
@ -65,6 +65,11 @@ data class HomeServerCapabilities(
|
|||
* True if the home server supports login via qr code, false otherwise.
|
||||
*/
|
||||
val canLoginWithQrCode: Boolean = false,
|
||||
|
||||
/**
|
||||
* True if the home server supports threaded read receipts and unread notifications.
|
||||
*/
|
||||
val canUseThreadReadReceiptsAndNotifications: Boolean = false,
|
||||
) {
|
||||
|
||||
enum class RoomCapabilitySupport {
|
||||
|
|
|
|||
|
|
@ -60,5 +60,6 @@ internal data class HomeServerVersion(
|
|||
val r0_6_0 = HomeServerVersion(major = 0, minor = 6, patch = 0)
|
||||
val r0_6_1 = HomeServerVersion(major = 0, minor = 6, patch = 1)
|
||||
val v1_3_0 = HomeServerVersion(major = 1, minor = 3, patch = 0)
|
||||
val v1_4_0 = HomeServerVersion(major = 1, minor = 4, patch = 0)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,6 +54,8 @@ private const val FEATURE_SEPARATE_ADD_AND_BIND = "m.separate_add_and_bind"
|
|||
private const val FEATURE_THREADS_MSC3440 = "org.matrix.msc3440"
|
||||
private const val FEATURE_THREADS_MSC3440_STABLE = "org.matrix.msc3440.stable"
|
||||
private const val FEATURE_QR_CODE_LOGIN = "org.matrix.msc3882"
|
||||
private const val FEATURE_THREADS_MSC3771 = "org.matrix.msc3771"
|
||||
private const val FEATURE_THREADS_MSC3773 = "org.matrix.msc3773"
|
||||
|
||||
/**
|
||||
* Return true if the SDK supports this homeserver version.
|
||||
|
|
@ -79,6 +81,15 @@ internal fun Versions.doesServerSupportThreads(): Boolean {
|
|||
return unstableFeatures?.get(FEATURE_THREADS_MSC3440_STABLE) ?: false
|
||||
}
|
||||
|
||||
/**
|
||||
* Indicate if the homeserver support MSC3771 and MSC3773 for threaded read receipts and unread notifications.
|
||||
*/
|
||||
internal fun Versions.doesServerSupportThreadUnreadNotifications(): Boolean {
|
||||
val msc3771 = unstableFeatures?.get(FEATURE_THREADS_MSC3771) ?: false
|
||||
val msc3773 = unstableFeatures?.get(FEATURE_THREADS_MSC3773) ?: false
|
||||
return getMaxVersion() >= HomeServerVersion.v1_4_0 || (msc3771 && msc3773)
|
||||
}
|
||||
|
||||
internal fun Versions.doesServerSupportQrCodeLogin(): Boolean {
|
||||
return unstableFeatures?.get(FEATURE_QR_CODE_LOGIN) ?: false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo036
|
|||
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo037
|
||||
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo038
|
||||
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo039
|
||||
import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo040
|
||||
import org.matrix.android.sdk.internal.util.Normalizer
|
||||
import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
|
||||
import javax.inject.Inject
|
||||
|
|
@ -64,7 +65,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
|
|||
private val normalizer: Normalizer
|
||||
) : MatrixRealmMigration(
|
||||
dbName = "Session",
|
||||
schemaVersion = 39L,
|
||||
schemaVersion = 40L,
|
||||
) {
|
||||
/**
|
||||
* Forces all RealmSessionStoreMigration instances to be equal.
|
||||
|
|
@ -113,5 +114,6 @@ internal class RealmSessionStoreMigration @Inject constructor(
|
|||
if (oldVersion < 37) MigrateSessionTo037(realm).perform()
|
||||
if (oldVersion < 38) MigrateSessionTo038(realm).perform()
|
||||
if (oldVersion < 39) MigrateSessionTo039(realm).perform()
|
||||
if (oldVersion < 40) MigrateSessionTo040(realm).perform()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ internal object HomeServerCapabilitiesMapper {
|
|||
canUseThreading = entity.canUseThreading,
|
||||
canControlLogoutDevices = entity.canControlLogoutDevices,
|
||||
canLoginWithQrCode = entity.canLoginWithQrCode,
|
||||
canUseThreadReadReceiptsAndNotifications = entity.canUseThreadReadReceiptsAndNotifications
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
/*
|
||||
* Copyright (c) 2022 The Matrix.org Foundation C.I.C.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.database.migration
|
||||
|
||||
import io.realm.DynamicRealm
|
||||
import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
|
||||
import org.matrix.android.sdk.internal.extensions.forceRefreshOfHomeServerCapabilities
|
||||
import org.matrix.android.sdk.internal.util.database.RealmMigrator
|
||||
|
||||
internal class MigrateSessionTo040(realm: DynamicRealm) : RealmMigrator(realm, 40) {
|
||||
|
||||
override fun doMigrate(realm: DynamicRealm) {
|
||||
realm.schema.get("HomeServerCapabilitiesEntity")
|
||||
?.addField(HomeServerCapabilitiesEntityFields.CAN_USE_THREAD_READ_RECEIPTS_AND_NOTIFICATIONS, Boolean::class.java)
|
||||
?.transform { obj ->
|
||||
obj.set(HomeServerCapabilitiesEntityFields.CAN_USE_THREAD_READ_RECEIPTS_AND_NOTIFICATIONS, false)
|
||||
}
|
||||
?.forceRefreshOfHomeServerCapabilities()
|
||||
}
|
||||
}
|
||||
|
|
@ -32,6 +32,7 @@ internal open class HomeServerCapabilitiesEntity(
|
|||
var canUseThreading: Boolean = false,
|
||||
var canControlLogoutDevices: Boolean = false,
|
||||
var canLoginWithQrCode: Boolean = false,
|
||||
var canUseThreadReadReceiptsAndNotifications: Boolean = false,
|
||||
) : RealmObject() {
|
||||
|
||||
companion object
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
|
|||
import org.matrix.android.sdk.internal.auth.version.Versions
|
||||
import org.matrix.android.sdk.internal.auth.version.doesServerSupportLogoutDevices
|
||||
import org.matrix.android.sdk.internal.auth.version.doesServerSupportQrCodeLogin
|
||||
import org.matrix.android.sdk.internal.auth.version.doesServerSupportThreadUnreadNotifications
|
||||
import org.matrix.android.sdk.internal.auth.version.doesServerSupportThreads
|
||||
import org.matrix.android.sdk.internal.auth.version.isLoginAndRegistrationSupportedBySdk
|
||||
import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntity
|
||||
|
|
@ -144,6 +145,8 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
|
|||
homeServerCapabilitiesEntity.canControlLogoutDevices = getVersionResult.doesServerSupportLogoutDevices()
|
||||
homeServerCapabilitiesEntity.canUseThreading = /* capabilities?.threads?.enabled.orFalse() || */
|
||||
getVersionResult.doesServerSupportThreads()
|
||||
homeServerCapabilitiesEntity.canUseThreadReadReceiptsAndNotifications =
|
||||
getVersionResult.doesServerSupportThreadUnreadNotifications()
|
||||
homeServerCapabilitiesEntity.canLoginWithQrCode = getVersionResult.doesServerSupportQrCodeLogin()
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue