Fixes after rebase
This commit is contained in:
parent
ddf9e5055e
commit
e8328858ab
117 changed files with 310 additions and 295 deletions
|
|
@ -18,7 +18,7 @@ interface ClientBuilderProvider {
|
|||
|
||||
@ContributesBinding(AppScope::class)
|
||||
@Inject
|
||||
class RustClientBuilderProvider() : ClientBuilderProvider {
|
||||
class RustClientBuilderProvider : ClientBuilderProvider {
|
||||
override fun provide(): ClientBuilder {
|
||||
return ClientBuilder()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import org.matrix.rustcomponents.sdk.sdkGitSha
|
|||
|
||||
@ContributesBinding(AppScope::class)
|
||||
@Inject
|
||||
class RustSdkMetadata() : SdkMetadata {
|
||||
class RustSdkMetadata : SdkMetadata {
|
||||
override val sdkGitSha: String
|
||||
get() = sdkGitSha()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import org.matrix.rustcomponents.sdk.QrCodeData
|
|||
|
||||
@ContributesBinding(AppScope::class)
|
||||
@Inject
|
||||
class RustQrCodeLoginDataFactory() : MatrixQrCodeLoginDataFactory {
|
||||
class RustQrCodeLoginDataFactory : MatrixQrCodeLoginDataFactory {
|
||||
override fun parseQrCodeData(data: ByteArray): Result<MatrixQrCodeLoginData> {
|
||||
return runCatchingExceptions { SdkQrCodeLoginData(QrCodeData.fromBytes(data)) }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import java.security.KeyStoreException
|
|||
|
||||
@ContributesBinding(AppScope::class)
|
||||
@Inject
|
||||
class DefaultUserCertificatesProvider() : UserCertificatesProvider {
|
||||
class DefaultUserCertificatesProvider : UserCertificatesProvider {
|
||||
/**
|
||||
* Get additional user-installed certificates from the `AndroidCAStore` `Keystore`.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ private const val SECRET_SIZE = 256
|
|||
|
||||
@ContributesBinding(AppScope::class)
|
||||
@Inject
|
||||
class DefaultPassphraseGenerator() : PassphraseGenerator {
|
||||
class DefaultPassphraseGenerator : PassphraseGenerator {
|
||||
override fun generatePassphrase(): String? {
|
||||
val key = ByteArray(size = SECRET_SIZE)
|
||||
SecureRandom().nextBytes(key)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import io.element.android.libraries.matrix.api.permalink.MatrixToConverter
|
|||
*/
|
||||
@ContributesBinding(AppScope::class)
|
||||
@Inject
|
||||
class DefaultMatrixToConverter() : MatrixToConverter {
|
||||
class DefaultMatrixToConverter : MatrixToConverter {
|
||||
/**
|
||||
* Try to convert a URL from an element web instance or from a client permalink to a matrix.to url.
|
||||
* To be successfully converted, URL path should contain one of the [SUPPORTED_PATHS].
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import org.matrix.rustcomponents.sdk.matrixToUserPermalink
|
|||
|
||||
@ContributesBinding(AppScope::class)
|
||||
@Inject
|
||||
class DefaultPermalinkBuilder() : PermalinkBuilder {
|
||||
class DefaultPermalinkBuilder : PermalinkBuilder {
|
||||
override fun permalinkForUser(userId: UserId): Result<String> {
|
||||
if (!MatrixPatterns.isUserId(userId.value)) {
|
||||
return Result.failure(PermalinkBuilderError.InvalidData)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import org.matrix.rustcomponents.sdk.initPlatform
|
|||
|
||||
@ContributesBinding(AppScope::class)
|
||||
@Inject
|
||||
class RustInitPlatformService() : InitPlatformService {
|
||||
class RustInitPlatformService : InitPlatformService {
|
||||
override fun init(tracingConfiguration: TracingConfiguration) {
|
||||
initPlatform(
|
||||
config = tracingConfiguration.map(),
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ interface TimelineEventTypeFilterFactory {
|
|||
|
||||
@ContributesBinding(AppScope::class)
|
||||
@Inject
|
||||
class RustTimelineEventTypeFilterFactory() : TimelineEventTypeFilterFactory {
|
||||
class RustTimelineEventTypeFilterFactory : TimelineEventTypeFilterFactory {
|
||||
override fun create(listStateEventType: List<StateEventType>): TimelineEventTypeFilter {
|
||||
return TimelineEventTypeFilter.exclude(
|
||||
listStateEventType.map { stateEventType ->
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
|
|||
|
||||
@ContributesBinding(AppScope::class)
|
||||
@Inject
|
||||
class DefaultRoomAliasHelper() : RoomAliasHelper {
|
||||
class DefaultRoomAliasHelper : RoomAliasHelper {
|
||||
override fun roomAliasNameFromRoomDisplayName(name: String): String {
|
||||
return org.matrix.rustcomponents.sdk.roomAliasNameFromRoomDisplayName(name)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue