Format files, in particular align `->`
This commit is contained in:
Benoit Marty
parent
ff56414695
commit
ede5bb0e90
|
|
@ -4,16 +4,7 @@
|
|||
<JetCodeStyleSettings>
|
||||
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
|
||||
<value>
|
||||
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="PACKAGES_IMPORT_LAYOUT">
|
||||
<value>
|
||||
<package name="" alias="false" withSubpackages="true" />
|
||||
<package name="java" alias="false" withSubpackages="true" />
|
||||
<package name="javax" alias="false" withSubpackages="true" />
|
||||
<package name="kotlin" alias="false" withSubpackages="true" />
|
||||
<package name="" alias="true" withSubpackages="true" />
|
||||
<package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
|
||||
|
|
|
|||
|
|
@ -42,4 +42,4 @@ interface MatrixCallback<in T> {
|
|||
/**
|
||||
* Basic no op implementation
|
||||
*/
|
||||
class NoOpMatrixCallback<T>: MatrixCallback<T>
|
||||
class NoOpMatrixCallback<T> : MatrixCallback<T>
|
||||
|
|
|
|||
|
|
@ -48,18 +48,25 @@ data class MatrixError(
|
|||
companion object {
|
||||
/** Forbidden access, e.g. joining a room without permission, failed login. */
|
||||
const val M_FORBIDDEN = "M_FORBIDDEN"
|
||||
|
||||
/** An unknown error has occurred. */
|
||||
const val M_UNKNOWN = "M_UNKNOWN"
|
||||
|
||||
/** The access token specified was not recognised. */
|
||||
const val M_UNKNOWN_TOKEN = "M_UNKNOWN_TOKEN"
|
||||
|
||||
/** No access token was specified for the request. */
|
||||
const val M_MISSING_TOKEN = "M_MISSING_TOKEN"
|
||||
|
||||
/** Request contained valid JSON, but it was malformed in some way, e.g. missing required keys, invalid values for keys. */
|
||||
const val M_BAD_JSON = "M_BAD_JSON"
|
||||
|
||||
/** Request did not contain valid JSON. */
|
||||
const val M_NOT_JSON = "M_NOT_JSON"
|
||||
|
||||
/** No resource was found for this request. */
|
||||
const val M_NOT_FOUND = "M_NOT_FOUND"
|
||||
|
||||
/** Too many requests have been sent in a short period of time. Wait a while then try again. */
|
||||
const val M_LIMIT_EXCEEDED = "M_LIMIT_EXCEEDED"
|
||||
|
||||
|
|
@ -69,68 +76,97 @@ data class MatrixError(
|
|||
|
||||
/** Encountered when trying to register a user ID which has been taken. */
|
||||
const val M_USER_IN_USE = "M_USER_IN_USE"
|
||||
|
||||
/** Sent when the room alias given to the createRoom API is already in use. */
|
||||
const val M_ROOM_IN_USE = "M_ROOM_IN_USE"
|
||||
|
||||
/** (Not documented yet) */
|
||||
const val M_BAD_PAGINATION = "M_BAD_PAGINATION"
|
||||
|
||||
/** The request was not correctly authorized. Usually due to login failures. */
|
||||
const val M_UNAUTHORIZED = "M_UNAUTHORIZED"
|
||||
|
||||
/** (Not documented yet) */
|
||||
const val M_OLD_VERSION = "M_OLD_VERSION"
|
||||
|
||||
/** The server did not understand the request. */
|
||||
const val M_UNRECOGNIZED = "M_UNRECOGNIZED"
|
||||
|
||||
/** (Not documented yet) */
|
||||
const val M_LOGIN_EMAIL_URL_NOT_YET = "M_LOGIN_EMAIL_URL_NOT_YET"
|
||||
|
||||
/** Authentication could not be performed on the third party identifier. */
|
||||
const val M_THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED"
|
||||
|
||||
/** Sent when a threepid given to an API cannot be used because no record matching the threepid was found. */
|
||||
const val M_THREEPID_NOT_FOUND = "M_THREEPID_NOT_FOUND"
|
||||
|
||||
/** Sent when a threepid given to an API cannot be used because the same threepid is already in use. */
|
||||
const val M_THREEPID_IN_USE = "M_THREEPID_IN_USE"
|
||||
|
||||
/** The client's request used a third party server, eg. identity server, that this server does not trust. */
|
||||
const val M_SERVER_NOT_TRUSTED = "M_SERVER_NOT_TRUSTED"
|
||||
|
||||
/** The request or entity was too large. */
|
||||
const val M_TOO_LARGE = "M_TOO_LARGE"
|
||||
|
||||
/** (Not documented yet) */
|
||||
const val M_CONSENT_NOT_GIVEN = "M_CONSENT_NOT_GIVEN"
|
||||
|
||||
/** The request cannot be completed because the homeserver has reached a resource limit imposed on it. For example,
|
||||
* a homeserver held in a shared hosting environment may reach a resource limit if it starts using too much memory
|
||||
* or disk space. The error MUST have an admin_contact field to provide the user receiving the error a place to reach
|
||||
* out to. Typically, this error will appear on routes which attempt to modify state (eg: sending messages, account
|
||||
* data, etc) and not routes which only read state (eg: /sync, get account data, etc). */
|
||||
const val M_RESOURCE_LIMIT_EXCEEDED = "M_RESOURCE_LIMIT_EXCEEDED"
|
||||
|
||||
/** The user ID associated with the request has been deactivated. Typically for endpoints that prove authentication, such as /login. */
|
||||
const val M_USER_DEACTIVATED = "M_USER_DEACTIVATED"
|
||||
|
||||
/** Encountered when trying to register a user ID which is not valid. */
|
||||
const val M_INVALID_USERNAME = "M_INVALID_USERNAME"
|
||||
|
||||
/** Sent when the initial state given to the createRoom API is invalid. */
|
||||
const val M_INVALID_ROOM_STATE = "M_INVALID_ROOM_STATE"
|
||||
|
||||
/** The server does not permit this third party identifier. This may happen if the server only permits,
|
||||
* for example, email addresses from a particular domain. */
|
||||
const val M_THREEPID_DENIED = "M_THREEPID_DENIED"
|
||||
|
||||
/** The client's request to create a room used a room version that the server does not support. */
|
||||
const val M_UNSUPPORTED_ROOM_VERSION = "M_UNSUPPORTED_ROOM_VERSION"
|
||||
|
||||
/** The client attempted to join a room that has a version the server does not support.
|
||||
* Inspect the room_version property of the error response for the room's version. */
|
||||
const val M_INCOMPATIBLE_ROOM_VERSION = "M_INCOMPATIBLE_ROOM_VERSION"
|
||||
|
||||
/** The state change requested cannot be performed, such as attempting to unban a user who is not banned. */
|
||||
const val M_BAD_STATE = "M_BAD_STATE"
|
||||
|
||||
/** The room or resource does not permit guests to access it. */
|
||||
const val M_GUEST_ACCESS_FORBIDDEN = "M_GUEST_ACCESS_FORBIDDEN"
|
||||
|
||||
/** A Captcha is required to complete the request. */
|
||||
const val M_CAPTCHA_NEEDED = "M_CAPTCHA_NEEDED"
|
||||
|
||||
/** The Captcha provided did not match what was expected. */
|
||||
const val M_CAPTCHA_INVALID = "M_CAPTCHA_INVALID"
|
||||
|
||||
/** A required parameter was missing from the request. */
|
||||
const val M_MISSING_PARAM = "M_MISSING_PARAM"
|
||||
|
||||
/** A parameter that was specified has the wrong value. For example, the server expected an integer and instead received a string. */
|
||||
const val M_INVALID_PARAM = "M_INVALID_PARAM"
|
||||
|
||||
/** The resource being requested is reserved by an application service, or the application service making the request has not created the resource. */
|
||||
const val M_EXCLUSIVE = "M_EXCLUSIVE"
|
||||
|
||||
/** The user is unable to reject an invite to join the server notices room. See the Server Notices module for more information. */
|
||||
const val M_CANNOT_LEAVE_SERVER_NOTICE_ROOM = "M_CANNOT_LEAVE_SERVER_NOTICE_ROOM"
|
||||
|
||||
/** (Not documented yet) */
|
||||
const val M_WRONG_ROOM_KEYS_VERSION = "M_WRONG_ROOM_KEYS_VERSION"
|
||||
|
||||
/** (Not documented yet) */
|
||||
const val M_WEAK_PASSWORD = "M_WEAK_PASSWORD"
|
||||
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@ package org.matrix.android.sdk.api.raw
|
|||
|
||||
sealed class RawCacheStrategy {
|
||||
// Data is always fetched from the server
|
||||
object NoCache: RawCacheStrategy()
|
||||
object NoCache : RawCacheStrategy()
|
||||
|
||||
// Once data is retrieved, it is stored for the provided amount of time.
|
||||
// In case of error, and if strict is set to false, the cache can be returned if available
|
||||
data class TtlCache(val validityDurationInMillis: Long, val strict: Boolean): RawCacheStrategy()
|
||||
data class TtlCache(val validityDurationInMillis: Long, val strict: Boolean) : RawCacheStrategy()
|
||||
|
||||
// Once retrieved, the data is stored in cache and will be always get from the cache
|
||||
object InfiniteCache: RawCacheStrategy()
|
||||
object InfiniteCache : RawCacheStrategy()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ interface CallSignalingService {
|
|||
|
||||
fun removeCallListener(listener: CallsListener)
|
||||
|
||||
fun getCallWithId(callId: String) : MxCall?
|
||||
fun getCallWithId(callId: String): MxCall?
|
||||
|
||||
fun isThereAnyActiveCall(): Boolean
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ interface MxCallDetail {
|
|||
interface MxCall : MxCallDetail {
|
||||
|
||||
var state: CallState
|
||||
|
||||
/**
|
||||
* Pick Up the incoming call
|
||||
* It has no effect on outgoing call
|
||||
|
|
|
|||
|
|
@ -101,9 +101,9 @@ interface CryptoService {
|
|||
|
||||
fun fetchDevicesList(callback: MatrixCallback<DevicesListResponse>)
|
||||
|
||||
fun getMyDevicesInfo() : List<DeviceInfo>
|
||||
fun getMyDevicesInfo(): List<DeviceInfo>
|
||||
|
||||
fun getLiveMyDevicesInfo() : LiveData<List<DeviceInfo>>
|
||||
fun getLiveMyDevicesInfo(): LiveData<List<DeviceInfo>>
|
||||
|
||||
fun getDeviceInfo(deviceId: String, callback: MatrixCallback<DeviceInfo>)
|
||||
|
||||
|
|
@ -148,6 +148,6 @@ interface CryptoService {
|
|||
fun getGossipingEventsTrail(): List<Event>
|
||||
|
||||
// For testing shared session
|
||||
fun getSharedWithInfo(roomId: String?, sessionId: String) : MXUsersDevicesMap<Int>
|
||||
fun getWithHeldMegolmSession(roomId: String, sessionId: String) : RoomKeyWithHeldContent?
|
||||
fun getSharedWithInfo(roomId: String?, sessionId: String): MXUsersDevicesMap<Int>
|
||||
fun getWithHeldMegolmSession(roomId: String, sessionId: String): RoomKeyWithHeldContent?
|
||||
}
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ interface KeysBackupService {
|
|||
|
||||
// For gossiping
|
||||
fun saveBackupRecoveryKey(recoveryKey: String?, version: String?)
|
||||
fun getKeyBackupRecoveryKeyInfo() : SavedKeyBackupKeyInfo?
|
||||
fun getKeyBackupRecoveryKeyInfo(): SavedKeyBackupKeyInfo?
|
||||
|
||||
fun isValidRecoveryKeyForCurrentVersion(recoveryKey: String, callback: MatrixCallback<Boolean>)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,23 +53,31 @@ package org.matrix.android.sdk.api.session.crypto.keysbackup
|
|||
enum class KeysBackupState {
|
||||
// Need to check the current backup version on the homeserver
|
||||
Unknown,
|
||||
|
||||
// Checking if backup is enabled on home server
|
||||
CheckingBackUpOnHomeserver,
|
||||
|
||||
// Backup has been stopped because a new backup version has been detected on the homeserver
|
||||
WrongBackUpVersion,
|
||||
|
||||
// Backup from this device is not enabled
|
||||
Disabled,
|
||||
|
||||
// There is a backup available on the homeserver but it is not trusted.
|
||||
// It is not trusted because the signature is invalid or the device that created it is not verified
|
||||
// Use [KeysBackup.getKeysBackupTrust()] to get trust details.
|
||||
// Consequently, the backup from this device is not enabled.
|
||||
NotTrusted,
|
||||
|
||||
// Backup is being enabled: the backup version is being created on the homeserver
|
||||
Enabling,
|
||||
|
||||
// Backup is enabled and ready to send backup to the homeserver
|
||||
ReadyToBackUp,
|
||||
|
||||
// e2e keys are going to be sent to the homeserver
|
||||
WillBackUp,
|
||||
|
||||
// e2e keys are being sent to the homeserver
|
||||
BackingUp
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ interface GossipingRequestListener {
|
|||
* Returns the secret value to be shared
|
||||
* @return true if is handled
|
||||
*/
|
||||
fun onSecretShareRequest(request: IncomingSecretShareRequest) : Boolean
|
||||
fun onSecretShareRequest(request: IncomingSecretShareRequest): Boolean
|
||||
|
||||
/**
|
||||
* A room key request cancellation has been received.
|
||||
|
|
|
|||
|
|
@ -22,8 +22,10 @@ package org.matrix.android.sdk.api.session.crypto.verification
|
|||
enum class VerificationMethod {
|
||||
// Use it when your application supports the SAS verification method
|
||||
SAS,
|
||||
|
||||
// Use it if your application is able to display QR codes
|
||||
QR_CODE_SHOW,
|
||||
|
||||
// Use it if your application is able to scan QR codes
|
||||
QR_CODE_SCAN
|
||||
}
|
||||
|
|
|
|||
|
|
@ -253,6 +253,7 @@ fun Event.isFileMessage(): Boolean {
|
|||
else -> false
|
||||
}
|
||||
}
|
||||
|
||||
fun Event.isAttachmentMessage(): Boolean {
|
||||
return getClearType() == EventType.MESSAGE
|
||||
&& when (getClearContent()?.toModel<MessageContent>()?.msgType) {
|
||||
|
|
|
|||
|
|
@ -21,10 +21,13 @@ package org.matrix.android.sdk.api.session.events.model
|
|||
object RelationType {
|
||||
/** Lets you define an event which annotates an existing event.*/
|
||||
const val ANNOTATION = "m.annotation"
|
||||
|
||||
/** Lets you define an event which replaces an existing event.*/
|
||||
const val REPLACE = "m.replace"
|
||||
|
||||
/** Lets you define an event which references an existing event.*/
|
||||
const val REFERENCE = "m.reference"
|
||||
|
||||
/** Lets you define an event which adds a response to an existing event.*/
|
||||
const val RESPONSE = "org.matrix.response"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,6 @@
|
|||
package org.matrix.android.sdk.api.session.events.model
|
||||
|
||||
interface UnsignedRelationInfo {
|
||||
val limited : Boolean?
|
||||
val limited: Boolean?
|
||||
val count: Int?
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,10 +33,12 @@ data class IntegrationManagerConfig(
|
|||
* Defined in UserAccountData
|
||||
*/
|
||||
ACCOUNT,
|
||||
|
||||
/**
|
||||
* Defined in Wellknown
|
||||
*/
|
||||
HOMESERVER,
|
||||
|
||||
/**
|
||||
* Fallback value, hardcoded by the SDK
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
package org.matrix.android.sdk.api.session.room.members
|
||||
|
||||
sealed class ChangeMembershipState() {
|
||||
sealed class ChangeMembershipState {
|
||||
object Unknown : ChangeMembershipState()
|
||||
object Joining : ChangeMembershipState()
|
||||
data class FailedJoining(val throwable: Throwable) : ChangeMembershipState()
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ data class PollSummaryContent(
|
|||
return votes?.size ?: 0
|
||||
}
|
||||
|
||||
fun voteCountForOption(optionIndex: Int) : Int {
|
||||
fun voteCountForOption(optionIndex: Int): Int {
|
||||
return votes?.filter { it.optionIndex == optionIndex }?.count() ?: 0
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ data class RoomGuestAccessContent(
|
|||
enum class GuestAccess(val value: String) {
|
||||
@Json(name = "can_join")
|
||||
CanJoin("can_join"),
|
||||
|
||||
@Json(name = "forbidden")
|
||||
Forbidden("forbidden")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,16 +29,19 @@ enum class RoomHistoryVisibility {
|
|||
* participating homeserver with anyone, regardless of whether they have ever joined the room.
|
||||
*/
|
||||
@Json(name = "world_readable") WORLD_READABLE,
|
||||
|
||||
/**
|
||||
* Previous events are always accessible to newly joined members. All events in the
|
||||
* room are accessible, even those sent when the member was not a part of the room.
|
||||
*/
|
||||
@Json(name = "shared") SHARED,
|
||||
|
||||
/**
|
||||
* Events are accessible to newly joined members from the point they were invited onwards.
|
||||
* Events stop being accessible when the member's state changes to something other than invite or join.
|
||||
*/
|
||||
@Json(name = "invited") INVITED,
|
||||
|
||||
/**
|
||||
* Events are accessible to newly joined members from the point they joined the room onwards.
|
||||
* Events stop being accessible when the member's state changes to something other than join.
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ object MessageType {
|
|||
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
|
||||
const val MSGTYPE_STICKER_LOCAL = "org.matrix.android.sdk.sticker"
|
||||
|
|
|
|||
|
|
@ -18,18 +18,25 @@ package org.matrix.android.sdk.api.session.room.send
|
|||
|
||||
enum class SendState {
|
||||
UNKNOWN,
|
||||
|
||||
// the event has not been sent
|
||||
UNSENT,
|
||||
|
||||
// the event is encrypting
|
||||
ENCRYPTING,
|
||||
|
||||
// the event is currently sending
|
||||
SENDING,
|
||||
|
||||
// the event has been sent
|
||||
SENT,
|
||||
|
||||
// the event has been received from server
|
||||
SYNCED,
|
||||
|
||||
// The event failed to be sent
|
||||
UNDELIVERED,
|
||||
|
||||
// the event failed to be sent because some unknown devices have been found while encrypting it
|
||||
FAILED_UNKNOWN_DEVICES;
|
||||
|
||||
|
|
|
|||
|
|
@ -128,6 +128,7 @@ interface Timeline {
|
|||
* It represents future events.
|
||||
*/
|
||||
FORWARDS,
|
||||
|
||||
/**
|
||||
* It represents past events.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -40,5 +40,5 @@ interface TimelineService {
|
|||
|
||||
fun getTimeLineEventLive(eventId: String): LiveData<Optional<TimelineEvent>>
|
||||
|
||||
fun getAttachmentMessages() : List<TimelineEvent>
|
||||
fun getAttachmentMessages(): List<TimelineEvent>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ interface FilterService {
|
|||
|
||||
enum class FilterPreset {
|
||||
NoFilter,
|
||||
|
||||
/**
|
||||
* Filter for Riot, will include only known event type
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ data class Optional<T : Any> constructor(private val value: T?) {
|
|||
return Optional(value)
|
||||
}
|
||||
|
||||
fun <T: Any> empty(): Optional<T> {
|
||||
fun <T : Any> empty(): Optional<T> {
|
||||
return Optional(null)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ const val MXCRYPTO_ALGORITHM_MEGOLM_BACKUP = "m.megolm_backup.v1.curve25519-aes-
|
|||
* Secured Shared Storage algorithm constant
|
||||
*/
|
||||
const val SSSS_ALGORITHM_CURVE25519_AES_SHA2 = "m.secret_storage.v1.curve25519-aes-sha2"
|
||||
|
||||
/* Secrets are encrypted using AES-CTR-256 and MACed using HMAC-SHA-256. **/
|
||||
const val SSSS_ALGORITHM_AES_HMAC_SHA2 = "m.secret_storage.v1.aes-hmac-sha2"
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ enum class GossipingRequestState {
|
|||
ACCEPTING,
|
||||
ACCEPTED,
|
||||
FAILED_TO_ACCEPTED,
|
||||
|
||||
// USER_REJECTED,
|
||||
UNABLE_TO_PROCESS,
|
||||
CANCELLED_BY_REQUESTER,
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ import kotlin.math.min
|
|||
object MXMegolmExportEncryption {
|
||||
private const val HEADER_LINE = "-----BEGIN MEGOLM SESSION DATA-----"
|
||||
private const val TRAILER_LINE = "-----END MEGOLM SESSION DATA-----"
|
||||
|
||||
// we split into lines before base64ing, because encodeBase64 doesn't deal
|
||||
// terribly well with large arrays.
|
||||
private const val LINE_LENGTH = 72 * 4 / 3
|
||||
|
|
|
|||
|
|
@ -70,7 +70,9 @@ internal class OutgoingGossipingRequestManager @Inject constructor(
|
|||
delay(1500)
|
||||
cryptoStore.getOrAddOutgoingSecretShareRequest(secretName, recipients)?.let {
|
||||
// TODO check if there is already one that is being sent?
|
||||
if (it.state == OutgoingGossipingRequestState.SENDING /**|| it.state == OutgoingGossipingRequestState.SENT*/) {
|
||||
if (it.state == OutgoingGossipingRequestState.SENDING
|
||||
/**|| it.state == OutgoingGossipingRequestState.SENT*/
|
||||
) {
|
||||
Timber.v("## CRYPTO - GOSSIP sendSecretShareRequest() : we are already sending for that session: $it")
|
||||
return@launch
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ internal interface IMXDecrypting {
|
|||
*/
|
||||
fun shareKeysWithDevice(request: IncomingRoomKeyRequest) {}
|
||||
|
||||
fun shareSecretWithDevice(request: IncomingSecretShareRequest, secretValue : String) {}
|
||||
fun shareSecretWithDevice(request: IncomingSecretShareRequest, secretValue: String) {}
|
||||
|
||||
fun requestKeysForEvent(event: Event, withHeld: Boolean)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ internal class ShieldTrustUpdater @Inject constructor(
|
|||
private val taskExecutor: TaskExecutor,
|
||||
@SessionDatabase private val sessionRealmConfiguration: RealmConfiguration,
|
||||
private val roomSummaryUpdater: RoomSummaryUpdater
|
||||
): SessionLifecycleObserver {
|
||||
) : SessionLifecycleObserver {
|
||||
|
||||
companion object {
|
||||
private val BACKGROUND_HANDLER = createBackgroundHandler("SHIELD_CRYPTO_DB_THREAD")
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ class OlmInboundGroupSessionWrapper2 : Serializable {
|
|||
constructor() {
|
||||
// empty
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new instance from the provided keys map.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -66,19 +66,23 @@ enum class WithHeldCode(val value: String) {
|
|||
* the user/device was blacklisted
|
||||
*/
|
||||
BLACKLISTED("m.blacklisted"),
|
||||
|
||||
/**
|
||||
* the user/devices is unverified
|
||||
*/
|
||||
UNVERIFIED("m.unverified"),
|
||||
|
||||
/**
|
||||
* the user/device is not allowed have the key. For example, this would usually be sent in response
|
||||
* to a key request if the user was not in the room when the message was sent
|
||||
*/
|
||||
UNAUTHORISED("m.unauthorised"),
|
||||
|
||||
/**
|
||||
* Sent in reply to a key request if the device that the key is requested from does not have the requested key
|
||||
*/
|
||||
UNAVAILABLE("m.unavailable"),
|
||||
|
||||
/**
|
||||
* An olm session could not be established.
|
||||
* This may happen, for example, if the sender was unable to obtain a one-time key from the recipient.
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@
|
|||
package org.matrix.android.sdk.internal.crypto.store
|
||||
|
||||
data class SavedKeyBackupKeyInfo(
|
||||
val recoveryKey : String,
|
||||
val recoveryKey: String,
|
||||
val version: String
|
||||
)
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ internal abstract class DefaultVerificationTransaction(
|
|||
|
||||
protected fun trust(canTrustOtherUserMasterKey: Boolean,
|
||||
toVerifyDeviceIds: List<String>,
|
||||
eventuallyMarkMyMasterKeyAsTrusted: Boolean, autoDone : Boolean = true) {
|
||||
eventuallyMarkMyMasterKeyAsTrusted: Boolean, autoDone: Boolean = true) {
|
||||
Timber.d("## Verification: trust ($otherUserId,$otherDeviceId) , verifiedDevices:$toVerifyDeviceIds")
|
||||
Timber.d("## Verification: trust Mark myMSK trusted $eventuallyMarkMyMasterKeyAsTrusted")
|
||||
|
||||
|
|
|
|||
|
|
@ -68,10 +68,13 @@ internal abstract class SASDefaultVerificationTransaction(
|
|||
// Deprecated maybe removed later, use V2
|
||||
const val KEY_AGREEMENT_V1 = "curve25519"
|
||||
const val KEY_AGREEMENT_V2 = "curve25519-hkdf-sha256"
|
||||
|
||||
// ordered by preferred order
|
||||
val KNOWN_AGREEMENT_PROTOCOLS = listOf(KEY_AGREEMENT_V2, KEY_AGREEMENT_V1)
|
||||
|
||||
// ordered by preferred order
|
||||
val KNOWN_HASHES = listOf("sha256")
|
||||
|
||||
// ordered by preferred order
|
||||
val KNOWN_MACS = listOf(SAS_MAC_SHA256, SAS_MAC_SHA256_LONGKDF)
|
||||
|
||||
|
|
@ -101,6 +104,7 @@ internal abstract class SASDefaultVerificationTransaction(
|
|||
|
||||
// Visible for test
|
||||
var startReq: ValidVerificationInfoStart.SasVerificationInfoStart? = null
|
||||
|
||||
// Visible for test
|
||||
var accepted: ValidVerificationInfoAccept? = null
|
||||
protected var otherKey: String? = null
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ internal class RealmKeysUtils @Inject constructor(context: Context,
|
|||
}
|
||||
|
||||
// Expose to handle Realm migration to riotX
|
||||
fun getRealmEncryptionKey(alias: String) : ByteArray {
|
||||
fun getRealmEncryptionKey(alias: String): ByteArray {
|
||||
val key = if (hasKeyForDatabase(alias)) {
|
||||
Timber.i("Found key for alias:$alias")
|
||||
extractKeyForDatabase(alias)
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ internal fun EventAnnotationsSummaryEntity.Companion.create(realm: Realm, roomId
|
|||
}
|
||||
return obj
|
||||
}
|
||||
|
||||
internal fun EventAnnotationsSummaryEntity.Companion.getOrCreate(realm: Realm, roomId: String, eventId: String): EventAnnotationsSummaryEntity {
|
||||
return EventAnnotationsSummaryEntity.where(realm, eventId).findFirst()
|
||||
?: EventAnnotationsSummaryEntity.create(realm, roomId, eventId).apply { this.roomId = roomId }
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ public class HomeServerConnectionConfig {
|
|||
if (!TextUtils.isEmpty(jitsiServerUrl)) {
|
||||
// add trailing "/"
|
||||
if (!jitsiServerUrl.endsWith("/")) {
|
||||
jitsiServerUrl =jitsiServerUrl + "/";
|
||||
jitsiServerUrl = jitsiServerUrl + "/";
|
||||
}
|
||||
|
||||
Timber.d("Overriding jitsi server url to " + jitsiServerUrl);
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ package org.matrix.android.sdk.internal.legacy.riot
|
|||
*/
|
||||
|
||||
data class WellKnownManagerConfig(
|
||||
val apiUrl : String,
|
||||
val apiUrl: String,
|
||||
val uiUrl: String
|
||||
)
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ internal class TimelineEventDecryptor @Inject constructor(
|
|||
|
||||
// Set of eventIds which are currently decrypting
|
||||
private val existingRequests = mutableSetOf<DecryptionRequest>()
|
||||
|
||||
// sessionId -> list of eventIds
|
||||
private val unknownSessionsFailure = mutableMapOf<String, MutableSet<DecryptionRequest>>()
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ internal class DefaultTypingService @AssistedInject constructor(
|
|||
|
||||
// What the homeserver knows
|
||||
private var userIsTyping = false
|
||||
|
||||
// Last time the user is typing event has been sent
|
||||
private var lastRequestTimestamp: Long = 0
|
||||
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ internal class DefaultWidgetPostAPIMediator @Inject constructor(private val mosh
|
|||
Timber.d("BRIDGE onWidgetEvent : $jsonEventData")
|
||||
try {
|
||||
val dataAsDict = jsonAdapter.fromJson(jsonEventData)
|
||||
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
val eventData = (dataAsDict?.get("event.data") as? JsonDict) ?: return
|
||||
onWidgetMessage(eventData)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import javax.inject.Inject
|
|||
import javax.inject.Singleton
|
||||
|
||||
@Singleton
|
||||
class EmojiCompatFontProvider @Inject constructor(): FontsContractCompat.FontRequestCallback() {
|
||||
class EmojiCompatFontProvider @Inject constructor() : FontsContractCompat.FontRequestCallback() {
|
||||
|
||||
var typeface: Typeface? = null
|
||||
set(value) {
|
||||
|
|
|
|||
|
|
@ -42,18 +42,25 @@ abstract class BottomSheetActionItem : VectorEpoxyModel<BottomSheetActionItem.Ho
|
|||
@EpoxyAttribute
|
||||
@DrawableRes
|
||||
var iconRes: Int = 0
|
||||
|
||||
@EpoxyAttribute
|
||||
var textRes: Int = 0
|
||||
|
||||
@EpoxyAttribute
|
||||
var showExpand = false
|
||||
|
||||
@EpoxyAttribute
|
||||
var expanded = false
|
||||
|
||||
@EpoxyAttribute
|
||||
var selected = false
|
||||
|
||||
@EpoxyAttribute
|
||||
var subMenuItem = false
|
||||
|
||||
@EpoxyAttribute
|
||||
var destructive = false
|
||||
|
||||
@EpoxyAttribute
|
||||
lateinit var listener: View.OnClickListener
|
||||
|
||||
|
|
|
|||
|
|
@ -37,14 +37,19 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
|
|||
|
||||
@EpoxyAttribute
|
||||
lateinit var avatarRenderer: AvatarRenderer
|
||||
|
||||
@EpoxyAttribute
|
||||
lateinit var matrixItem: MatrixItem
|
||||
|
||||
@EpoxyAttribute
|
||||
lateinit var body: CharSequence
|
||||
|
||||
@EpoxyAttribute
|
||||
var time: CharSequence? = null
|
||||
|
||||
@EpoxyAttribute
|
||||
var movementMethod: MovementMethod? = null
|
||||
|
||||
@EpoxyAttribute
|
||||
var userClicked: (() -> Unit)? = null
|
||||
|
||||
|
|
|
|||
|
|
@ -33,10 +33,13 @@ abstract class BottomSheetQuickReactionsItem : VectorEpoxyModel<BottomSheetQuick
|
|||
|
||||
@EpoxyAttribute
|
||||
lateinit var fontProvider: EmojiCompatFontProvider
|
||||
|
||||
@EpoxyAttribute
|
||||
lateinit var texts: List<String>
|
||||
|
||||
@EpoxyAttribute
|
||||
lateinit var selecteds: List<Boolean>
|
||||
|
||||
@EpoxyAttribute
|
||||
var listener: Listener? = null
|
||||
|
||||
|
|
|
|||
|
|
@ -34,8 +34,10 @@ abstract class BottomSheetSendStateItem : VectorEpoxyModel<BottomSheetSendStateI
|
|||
|
||||
@EpoxyAttribute
|
||||
var showProgress: Boolean = false
|
||||
|
||||
@EpoxyAttribute
|
||||
lateinit var text: CharSequence
|
||||
|
||||
@EpoxyAttribute
|
||||
@DrawableRes
|
||||
var drawableStart: Int = 0
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder> : VectorEpoxy
|
|||
@EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
|
||||
@EpoxyAttribute lateinit var matrixItem: MatrixItem
|
||||
@EpoxyAttribute var editable: Boolean = true
|
||||
|
||||
@EpoxyAttribute
|
||||
var userEncryptionTrustLevel: RoomEncryptionTrustLevel? = null
|
||||
@EpoxyAttribute var clickListener: View.OnClickListener? = null
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ abstract class ProfileActionItem : VectorEpoxyModel<ProfileActionItem.Holder>()
|
|||
|
||||
@EpoxyAttribute
|
||||
lateinit var title: String
|
||||
|
||||
@EpoxyAttribute
|
||||
var subtitle: String? = null
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import im.vector.app.core.epoxy.VectorEpoxyHolder
|
|||
import im.vector.app.core.epoxy.VectorEpoxyModel
|
||||
|
||||
@EpoxyModelClass(layout = R.layout.item_profile_section)
|
||||
abstract class ProfileSectionItem: VectorEpoxyModel<ProfileSectionItem.Holder>() {
|
||||
abstract class ProfileSectionItem : VectorEpoxyModel<ProfileSectionItem.Holder>() {
|
||||
|
||||
@EpoxyAttribute
|
||||
lateinit var title: String
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ fun addEntryToDownloadManager(context: Context,
|
|||
file: File,
|
||||
mimeType: String,
|
||||
title: String = file.name,
|
||||
description: String = file.name) : Uri? {
|
||||
description: String = file.name): Uri? {
|
||||
try {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||
val contentValues = ContentValues().apply {
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ class VectorGlideDataFetcher(private val activeSessionHolder: ActiveSessionHolde
|
|||
url = data.url,
|
||||
fileName = data.filename,
|
||||
elementToDecrypt = data.elementToDecrypt,
|
||||
callback = object: MatrixCallback<File> {
|
||||
callback = object : MatrixCallback<File> {
|
||||
override fun onSuccess(data: File) {
|
||||
callback.onDataReady(data.inputStream())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ class CheckableFrameLayout : FrameLayout, Checkable {
|
|||
|
||||
private var mChecked = false
|
||||
|
||||
constructor(context: Context) : super(context) {}
|
||||
constructor(context: Context) : super(context)
|
||||
|
||||
constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {}
|
||||
constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
|
||||
|
||||
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {}
|
||||
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
|
||||
|
||||
override fun isChecked(): Boolean {
|
||||
return mChecked
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomSheetDialogFragment()
|
|||
}
|
||||
}
|
||||
|
||||
var resultListener : ResultListener? = null
|
||||
var resultListener: ResultListener? = null
|
||||
var bottomSheetResult: Int = ResultListener.RESULT_CANCEL
|
||||
var bottomSheetResultData: Any? = null
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ class DrawableProvider @Inject constructor(private val context: Context) {
|
|||
fun getDrawable(@DrawableRes colorRes: Int): Drawable? {
|
||||
return ContextCompat.getDrawable(context, colorRes)
|
||||
}
|
||||
|
||||
fun getDrawable(@DrawableRes colorRes: Int, @ColorInt color: Int): Drawable? {
|
||||
return ContextCompat.getDrawable(context, colorRes)?.let {
|
||||
ThemeUtils.tintDrawableWithColor(it, color)
|
||||
|
|
|
|||
|
|
@ -56,15 +56,19 @@ class PasswordStrengthBar @JvmOverloads constructor(
|
|||
@BindColor(R.color.password_strength_bar_undefined)
|
||||
@JvmField
|
||||
var colorBackground: Int = 0
|
||||
|
||||
@BindColor(R.color.password_strength_bar_weak)
|
||||
@JvmField
|
||||
var colorWeak: Int = 0
|
||||
|
||||
@BindColor(R.color.password_strength_bar_low)
|
||||
@JvmField
|
||||
var colorLow: Int = 0
|
||||
|
||||
@BindColor(R.color.password_strength_bar_ok)
|
||||
@JvmField
|
||||
var colorOk: Int = 0
|
||||
|
||||
@BindColor(R.color.password_strength_bar_strong)
|
||||
@JvmField
|
||||
var colorStrong: Int = 0
|
||||
|
|
|
|||
|
|
@ -55,8 +55,10 @@ abstract class AttachmentPreviewItem<H : AttachmentPreviewItem.Holder> : VectorE
|
|||
abstract class AttachmentMiniaturePreviewItem : AttachmentPreviewItem<AttachmentMiniaturePreviewItem.Holder>() {
|
||||
|
||||
@EpoxyAttribute override lateinit var attachment: ContentAttachmentData
|
||||
|
||||
@EpoxyAttribute
|
||||
var clickListener: View.OnClickListener? = null
|
||||
|
||||
@EpoxyAttribute
|
||||
var checked: Boolean = false
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ import im.vector.app.core.platform.VectorViewModelAction
|
|||
|
||||
sealed class AttachmentsPreviewAction : VectorViewModelAction {
|
||||
object RemoveCurrentAttachment : AttachmentsPreviewAction()
|
||||
data class SetCurrentAttachment(val index: Int): AttachmentsPreviewAction()
|
||||
data class UpdatePathOfCurrentAttachment(val newUri: Uri): AttachmentsPreviewAction()
|
||||
data class SetCurrentAttachment(val index: Int) : AttachmentsPreviewAction()
|
||||
data class UpdatePathOfCurrentAttachment(val newUri: Uri) : AttachmentsPreviewAction()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ abstract class RecyclerViewPresenter<T>(context: Context?) : AutocompletePresent
|
|||
}
|
||||
|
||||
override fun onViewShown() {}
|
||||
|
||||
@CallSuper
|
||||
override fun onViewHidden() {
|
||||
observer?.also {
|
||||
|
|
|
|||
|
|
@ -29,10 +29,13 @@ abstract class AutocompleteCommandItem : VectorEpoxyModel<AutocompleteCommandIte
|
|||
|
||||
@EpoxyAttribute
|
||||
var name: CharSequence? = null
|
||||
|
||||
@EpoxyAttribute
|
||||
var parameters: CharSequence? = null
|
||||
|
||||
@EpoxyAttribute
|
||||
var description: CharSequence? = null
|
||||
|
||||
@EpoxyAttribute
|
||||
var clickListener: View.OnClickListener? = null
|
||||
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ class WebRtcPeerConnectionManager @Inject constructor(
|
|||
|
||||
fun addIfNeeded(renderer: SurfaceViewRenderer?, list: MutableList<WeakReference<SurfaceViewRenderer>>) {
|
||||
if (renderer == null) return
|
||||
val exists = list.firstOrNull() {
|
||||
val exists = list.firstOrNull {
|
||||
it.get() == renderer
|
||||
} != null
|
||||
if (!exists) {
|
||||
|
|
|
|||
|
|
@ -54,5 +54,5 @@ sealed class ParsedCommand {
|
|||
class SendSpoiler(val message: String) : ParsedCommand()
|
||||
class SendShrug(val message: CharSequence) : ParsedCommand()
|
||||
class SendPoll(val question: String, val options: List<String>) : ParsedCommand()
|
||||
object DiscardSession: ParsedCommand()
|
||||
object DiscardSession : ParsedCommand()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ class KeysBackupRestoreSuccessFragment @Inject constructor() : VectorBaseFragmen
|
|||
|
||||
@BindView(R.id.keys_backup_restore_success)
|
||||
lateinit var mSuccessText: TextView
|
||||
|
||||
@BindView(R.id.keys_backup_restore_success_info)
|
||||
lateinit var mSuccessDetailsText: TextView
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ import im.vector.app.core.platform.VectorViewEvents
|
|||
sealed class BootstrapViewEvents : VectorViewEvents {
|
||||
data class Dismiss(val success: Boolean) : BootstrapViewEvents()
|
||||
data class ModalError(val error: String) : BootstrapViewEvents()
|
||||
object RecoveryKeySaved: BootstrapViewEvents()
|
||||
data class SkipBootstrap(val genKeyOption: Boolean = true): BootstrapViewEvents()
|
||||
object RecoveryKeySaved : BootstrapViewEvents()
|
||||
data class SkipBootstrap(val genKeyOption: Boolean = true) : BootstrapViewEvents()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,12 +38,16 @@ abstract class BottomSheetVerificationActionItem : VectorEpoxyModel<BottomSheetV
|
|||
@EpoxyAttribute
|
||||
@DrawableRes
|
||||
var iconRes: Int = -1
|
||||
|
||||
@EpoxyAttribute
|
||||
var title: CharSequence = ""
|
||||
|
||||
@EpoxyAttribute
|
||||
var subTitle: CharSequence? = null
|
||||
|
||||
@EpoxyAttribute
|
||||
var titleColor: Int = 0
|
||||
|
||||
@EpoxyAttribute
|
||||
var iconColor: Int = -1
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import im.vector.app.core.platform.VectorBaseFragment
|
|||
import kotlinx.android.synthetic.main.fragment_loading.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class LoadingFragment @Inject constructor(): VectorBaseFragment() {
|
||||
class LoadingFragment @Inject constructor() : VectorBaseFragment() {
|
||||
|
||||
override fun getLayoutResId() = R.layout.fragment_loading
|
||||
|
||||
|
|
|
|||
|
|
@ -24,4 +24,4 @@ enum class RoomListDisplayMode(@StringRes val titleRes: Int) {
|
|||
PEOPLE(R.string.bottom_action_people_x),
|
||||
ROOMS(R.string.bottom_action_rooms),
|
||||
FILTERED(/* Not used */ 0)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,10 +81,10 @@ sealed class RoomDetailAction : VectorViewModelAction {
|
|||
data class ReRequestKeys(val eventId: String) : RoomDetailAction()
|
||||
|
||||
object SelectStickerAttachment : RoomDetailAction()
|
||||
object OpenIntegrationManager: RoomDetailAction()
|
||||
object ManageIntegrations: RoomDetailAction()
|
||||
data class AddJitsiWidget(val withVideo: Boolean): RoomDetailAction()
|
||||
data class RemoveWidget(val widgetId: String): RoomDetailAction()
|
||||
object OpenIntegrationManager : RoomDetailAction()
|
||||
object ManageIntegrations : RoomDetailAction()
|
||||
data class AddJitsiWidget(val withVideo: Boolean) : RoomDetailAction()
|
||||
data class RemoveWidget(val widgetId: String) : RoomDetailAction()
|
||||
data class EnsureNativeWidgetAllowed(val widget: Widget,
|
||||
val userJustAccepted: Boolean,
|
||||
val grantedEvents: RoomDetailViewEvents) : RoomDetailAction()
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
|
|||
data class NavigateToEvent(val eventId: String) : RoomDetailViewEvents()
|
||||
data class JoinJitsiConference(val widget: Widget, val withVideo: Boolean) : RoomDetailViewEvents()
|
||||
|
||||
object ShowWaitingView: RoomDetailViewEvents()
|
||||
object HideWaitingView: RoomDetailViewEvents()
|
||||
object ShowWaitingView : RoomDetailViewEvents()
|
||||
object HideWaitingView : RoomDetailViewEvents()
|
||||
|
||||
data class FileTooBigError(
|
||||
val filename: String,
|
||||
|
|
@ -64,14 +64,14 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
|
|||
|
||||
abstract class SendMessageResult : RoomDetailViewEvents()
|
||||
|
||||
object DisplayPromptForIntegrationManager: RoomDetailViewEvents()
|
||||
object DisplayPromptForIntegrationManager : RoomDetailViewEvents()
|
||||
|
||||
object DisplayEnableIntegrationsWarning: RoomDetailViewEvents()
|
||||
object DisplayEnableIntegrationsWarning : RoomDetailViewEvents()
|
||||
|
||||
data class OpenStickerPicker(val widget: Widget): RoomDetailViewEvents()
|
||||
data class OpenStickerPicker(val widget: Widget) : RoomDetailViewEvents()
|
||||
|
||||
object OpenIntegrationManager: RoomDetailViewEvents()
|
||||
object OpenActiveWidgetBottomSheet: RoomDetailViewEvents()
|
||||
object OpenIntegrationManager : RoomDetailViewEvents()
|
||||
object OpenActiveWidgetBottomSheet : RoomDetailViewEvents()
|
||||
data class RequestNativeWidgetPermission(val widget: Widget,
|
||||
val domain: String,
|
||||
val grantedEvents: RoomDetailViewEvents) : RoomDetailViewEvents()
|
||||
|
|
@ -83,6 +83,7 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
|
|||
data class SlashCommandHandled(@StringRes val messageRes: Int? = null) : SendMessageResult()
|
||||
object SlashCommandResultOk : SendMessageResult()
|
||||
class SlashCommandResultError(val throwable: Throwable) : SendMessageResult()
|
||||
|
||||
// TODO Remove
|
||||
object SlashCommandNotImplemented : SendMessageResult()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ sealed class SendMode(open val text: String) {
|
|||
// This is necessary for forcing refresh on selectSubscribe
|
||||
private val ts: Long = System.currentTimeMillis()
|
||||
) : SendMode(text)
|
||||
|
||||
data class QUOTE(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
|
||||
data class EDIT(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
|
||||
data class REPLY(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
|
||||
|
|
|
|||
|
|
@ -54,18 +54,25 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib
|
|||
|
||||
@BindView(R.id.composer_related_message_sender)
|
||||
lateinit var composerRelatedMessageTitle: TextView
|
||||
|
||||
@BindView(R.id.composer_related_message_preview)
|
||||
lateinit var composerRelatedMessageContent: TextView
|
||||
|
||||
@BindView(R.id.composer_related_message_avatar_view)
|
||||
lateinit var composerRelatedMessageAvatar: ImageView
|
||||
|
||||
@BindView(R.id.composer_related_message_action_image)
|
||||
lateinit var composerRelatedMessageActionIcon: ImageView
|
||||
|
||||
@BindView(R.id.composer_related_message_close)
|
||||
lateinit var composerRelatedMessageCloseButton: ImageButton
|
||||
|
||||
@BindView(R.id.composerEditText)
|
||||
lateinit var composerEditText: ComposerEditText
|
||||
|
||||
@BindView(R.id.composer_avatar_view)
|
||||
lateinit var composerAvatarImageView: ImageView
|
||||
|
||||
@BindView(R.id.composer_shield)
|
||||
lateinit var composerShieldImageView: ImageView
|
||||
|
||||
|
|
|
|||
|
|
@ -22,5 +22,5 @@ import javax.inject.Inject
|
|||
* Activity shared view model to handle message actions
|
||||
*/
|
||||
class MessageSharedActionViewModel @Inject constructor() : VectorSharedActionViewModel<EventSharedAction>() {
|
||||
var pendingAction : EventSharedAction? = null
|
||||
var pendingAction: EventSharedAction? = null
|
||||
}
|
||||
|
|
|
|||
|
|
@ -136,8 +136,10 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder> : BaseEventItem
|
|||
val messageColorProvider: MessageColorProvider
|
||||
val itemLongClickListener: View.OnLongClickListener?
|
||||
val itemClickListener: View.OnClickListener?
|
||||
|
||||
// val memberClickListener: View.OnClickListener?
|
||||
val reactionPillCallback: TimelineEventController.ReactionPillCallback?
|
||||
|
||||
// val avatarCallback: TimelineEventController.AvatarCallback?
|
||||
val readReceiptsCallback: TimelineEventController.ReadReceiptsCallback?
|
||||
// val emojiTypeFace: Typeface?
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ abstract class BaseEventItem<H : BaseEventItem.BaseHolder> : VectorEpoxyModel<H>
|
|||
// To use for instance when opening a permalink with an eventId
|
||||
@EpoxyAttribute
|
||||
var highlighted: Boolean = false
|
||||
|
||||
@EpoxyAttribute
|
||||
open var leftGuideline: Int = 0
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ abstract class MessageBlockCodeItem : AbsMessageItem<MessageBlockCodeItem.Holder
|
|||
|
||||
@EpoxyAttribute
|
||||
var message: CharSequence? = null
|
||||
|
||||
@EpoxyAttribute
|
||||
var editedSpan: CharSequence? = null
|
||||
|
||||
|
|
|
|||
|
|
@ -35,14 +35,19 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
|
|||
|
||||
@EpoxyAttribute
|
||||
lateinit var mediaData: ImageContentRenderer.Data
|
||||
|
||||
@EpoxyAttribute
|
||||
var playable: Boolean = false
|
||||
|
||||
@EpoxyAttribute
|
||||
var mode = ImageContentRenderer.Mode.THUMBNAIL
|
||||
|
||||
@EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
|
||||
var clickListener: View.OnClickListener? = null
|
||||
|
||||
@EpoxyAttribute
|
||||
lateinit var imageContentRenderer: ImageContentRenderer
|
||||
|
||||
@EpoxyAttribute
|
||||
lateinit var contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ data class MessageInformationData(
|
|||
val senderId: String,
|
||||
val sendState: SendState,
|
||||
val time: CharSequence? = null,
|
||||
val ageLocalTS : Long?,
|
||||
val ageLocalTS: Long?,
|
||||
val avatarUrl: String?,
|
||||
val memberName: CharSequence? = null,
|
||||
val showInformation: Boolean = true,
|
||||
|
|
@ -41,7 +41,7 @@ data class MessageInformationData(
|
|||
val hasPendingEdits: Boolean = false,
|
||||
val readReceipts: List<ReadReceiptData> = emptyList(),
|
||||
val referencesInfoData: ReferencesInfoData? = null,
|
||||
val sentByMe : Boolean,
|
||||
val sentByMe: Boolean,
|
||||
val e2eDecoration: E2EDecoration = E2EDecoration.NONE
|
||||
) : Parcelable {
|
||||
|
||||
|
|
|
|||
|
|
@ -30,10 +30,13 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
|
|||
|
||||
@EpoxyAttribute
|
||||
var searchForPills: Boolean = false
|
||||
|
||||
@EpoxyAttribute
|
||||
var message: CharSequence? = null
|
||||
|
||||
@EpoxyAttribute
|
||||
var useBigFont: Boolean = false
|
||||
|
||||
@EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
|
||||
var movementMethod: MovementMethod? = null
|
||||
|
||||
|
|
|
|||
|
|
@ -32,10 +32,13 @@ abstract class ReactionInfoSimpleItem : EpoxyModelWithHolder<ReactionInfoSimpleI
|
|||
|
||||
@EpoxyAttribute
|
||||
lateinit var reactionKey: CharSequence
|
||||
|
||||
@EpoxyAttribute
|
||||
lateinit var authorDisplayName: CharSequence
|
||||
|
||||
@EpoxyAttribute
|
||||
var timeStamp: CharSequence? = null
|
||||
|
||||
@EpoxyAttribute
|
||||
var userClicked: (() -> Unit)? = null
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ abstract class RoomWidgetItem : EpoxyModelWithHolder<RoomWidgetItem.Holder>() {
|
|||
|
||||
@EpoxyAttribute lateinit var widget: Widget
|
||||
@EpoxyAttribute var widgetClicked: ClickListener? = null
|
||||
|
||||
@DrawableRes
|
||||
@EpoxyAttribute var iconRes: Int? = null
|
||||
|
||||
|
|
|
|||
|
|
@ -158,10 +158,10 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
|
|||
private fun handleMarkAllRoomsRead() = withState { state ->
|
||||
state.asyncFilteredRooms.invoke()
|
||||
?.flatMap { it.value }
|
||||
?.filter { it.membership == Membership.JOIN }
|
||||
?.map { it.roomId }
|
||||
?.toList()
|
||||
?.let { session.markAllAsRead(it, NoOpMatrixCallback()) }
|
||||
.filter { it.membership == Membership.JOIN }
|
||||
.map { it.roomId }
|
||||
.toList()
|
||||
.let { session.markAllAsRead(it, NoOpMatrixCallback()) }
|
||||
}
|
||||
|
||||
private fun handleChangeNotificationMode(action: RoomListAction.ChangeRoomNotificationState) {
|
||||
|
|
|
|||
|
|
@ -67,8 +67,8 @@ data class RoomListViewState(
|
|||
val hasUnread: Boolean
|
||||
get() = asyncFilteredRooms.invoke()
|
||||
?.flatMap { it.value }
|
||||
?.filter { it.membership == Membership.JOIN }
|
||||
?.any { it.hasUnreadMessages }
|
||||
.filter { it.membership == Membership.JOIN }
|
||||
.any { it.hasUnreadMessages }
|
||||
?: false
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,8 +42,10 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
|
|||
@EpoxyAttribute lateinit var typingMessage: CharSequence
|
||||
@EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
|
||||
@EpoxyAttribute lateinit var matrixItem: MatrixItem
|
||||
|
||||
// Used only for diff calculation
|
||||
@EpoxyAttribute lateinit var lastEvent: String
|
||||
|
||||
// We use DoNotHash here as Spans are not implementing equals/hashcode
|
||||
@EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var lastFormattedEvent: CharSequence
|
||||
@EpoxyAttribute lateinit var lastEventTime: CharSequence
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ sealed class LoginAction : VectorViewModelAction {
|
|||
|
||||
data class AddThreePid(val threePid: RegisterThreePid) : RegisterAction()
|
||||
object SendAgainThreePid : RegisterAction()
|
||||
|
||||
// TODO Confirm Email (from link in the email, open in the phone, intercepted by RiotX)
|
||||
data class ValidateThreePid(val code: String) : RegisterAction()
|
||||
|
||||
|
|
|
|||
|
|
@ -18,10 +18,13 @@ package im.vector.app.features.login
|
|||
|
||||
enum class SignMode {
|
||||
Unknown,
|
||||
|
||||
// Account creation
|
||||
SignUp,
|
||||
|
||||
// Login
|
||||
SignIn,
|
||||
|
||||
// Login directly with matrix Id
|
||||
SignInWithMatrixId
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ interface AttachmentData : Parcelable {
|
|||
val mimeType: String?
|
||||
val url: String?
|
||||
val elementToDecrypt: ElementToDecrypt?
|
||||
|
||||
// If true will load non mxc url, be careful to set it only for attachments sent by you
|
||||
val allowNonMxcUrls: Boolean
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,12 +29,15 @@ interface NotifiableEvent : Serializable {
|
|||
val description: String?
|
||||
val type: String?
|
||||
val timestamp: Long
|
||||
|
||||
// NotificationCompat.VISIBILITY_PUBLIC , VISIBILITY_PRIVATE , VISIBILITY_SECRET
|
||||
var lockScreenVisibility: Int
|
||||
|
||||
// Compat: Only for android <7, for newer version the sound is defined in the channel
|
||||
var soundName: String?
|
||||
var hasBeenDisplayed: Boolean
|
||||
var isRedacted: Boolean
|
||||
|
||||
// Used to know if event should be replaced with the one coming from eventstream
|
||||
var isPushGatewayEvent: Boolean
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ data class RoomEventGroupInfo(
|
|||
) {
|
||||
// An event in the list has not yet been display
|
||||
var hasNewEvent: Boolean = false
|
||||
|
||||
// true if at least one on the not yet displayed event is noisy
|
||||
var shouldBing: Boolean = false
|
||||
var customSound: String? = null
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ enum class JoinState {
|
|||
NOT_JOINED,
|
||||
JOINING,
|
||||
JOINING_ERROR,
|
||||
|
||||
// Room is joined and this is confirmed by the sync
|
||||
JOINED
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ import android.net.Uri
|
|||
import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
|
||||
import im.vector.app.core.platform.VectorViewModelAction
|
||||
|
||||
sealed class RoomProfileAction: VectorViewModelAction {
|
||||
object LeaveRoom: RoomProfileAction()
|
||||
sealed class RoomProfileAction : VectorViewModelAction {
|
||||
object LeaveRoom : RoomProfileAction()
|
||||
data class ChangeRoomNotificationState(val notificationState: RoomNotificationState) : RoomProfileAction()
|
||||
data class ChangeRoomAvatar(val uri: Uri, val fileName: String?) : RoomProfileAction()
|
||||
object ShareRoomProfile : RoomProfileAction()
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ class VectorSettingsActivity : VectorBaseActivity(),
|
|||
}
|
||||
}
|
||||
|
||||
fun <T: Fragment> navigateTo(fragmentClass: Class<T>) {
|
||||
fun <T : Fragment> navigateTo(fragmentClass: Class<T>) {
|
||||
supportFragmentManager.beginTransaction()
|
||||
.setCustomAnimations(R.anim.right_in, R.anim.fade_out, R.anim.fade_in, R.anim.right_out)
|
||||
.replace(R.id.vector_settings_page, fragmentClass, null)
|
||||
|
|
|
|||
|
|
@ -51,12 +51,16 @@ class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<Troublesh
|
|||
|
||||
@BindView(R.id.troubleshootTestTitle)
|
||||
lateinit var titleText: TextView
|
||||
|
||||
@BindView(R.id.troubleshootTestDescription)
|
||||
lateinit var descriptionText: TextView
|
||||
|
||||
@BindView(R.id.troubleshootStatusIcon)
|
||||
lateinit var statusIconImage: ImageView
|
||||
|
||||
@BindView(R.id.troubleshootProgressBar)
|
||||
lateinit var progressBar: ProgressBar
|
||||
|
||||
@BindView(R.id.troubleshootTestButton)
|
||||
lateinit var fixButton: Button
|
||||
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@ import android.os.Parcelable
|
|||
import org.matrix.android.sdk.api.session.content.ContentAttachmentData
|
||||
import kotlinx.android.parcel.Parcelize
|
||||
|
||||
sealed class SharedData: Parcelable {
|
||||
sealed class SharedData : Parcelable {
|
||||
|
||||
@Parcelize
|
||||
data class Text(val text: String): SharedData()
|
||||
data class Text(val text: String) : SharedData()
|
||||
|
||||
@Parcelize
|
||||
data class Attachments(val attachmentData: List<ContentAttachmentData>): SharedData()
|
||||
data class Attachments(val attachmentData: List<ContentAttachmentData>) : SharedData()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ import org.matrix.android.sdk.api.session.events.model.Content
|
|||
import im.vector.app.core.platform.VectorViewEvents
|
||||
|
||||
sealed class WidgetViewEvents : VectorViewEvents {
|
||||
data class Failure(val throwable: Throwable): WidgetViewEvents()
|
||||
data class Failure(val throwable: Throwable) : WidgetViewEvents()
|
||||
data class Close(val content: Content? = null) : WidgetViewEvents()
|
||||
data class DisplayIntegrationManager(val integId: String?, val integType: String?) : WidgetViewEvents()
|
||||
data class OnURLFormatted(val formattedURL: String) : WidgetViewEvents()
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ package im.vector.app.features.widgets.permissions
|
|||
import im.vector.app.core.platform.VectorViewModelAction
|
||||
|
||||
sealed class RoomWidgetPermissionActions : VectorViewModelAction {
|
||||
object AllowWidget: RoomWidgetPermissionActions()
|
||||
object BlockWidget: RoomWidgetPermissionActions()
|
||||
object DoClose: RoomWidgetPermissionActions()
|
||||
object AllowWidget : RoomWidgetPermissionActions()
|
||||
object BlockWidget : RoomWidgetPermissionActions()
|
||||
object DoClose : RoomWidgetPermissionActions()
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue