diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e60595e8b9..cf1cd5b9ff 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -54,4 +54,13 @@ steps:
# Code quality
- label: "Code quality"
- command: "./tools/check/check_code_quality.sh"
+ command:
+ - "./tools/check/check_code_quality.sh"
+
+ - label: "ktlint"
+ command:
+ - "curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.34.2/ktlint && chmod a+x ktlint"
+ - "./ktlint --android --experimental -v"
+ plugins:
+ - docker#v3.1.0:
+ image: "openjdk"
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..19a95806d3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,32 @@
+# For ktlint configuration. Ref: https://ktlint.github.io/
+
+[*.{kt,kts}]
+# possible values: number (e.g. 2), "unset" (makes ktlint ignore indentation completely)
+indent_size=unset
+# true (recommended) / false
+insert_final_newline=true
+# possible values: number (e.g. 120) (package name, imports & comments are ignored), "off"
+# it's automatically set to 100 on `ktlint --android ...` (per Android Kotlin Style Guide)
+max_line_length=off
+
+# Comma-separated list of rules to disable (Since 0.34.0)
+# Note that rules in any ruleset other than the standard ruleset will need to be prefixed
+# by the ruleset identifier.
+disabled_rules=no-wildcard-imports,no-multi-spaces,colon-spacing,chain-wrapping,import-ordering,experimental:annotation
+
+# The following (so far identified) rules are kept:
+# no-blank-line-before-rbrace
+# final-newline
+# no-consecutive-blank-lines
+# comment-spacing
+# filename
+# comma-spacing
+# paren-spacing
+# op-spacing
+# string-template
+# no-unused-imports
+# curly-spacing
+# no-semi
+# no-empty-class-body
+# experimental:multiline-if-else
+# experimental:no-empty-first-line-in-method-block
diff --git a/.gitignore b/.gitignore
index 0722110715..76cd170215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,18 @@
*.iml
.gradle
/local.properties
-.idea/*
-/.idea/*
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
+# idea files: exclude everything except dictionnaries
+.idea/caches
+.idea/codeStyles
+.idea/libraries
+.idea/*.xml
.DS_Store
/build
/captures
.externalNativeBuild
/tmp
+
+ktlint
+.idea/copyright/New_vector.xml
+.idea/copyright/profiles_settings.xml
diff --git a/.idea/dictionaries/bmarty.xml b/.idea/dictionaries/bmarty.xml
new file mode 100644
index 0000000000..01981ada12
--- /dev/null
+++ b/.idea/dictionaries/bmarty.xml
@@ -0,0 +1,19 @@
+
+
+
+ backstack
+ bytearray
+ ciphertext
+ decryptor
+ emoji
+ emojis
+ hmac
+ ktlint
+ linkified
+ linkify
+ megolm
+ pbkdf
+ pkcs
+
+
+
\ No newline at end of file
diff --git a/CHANGES.md b/CHANGES.md
index 22701ff529..48d0be34cd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,29 @@
+Changes in RiotX 0.7.0 (2019-10-24)
+===================================================
+
+Features:
+ - Share elements from other app to RiotX (#58)
+ - Read marker (#84)
+ - Add ability to report content (#515)
+
+Improvements:
+ - Persist active tab between sessions (#503)
+ - Do not upload file too big for the homeserver (#587)
+ - Attachments: start using system pickers (#52)
+ - Mark all messages as read (#396)
+
+Other changes:
+ - Accessibility improvements to read receipts in the room timeline and reactions emoji chooser
+
+Bugfix:
+ - Fix issue on upload error in loop (#587)
+ - Fix opening a permalink: the targeted event is displayed twice (#556)
+ - Fix opening a permalink paginates all the history up to the last event (#282)
+ - after login, the icon in the top left is a green 'A' for (all communities) rather than my avatar (#267)
+ - Picture uploads are unreliable, pictures are shown in wrong aspect ratio on desktop client (#517)
+ - Invitation notifications are not dismissed automatically if room is joined from another client (#347)
+ - Opening links from RiotX reuses browser tab (#599)
+
Changes in RiotX 0.6.1 (2019-09-24)
===================================================
@@ -141,21 +167,21 @@ Mode details here: https://medium.com/@RiotChat/introducing-the-riotx-beta-for-a
Changes in RiotX 0.0.0 (2019-XX-XX)
===================================================
-Features:
+Features ✨:
-
-Improvements:
+Improvements 🙌:
-
Other changes:
-
-Bugfix:
+Bugfix 🐛:
-
-Translations:
+Translations 🗣:
-
-Build:
+Build 🧱:
-
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 449f6421cf..d64dd7110e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,19 +40,45 @@ Please add a line to the top of the file `CHANGES.md` describing your change.
Make sure the following commands execute without any error:
-> ./tools/check/check_code_quality.sh
+#### Internal tool
-> ./gradlew lintGplayRelease
+
+./tools/check/check_code_quality.sh
+
+
+#### ktlint
+
+
+curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.34.2/ktlint && chmod a+x ktlint
+./ktlint --android --experimental -v
+
+
+Note that you can run
+
+
+./ktlint --android --experimental -v -F
+
+
+For ktlint to fix some detected errors for you (you still have to check and commit the fix of course)
+
+#### lint
+
+
+./gradlew lintGplayRelease
+./gradlew lintFdroidRelease
+
### Unit tests
Make sure the following commands execute without any error:
-> ./gradlew testGplayReleaseUnitTest
+
+./gradlew testGplayReleaseUnitTest
+
### Tests
-RiotX is currently supported on Android Jelly Bean (API 16+): please test your change on an Android device (or Android emulator) running with API 16. Many issues can happen (including crashes) on older devices.
+RiotX is currently supported on Android KitKat (API 19+): please test your change on an Android device (or Android emulator) running with API 19. Many issues can happen (including crashes) on older devices.
Also, if possible, please test your change on a real device. Testing on Android emulator may not be sufficient.
### Internationalisation
diff --git a/build.gradle b/build.gradle
index b52707d527..714152370e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,7 @@
-import javax.tools.JavaCompiler
-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.3.21'
+ ext.kotlin_version = '1.3.50'
repositories {
google()
jcenter()
@@ -12,11 +10,11 @@ buildscript {
}
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.1'
- classpath 'com.google.gms:google-services:4.2.0'
- classpath "com.airbnb.okreplay:gradle-plugin:1.4.0"
+ classpath 'com.android.tools.build:gradle:3.5.1'
+ classpath 'com.google.gms:google-services:4.3.2'
+ classpath "com.airbnb.okreplay:gradle-plugin:1.5.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2'
+ classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
classpath 'com.google.android.gms:oss-licenses-plugin:0.9.5'
// NOTE: Do not place your application dependencies here; they belong
@@ -61,6 +59,11 @@ allprojects {
]
}
+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+ // Warnings are potential errors, so stop ignoring them
+ kotlinOptions.allWarningsAsErrors = true
+ }
+
afterEvaluate {
extensions.findByName("kapt")?.arguments {
arg("dagger.gradle.incremental", "enabled")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 240d7e10ef..51b92600a0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 19 09:53:05 CET 2019
+#Fri Sep 27 10:10:35 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/matrix-sdk-android-rx/build.gradle b/matrix-sdk-android-rx/build.gradle
index 6e24d1d582..31f928c241 100644
--- a/matrix-sdk-android-rx/build.gradle
+++ b/matrix-sdk-android-rx/build.gradle
@@ -5,8 +5,6 @@ apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 28
-
-
defaultConfig {
minSdkVersion 16
targetSdkVersion 28
@@ -14,7 +12,6 @@ android {
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
}
buildTypes {
@@ -29,12 +26,14 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
-
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
}
dependencies {
implementation project(":matrix-sdk-android")
- implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
// Paging
diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/LiveDataObservable.kt b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/LiveDataObservable.kt
index a1943bbe1c..7958d3efa1 100644
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/LiveDataObservable.kt
+++ b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/LiveDataObservable.kt
@@ -20,7 +20,6 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.Observer
import io.reactivex.Observable
import io.reactivex.android.MainThreadDisposable
-import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
private class LiveDataObservable(
@@ -60,4 +59,4 @@ private class LiveDataObservable(
fun LiveData.asObservable(): Observable {
return LiveDataObservable(this).observeOn(Schedulers.computation())
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/MatrixCallbackCompletable.kt b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/MatrixCallbackCompletable.kt
index 58c015dfdd..cf0e955b00 100644
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/MatrixCallbackCompletable.kt
+++ b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/MatrixCallbackCompletable.kt
@@ -19,7 +19,6 @@ package im.vector.matrix.rx
import im.vector.matrix.android.api.MatrixCallback
import im.vector.matrix.android.api.util.Cancelable
import io.reactivex.CompletableEmitter
-import io.reactivex.SingleEmitter
internal class MatrixCallbackCompletable(private val completableEmitter: CompletableEmitter) : MatrixCallback {
@@ -36,4 +35,4 @@ fun Cancelable.toCompletable(completableEmitter: CompletableEmitter) {
completableEmitter.setCancellable {
this.cancel()
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/MatrixCallbackSingle.kt b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/MatrixCallbackSingle.kt
index 8d554df270..d638354dfd 100644
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/MatrixCallbackSingle.kt
+++ b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/MatrixCallbackSingle.kt
@@ -35,4 +35,4 @@ fun Cancelable.toSingle(singleEmitter: SingleEmitter) {
singleEmitter.setCancellable {
this.cancel()
}
-}
\ No newline at end of file
+}
diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/DialogSendItemAdapter.kt b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/OptionalRx.kt
similarity index 72%
rename from vector/src/main/java/im/vector/riotx/core/dialogs/DialogSendItemAdapter.kt
rename to matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/OptionalRx.kt
index 8689168e77..d608837d4a 100644
--- a/vector/src/main/java/im/vector/riotx/core/dialogs/DialogSendItemAdapter.kt
+++ b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/OptionalRx.kt
@@ -14,13 +14,11 @@
* limitations under the License.
*/
-package im.vector.riotx.core.dialogs
+package im.vector.matrix.rx
-import android.content.Context
+import im.vector.matrix.android.api.util.Optional
+import io.reactivex.Observable
-internal class DialogSendItemAdapter(context: Context, items: MutableList) : DialogAdapter(context) {
-
- init {
- addAll(items)
- }
+fun Observable>.unwrap(): Observable {
+ return filter { it.hasValue() }.map { it.get() }
}
diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxRoom.kt b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxRoom.kt
index 28a3d40070..e058b2716c 100644
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxRoom.kt
+++ b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxRoom.kt
@@ -22,25 +22,34 @@ import im.vector.matrix.android.api.session.room.model.ReadReceipt
import im.vector.matrix.android.api.session.room.model.RoomSummary
import im.vector.matrix.android.api.session.room.send.UserDraft
import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
+import im.vector.matrix.android.api.util.Optional
import io.reactivex.Observable
import io.reactivex.Single
class RxRoom(private val room: Room) {
- fun liveRoomSummary(): Observable {
- return room.liveRoomSummary().asObservable()
+ fun liveRoomSummary(): Observable> {
+ return room.getRoomSummaryLive().asObservable()
}
fun liveRoomMemberIds(): Observable> {
return room.getRoomMemberIdsLive().asObservable()
}
- fun liveAnnotationSummary(eventId: String): Observable {
+ fun liveAnnotationSummary(eventId: String): Observable> {
return room.getEventSummaryLive(eventId).asObservable()
}
- fun liveTimelineEvent(eventId: String): Observable {
- return room.liveTimeLineEvent(eventId).asObservable()
+ fun liveTimelineEvent(eventId: String): Observable> {
+ return room.getTimeLineEventLive(eventId).asObservable()
+ }
+
+ fun liveReadMarker(): Observable> {
+ return room.getReadMarkerLive().asObservable()
+ }
+
+ fun liveReadReceipt(): Observable> {
+ return room.getMyReadReceiptLive().asObservable()
}
fun loadRoomMembersIfNeeded(): Single = Single.create {
@@ -58,9 +67,8 @@ class RxRoom(private val room: Room) {
fun liveDrafts(): Observable> {
return room.getDraftsLive().asObservable()
}
-
}
fun Room.rx(): RxRoom {
return RxRoom(this)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt
index f3fb06a45a..f19777b6f5 100644
--- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt
@@ -24,6 +24,7 @@ import im.vector.matrix.android.api.session.room.model.RoomSummary
import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
import im.vector.matrix.android.api.session.sync.SyncState
import im.vector.matrix.android.api.session.user.model.User
+import im.vector.matrix.android.api.util.Optional
import io.reactivex.Observable
import io.reactivex.Single
@@ -45,6 +46,10 @@ class RxSession(private val session: Session) {
return session.livePushers().asObservable()
}
+ fun liveUser(userId: String): Observable> {
+ return session.liveUser(userId).asObservable().distinctUntilChanged()
+ }
+
fun liveUsers(): Observable> {
return session.liveUsers().asObservable()
}
@@ -66,9 +71,8 @@ class RxSession(private val session: Session) {
fun joinRoom(roomId: String, viaServers: List = emptyList()): Single = Single.create {
session.joinRoom(roomId, viaServers, MatrixCallbackSingle(it)).toSingle(it)
}
-
}
fun Session.rx(): RxSession {
return RxSession(this)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 8002625e12..3e6d3ea88b 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -67,6 +67,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
+
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
}
static def gitRevision() {
@@ -86,41 +90,43 @@ static def gitRevisionDate() {
dependencies {
- def arrow_version = "0.8.0"
- def support_version = '1.1.0-beta01'
+ def arrow_version = "0.8.2"
def moshi_version = '1.8.0'
- def lifecycle_version = '2.0.0'
- def coroutines_version = "1.0.1"
- def markwon_version = '3.0.0'
- def daggerVersion = '2.23.1'
+ def lifecycle_version = '2.1.0'
+ def coroutines_version = "1.3.2"
+ def markwon_version = '3.1.0'
+ def daggerVersion = '2.24'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
- implementation "androidx.appcompat:appcompat:1.1.0-rc01"
- implementation "androidx.recyclerview:recyclerview:1.1.0-beta01"
+ implementation "androidx.appcompat:appcompat:1.1.0"
+ implementation "androidx.recyclerview:recyclerview:1.1.0-beta05"
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
// Network
- implementation 'com.squareup.retrofit2:retrofit:2.6.0'
- implementation 'com.squareup.retrofit2:converter-moshi:2.4.0'
- implementation 'com.squareup.okhttp3:okhttp:3.14.1'
- implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
+ implementation 'com.squareup.retrofit2:retrofit:2.6.2'
+ implementation 'com.squareup.retrofit2:converter-moshi:2.6.2'
+ implementation 'com.squareup.okhttp3:okhttp:4.2.2'
+ implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
implementation 'com.novoda:merlin:1.2.0'
implementation "com.squareup.moshi:moshi-adapters:$moshi_version"
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
implementation "ru.noties.markwon:core:$markwon_version"
+ // Image
+ implementation 'androidx.exifinterface:exifinterface:1.0.0'
+
// Database
implementation 'com.github.Zhuinden:realm-monarchy:0.5.1'
kapt 'dk.ilios:realmfieldnameshelper:1.1.1'
// Work
- implementation "androidx.work:work-runtime-ktx:2.1.0-rc01"
+ implementation "androidx.work:work-runtime-ktx:2.3.0-alpha01"
// FP
implementation "io.arrow-kt:arrow-core:$arrow_version"
@@ -132,24 +138,24 @@ dependencies {
// DI
implementation "com.google.dagger:dagger:$daggerVersion"
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
- compileOnly 'com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0'
- kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.4.0'
+ compileOnly 'com.squareup.inject:assisted-inject-annotations-dagger2:0.5.0'
+ kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.5.0'
// Logging
implementation 'com.jakewharton.timber:timber:4.7.1'
- implementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'
+ implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
// Bus
implementation 'org.greenrobot:eventbus:3.1.1'
- debugImplementation 'com.airbnb.okreplay:okreplay:1.4.0'
- releaseImplementation 'com.airbnb.okreplay:noop:1.4.0'
- androidTestImplementation 'com.airbnb.okreplay:espresso:1.4.0'
+ debugImplementation 'com.airbnb.okreplay:okreplay:1.5.0'
+ releaseImplementation 'com.airbnb.okreplay:noop:1.5.0'
+ androidTestImplementation 'com.airbnb.okreplay:espresso:1.5.0'
testImplementation 'junit:junit:4.12'
- testImplementation 'org.robolectric:robolectric:4.0.2'
+ testImplementation 'org.robolectric:robolectric:4.3'
//testImplementation 'org.robolectric:shadows-support-v4:3.0'
- testImplementation "io.mockk:mockk:1.8.13.kotlin13"
+ testImplementation 'io.mockk:mockk:1.9.3.kotlin12'
testImplementation 'org.amshove.kluent:kluent-android:1.44'
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
@@ -159,7 +165,7 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'org.amshove.kluent:kluent-android:1.44'
- androidTestImplementation "io.mockk:mockk-android:1.8.13.kotlin13"
+ androidTestImplementation 'io.mockk:mockk-android:1.9.3.kotlin12'
androidTestImplementation "androidx.arch.core:core-testing:$lifecycle_version"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/InstrumentedTest.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/InstrumentedTest.kt
index c6db522c46..3cd47d4998 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/InstrumentedTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/InstrumentedTest.kt
@@ -28,4 +28,4 @@ interface InstrumentedTest {
fun cacheDir(): File {
return context().cacheDir
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/OkReplayRuleChainNoActivity.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/OkReplayRuleChainNoActivity.kt
index 9fd1fe6b5c..098e927a9f 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/OkReplayRuleChainNoActivity.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/OkReplayRuleChainNoActivity.kt
@@ -29,4 +29,4 @@ class OkReplayRuleChainNoActivity(
return RuleChain.outerRule(PermissionRule(configuration))
.around(RecorderRule(configuration))
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt
index 69803c5dc1..e63123f3b3 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt
@@ -19,4 +19,4 @@ package im.vector.matrix.android
import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
import kotlinx.coroutines.Dispatchers.Main
-internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(Main, Main, Main, Main, Main)
\ No newline at end of file
+internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(Main, Main, Main, Main, Main)
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticatorTest.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticatorTest.kt
index 3dfc06196e..7d33fae4d8 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticatorTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticatorTest.kt
@@ -28,7 +28,6 @@ import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
-
@RunWith(AndroidJUnit4::class)
internal class AuthenticatorTest : InstrumentedTest {
@@ -50,7 +49,6 @@ internal class AuthenticatorTest : InstrumentedTest {
@UiThreadTest
@OkReplay(tape = "auth", mode = TapeMode.READ_WRITE)
fun auth() {
-
}
companion object {
@@ -59,6 +57,4 @@ internal class AuthenticatorTest : InstrumentedTest {
val grantExternalStoragePermissionRule: GrantPermissionRule =
GrantPermissionRule.grant(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
}
-
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreHelper.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreHelper.kt
index c0fc6c4454..6b0ebbf6a4 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreHelper.kt
@@ -41,4 +41,4 @@ internal class CryptoStoreHelper {
refreshToken = null,
deviceId = "deviceId_sample"
)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt
index 0f65ad3ee5..3fc3079cc7 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt
@@ -114,4 +114,4 @@ class CryptoStoreTest {
olmAccount1.releaseAccount()
olmAccount2.releaseAccount()
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/util/JsonCanonicalizerTest.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/util/JsonCanonicalizerTest.kt
index 1ea6105da4..0a7c8f6439 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/util/JsonCanonicalizerTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/util/JsonCanonicalizerTest.kt
@@ -62,8 +62,6 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
JsonCanonicalizer.canonicalize("{\"a\":\"\\\"\"}"))
}
-
-
/* ==========================================================================================
* Test from https://matrix.org/docs/spec/appendices.html#examples
* ========================================================================================== */
@@ -74,7 +72,6 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
JsonCanonicalizer.canonicalize("""{}"""))
}
-
@Test
fun matrixOrg002Test() {
assertEquals("""{"one":1,"two":"Two"}""",
@@ -84,7 +81,6 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
}"""))
}
-
@Test
fun matrixOrg003Test() {
assertEquals("""{"a":"1","b":"2"}""",
@@ -94,14 +90,12 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
}"""))
}
-
@Test
fun matrixOrg004Test() {
assertEquals("""{"a":"1","b":"2"}""",
JsonCanonicalizer.canonicalize("""{"b":"2","a":"1"}"""))
}
-
@Test
fun matrixOrg005Test() {
assertEquals("""{"auth":{"mxid":"@john.doe:example.com","profile":{"display_name":"John Doe","three_pids":[{"address":"john.doe@example.org","medium":"email"},{"address":"123456789","medium":"msisdn"}]},"success":true}}""",
@@ -126,7 +120,6 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
}"""))
}
-
@Test
fun matrixOrg006Test() {
assertEquals("""{"a":"日本語"}""",
@@ -135,7 +128,6 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
}"""))
}
-
@Test
fun matrixOrg007Test() {
assertEquals("""{"日":1,"本":2}""",
@@ -145,7 +137,6 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
}"""))
}
-
@Test
fun matrixOrg008Test() {
assertEquals("""{"a":"日"}""",
@@ -159,4 +150,4 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
"a": null
}"""))
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt
index c6da3c4628..abb990c979 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt
@@ -35,7 +35,6 @@ import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
-
@RunWith(AndroidJUnit4::class)
internal class ChunkEntityTest : InstrumentedTest {
@@ -48,7 +47,6 @@ internal class ChunkEntityTest : InstrumentedTest {
monarchy = Monarchy.Builder().setRealmConfiguration(testConfig).build()
}
-
@Test
fun add_shouldAdd_whenNotAlreadyIncluded() {
monarchy.runTransactionSync { realm ->
@@ -194,5 +192,4 @@ internal class ChunkEntityTest : InstrumentedTest {
chunk1.nextToken shouldEqual nextToken
}
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeGetContextOfEventTask.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeGetContextOfEventTask.kt
index 48f223925c..0e1980f134 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeGetContextOfEventTask.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeGetContextOfEventTask.kt
@@ -32,6 +32,4 @@ internal class FakeGetContextOfEventTask constructor(private val tokenChunkEvent
)
return tokenChunkEventPersistor.insertInDb(tokenChunkEvent, params.roomId, PaginationDirection.BACKWARDS)
}
-
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakePaginationTask.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakePaginationTask.kt
index 2f7f63d77c..be67ffdbba 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakePaginationTask.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakePaginationTask.kt
@@ -28,6 +28,4 @@ internal class FakePaginationTask @Inject constructor(private val tokenChunkEven
val tokenChunkEvent = FakeTokenChunkEvent(params.from, Random.nextLong(System.currentTimeMillis()).toString(), fakeEvents)
return tokenChunkEventPersistor.insertInDb(tokenChunkEvent, params.roomId, params.direction)
}
-
}
-
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeTokenChunkEvent.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeTokenChunkEvent.kt
index 2a9163e4ba..3f74df2c2e 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeTokenChunkEvent.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeTokenChunkEvent.kt
@@ -23,4 +23,4 @@ internal data class FakeTokenChunkEvent(override val start: String?,
override val end: String?,
override val events: List = emptyList(),
override val stateEvents: List = emptyList()
-) : TokenChunkEvent
\ No newline at end of file
+) : TokenChunkEvent
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/RoomDataHelper.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/RoomDataHelper.kt
index 7ff693584e..8a8ee11854 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/RoomDataHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/RoomDataHelper.kt
@@ -88,6 +88,4 @@ object RoomDataHelper {
roomEntity.addOrUpdate(chunkEntity)
}
}
-
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineTest.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineTest.kt
index f09b037605..06651f9ba3 100644
--- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/TimelineTest.kt
@@ -81,6 +81,4 @@ internal class TimelineTest : InstrumentedTest {
// timelineEvents.size shouldEqual initialLoad + paginationCount
// timeline.dispose()
// }
-
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/CurlLoggingInterceptor.kt b/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/CurlLoggingInterceptor.kt
index 3d499be3c1..c96786ba3b 100644
--- a/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/CurlLoggingInterceptor.kt
+++ b/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/CurlLoggingInterceptor.kt
@@ -22,6 +22,7 @@ import okhttp3.Interceptor
import okhttp3.Response
import okhttp3.logging.HttpLoggingInterceptor
import okio.Buffer
+import timber.log.Timber
import java.io.IOException
import java.nio.charset.Charset
import javax.inject.Inject
@@ -51,27 +52,33 @@ internal class CurlLoggingInterceptor @Inject constructor(private val logger: Ht
var compressed = false
var curlCmd = "curl"
- if (curlOptions != null) {
- curlCmd += " " + curlOptions!!
+ curlOptions?.let {
+ curlCmd += " $it"
}
- curlCmd += " -X " + request.method()
+ curlCmd += " -X " + request.method
- val requestBody = request.body()
+ val requestBody = request.body
if (requestBody != null) {
- val buffer = Buffer()
- requestBody.writeTo(buffer)
- var charset: Charset? = UTF8
- val contentType = requestBody.contentType()
- if (contentType != null) {
- charset = contentType.charset(UTF8)
+ if (requestBody.contentLength() > 100_000) {
+ Timber.w("Unable to log curl command data, size is too big (${requestBody.contentLength()})")
+ // Ensure the curl command will failed
+ curlCmd += "DATA IS TOO BIG"
+ } else {
+ val buffer = Buffer()
+ requestBody.writeTo(buffer)
+ var charset: Charset? = UTF8
+ val contentType = requestBody.contentType()
+ if (contentType != null) {
+ charset = contentType.charset(UTF8)
+ }
+ // try to keep to a single line and use a subshell to preserve any line breaks
+ curlCmd += " --data $'" + buffer.readString(charset!!).replace("\n", "\\n") + "'"
}
- // try to keep to a single line and use a subshell to preserve any line breaks
- curlCmd += " --data $'" + buffer.readString(charset!!).replace("\n", "\\n") + "'"
}
- val headers = request.headers()
+ val headers = request.headers
var i = 0
- val count = headers.size()
+ val count = headers.size
while (i < count) {
val name = headers.name(i)
val value = headers.value(i)
@@ -82,7 +89,7 @@ internal class CurlLoggingInterceptor @Inject constructor(private val logger: Ht
i++
}
- curlCmd += ((if (compressed) " --compressed " else " ") + "'" + request.url().toString()
+ curlCmd += ((if (compressed) " --compressed " else " ") + "'" + request.url.toString()
// Replace localhost for emulator by localhost for shell
.replace("://10.0.2.2:8080/".toRegex(), "://127.0.0.1:8080/")
+ "'")
@@ -90,7 +97,7 @@ internal class CurlLoggingInterceptor @Inject constructor(private val logger: Ht
// Add Json formatting
curlCmd += " | python -m json.tool"
- logger.log("--- cURL (" + request.url() + ")")
+ logger.log("--- cURL (" + request.url + ")")
logger.log(curlCmd)
return chain.proceed(request)
diff --git a/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/FormattedJsonHttpLogger.kt b/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/FormattedJsonHttpLogger.kt
index 655134d1e3..43f1373daf 100644
--- a/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/FormattedJsonHttpLogger.kt
+++ b/matrix-sdk-android/src/debug/java/im/vector/matrix/android/internal/network/interceptors/FormattedJsonHttpLogger.kt
@@ -51,7 +51,6 @@ class FormattedJsonHttpLogger : HttpLoggingInterceptor.Logger {
// Finally this is not a JSON string...
Timber.e(e)
}
-
} else if (message.startsWith("[")) {
// JSON Array detected
try {
@@ -61,7 +60,6 @@ class FormattedJsonHttpLogger : HttpLoggingInterceptor.Logger {
// Finally not JSON...
Timber.e(e)
}
-
}
// Else not a json string to log
}
@@ -73,4 +71,4 @@ class FormattedJsonHttpLogger : HttpLoggingInterceptor.Logger {
Timber.v(s)
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/Matrix.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/Matrix.kt
index bdc988d2f7..1bfa871a42 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/Matrix.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/Matrix.kt
@@ -38,7 +38,6 @@ data class MatrixConfiguration(
interface Provider {
fun providesMatrixConfiguration(): MatrixConfiguration
}
-
}
/**
@@ -98,5 +97,4 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
return BuildConfig.VERSION_NAME + " (" + BuildConfig.GIT_SDK_REVISION + ")"
}
}
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixCallback.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixCallback.kt
index 00d22b1f9f..c2f70ce5dc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixCallback.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixCallback.kt
@@ -27,7 +27,7 @@ interface MatrixCallback {
* @param data the data successfully returned from the async function
*/
fun onSuccess(data: T) {
- //no-op
+ // no-op
}
/**
@@ -35,7 +35,6 @@ interface MatrixCallback {
* @param failure the failure data returned from the async function
*/
fun onFailure(failure: Throwable) {
- //no-op
+ // no-op
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixPatterns.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixPatterns.kt
index 935408296c..e30d139cd3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixPatterns.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixPatterns.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.api
-
/**
* This class contains pattern to match the different Matrix ids
*/
@@ -154,6 +153,5 @@ object MatrixPatterns {
return if (index == -1) {
null
} else matrixId.substring(index + 1)
-
}
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/Authenticator.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/Authenticator.kt
index 2dc2d0ef5f..77a3cde249 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/Authenticator.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/Authenticator.kt
@@ -68,4 +68,4 @@ interface Authenticator {
* Create a session after a SSO successful login
*/
fun createSessionFromSso(credentials: Credentials, homeServerConnectionConfig: HomeServerConnectionConfig): Session
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/HomeServerConnectionConfig.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/HomeServerConnectionConfig.kt
index 850c4f7186..e85b05092f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/HomeServerConnectionConfig.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/HomeServerConnectionConfig.kt
@@ -253,13 +253,5 @@ data class HomeServerConnectionConfig(
forceUsageTlsVersions
)
}
-
}
-
-
}
-
-
-
-
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/comparators/DatedObjectComparators.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/comparators/DatedObjectComparators.kt
index c9245e7331..a9d30f823c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/comparators/DatedObjectComparators.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/comparators/DatedObjectComparators.kt
@@ -37,4 +37,4 @@ object DatedObjectComparators {
(datedObject2.date - datedObject1.date).toInt()
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/MatrixSdkExtensions.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/MatrixSdkExtensions.kt
index 180d80c5c5..685a522f60 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/MatrixSdkExtensions.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/MatrixSdkExtensions.kt
@@ -19,7 +19,6 @@ package im.vector.matrix.android.api.extensions
import im.vector.matrix.android.api.comparators.DatedObjectComparators
import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
-import java.util.Collections
/* ==========================================================================================
* MXDeviceInfo
@@ -29,7 +28,6 @@ fun MXDeviceInfo.getFingerprintHumanReadable() = fingerprint()
?.chunked(4)
?.joinToString(separator = " ")
-
-fun List.sortByLastSeen() {
- Collections.sort(this, DatedObjectComparators.descComparator)
-}
\ No newline at end of file
+fun MutableList.sortByLastSeen() {
+ sortWith(DatedObjectComparators.descComparator)
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/ConsentNotGivenError.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/ConsentNotGivenError.kt
index c780720a18..80ee6811bb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/ConsentNotGivenError.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/ConsentNotGivenError.kt
@@ -19,4 +19,4 @@ package im.vector.matrix.android.api.failure
// This data class will be sent to the bus
data class ConsentNotGivenError(
val consentUri: String
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/Failure.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/Failure.kt
index 26170a288f..6c418ed831 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/Failure.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/Failure.kt
@@ -42,5 +42,4 @@ sealed class Failure(cause: Throwable? = null) : Throwable(cause = cause) {
data class CryptoError(val error: MXCryptoError) : Failure(error)
abstract class FeatureFailure : Failure()
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/MatrixError.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/MatrixError.kt
index 7d433ba7ba..70a982089c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/MatrixError.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/MatrixError.kt
@@ -33,7 +33,6 @@ data class MatrixError(
@Json(name = "limit_type") val limitType: String? = null,
@Json(name = "admin_contact") val adminUri: String? = null) {
-
companion object {
const val FORBIDDEN = "M_FORBIDDEN"
const val UNKNOWN = "M_UNKNOWN"
@@ -64,4 +63,4 @@ data class MatrixError(
// Possible value for "limit_type"
const val LIMIT_TYPE_MAU = "monthly_active_user"
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/ProgressListener.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/ProgressListener.kt
index 854f0e9fb6..ad47260f86 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/ProgressListener.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/ProgressListener.kt
@@ -25,4 +25,4 @@ interface ProgressListener {
* @param total
*/
fun onProgress(progress: Int, total: Int)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/StepProgressListener.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/StepProgressListener.kt
index af5b815c1a..196aa6d655 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/StepProgressListener.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/listeners/StepProgressListener.kt
@@ -31,4 +31,4 @@ interface StepProgressListener {
* @param step The current step, containing progress data if available. Else you should consider progress as indeterminate
*/
fun onStepProgress(step: Step)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixLinkify.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixLinkify.kt
index fb3dbcc26c..fc02cf4a61 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixLinkify.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixLinkify.kt
@@ -30,9 +30,9 @@ object MatrixLinkify {
*
* @param spannable the text in which the matrix items has to be clickable.
*/
- fun addLinks(spannable: Spannable?, callback: MatrixPermalinkSpan.Callback?): Boolean {
+ fun addLinks(spannable: Spannable, callback: MatrixPermalinkSpan.Callback?): Boolean {
// sanity checks
- if (spannable.isNullOrEmpty()) {
+ if (spannable.isEmpty()) {
return false
}
val text = spannable.toString()
@@ -51,5 +51,4 @@ object MatrixLinkify {
}
return hasMatch
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixPermalinkSpan.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixPermalinkSpan.kt
index 58cd76a0a6..afba5ab040 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixPermalinkSpan.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixPermalinkSpan.kt
@@ -35,6 +35,4 @@ class MatrixPermalinkSpan(private val url: String,
override fun onClick(widget: View) {
callback?.onUrlClicked(url)
}
-
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkData.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkData.kt
index 615892a107..47f8bf4505 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkData.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkData.kt
@@ -33,5 +33,4 @@ sealed class PermalinkData {
data class GroupLink(val groupId: String) : PermalinkData()
data class FallbackLink(val uri: Uri) : PermalinkData()
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkFactory.kt
index 15d56eacb3..1af77869ee 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkFactory.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkFactory.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.api.permalinks
-import android.text.TextUtils
import im.vector.matrix.android.api.session.events.model.Event
/**
@@ -48,10 +47,9 @@ object PermalinkFactory {
* @return the permalink, or null in case of error
*/
fun createPermalink(id: String): String? {
- return if (TextUtils.isEmpty(id)) {
+ return if (id.isEmpty()) {
null
} else MATRIX_TO_URL_BASE + escape(id)
-
}
/**
@@ -72,16 +70,14 @@ object PermalinkFactory {
* @param url the universal link, Ex: "https://matrix.to/#/@benoit:matrix.org"
* @return the id from the url, ex: "@benoit:matrix.org", or null if the url is not a permalink
*/
- fun getLinkedId(url: String?): String? {
- val isSupported = url != null && url.startsWith(MATRIX_TO_URL_BASE)
+ fun getLinkedId(url: String): String? {
+ val isSupported = url.startsWith(MATRIX_TO_URL_BASE)
return if (isSupported) {
- url!!.substring(MATRIX_TO_URL_BASE.length)
+ url.substring(MATRIX_TO_URL_BASE.length)
} else null
-
}
-
/**
* Escape '/' in id, because it is used as a separator
*
@@ -89,6 +85,6 @@ object PermalinkFactory {
* @return the escaped id
*/
private fun escape(id: String): String {
- return id.replace("/".toRegex(), "%2F")
+ return id.replace("/", "%2F")
}
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkParser.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkParser.kt
index 71fd16e778..531f4ae523 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkParser.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkParser.kt
@@ -72,5 +72,4 @@ object PermalinkParser {
else -> PermalinkData.FallbackLink(uri)
}
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Action.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Action.kt
index b34d2d0d34..d135504055 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Action.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Action.kt
@@ -18,7 +18,6 @@ package im.vector.matrix.android.api.pushrules
import im.vector.matrix.android.api.pushrules.rest.PushRule
import timber.log.Timber
-
sealed class Action {
object Notify : Action()
object DoNotNotify : Action()
@@ -26,7 +25,6 @@ sealed class Action {
data class Highlight(val highlight: Boolean) : Action()
}
-
private const val ACTION_NOTIFY = "notify"
private const val ACTION_DONT_NOTIFY = "dont_notify"
private const val ACTION_COALESCE = "coalesce"
@@ -80,7 +78,6 @@ fun PushRule.getActions(): List {
}
// When the value is not there, default sound (not specified by the spec)
?: Action.Sound(ACTION_OBJECT_VALUE_VALUE_DEFAULT)
-
}
ACTION_OBJECT_SET_TWEAK_VALUE_HIGHLIGHT -> {
(actionStrOrObj[ACTION_OBJECT_VALUE_KEY] as? Boolean)?.let { boolValue ->
@@ -104,7 +101,5 @@ fun PushRule.getActions(): List {
}
}
-
return result
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Condition.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Condition.kt
index c0bb4f16f4..ecc78996db 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Condition.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Condition.kt
@@ -35,9 +35,7 @@ abstract class Condition(val kind: Kind) {
else -> UNRECOGNIZE
}
}
-
}
-
}
abstract fun isSatisfied(conditionResolver: ConditionResolver): Boolean
@@ -45,4 +43,4 @@ abstract class Condition(val kind: Kind) {
open fun technicalDescription(): String {
return "Kind: $kind"
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ConditionResolver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ConditionResolver.kt
index 4d15d5deec..340810bc80 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ConditionResolver.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ConditionResolver.kt
@@ -25,4 +25,4 @@ interface ConditionResolver {
fun resolveRoomMemberCountCondition(roomMemberCountCondition: RoomMemberCountCondition): Boolean
fun resolveSenderNotificationPermissionCondition(senderNotificationPermissionCondition: SenderNotificationPermissionCondition): Boolean
fun resolveContainsDisplayNameCondition(containsDisplayNameCondition: ContainsDisplayNameCondition) : Boolean
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ContainsDisplayNameCondition.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ContainsDisplayNameCondition.kt
index 37bc75ad57..166ec4f05f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ContainsDisplayNameCondition.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/ContainsDisplayNameCondition.kt
@@ -15,13 +15,11 @@
*/
package im.vector.matrix.android.api.pushrules
-import android.text.TextUtils
import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.api.session.events.model.EventType
import im.vector.matrix.android.api.session.events.model.toModel
import im.vector.matrix.android.api.session.room.model.message.MessageContent
import timber.log.Timber
-import java.util.regex.Pattern
class ContainsDisplayNameCondition : Condition(Kind.contains_display_name) {
@@ -34,11 +32,11 @@ class ContainsDisplayNameCondition : Condition(Kind.contains_display_name) {
}
fun isSatisfied(event: Event, displayName: String): Boolean {
- var message = when (event.type) {
+ val message = when (event.type) {
EventType.MESSAGE -> {
event.content.toModel()
}
- //TODO the spec says:
+ // TODO the spec says:
// Matches any message whose content is unencrypted and contains the user's current display name
// EventType.ENCRYPTED -> {
// event.root.getClearContent()?.toModel()
@@ -49,7 +47,6 @@ class ContainsDisplayNameCondition : Condition(Kind.contains_display_name) {
return caseInsensitiveFind(displayName, message.body)
}
-
companion object {
/**
* Returns whether a string contains an occurrence of another, as a standalone word, regardless of case.
@@ -60,20 +57,18 @@ class ContainsDisplayNameCondition : Condition(Kind.contains_display_name) {
*/
fun caseInsensitiveFind(subString: String, longString: String): Boolean {
// add sanity checks
- if (TextUtils.isEmpty(subString) || TextUtils.isEmpty(longString)) {
+ if (subString.isEmpty() || longString.isEmpty()) {
return false
}
- var res = false
-
try {
- val pattern = Pattern.compile("(\\W|^)" + Pattern.quote(subString) + "(\\W|$)", Pattern.CASE_INSENSITIVE)
- res = pattern.matcher(longString).find()
+ val regex = Regex("(\\W|^)" + Regex.escape(subString) + "(\\W|$)", RegexOption.IGNORE_CASE)
+ return regex.containsMatchIn(longString)
} catch (e: Exception) {
Timber.e(e, "## caseInsensitiveFind() : failed")
}
- return res
+ return false
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/EventMatchCondition.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/EventMatchCondition.kt
index 7325abba2a..a4eacc9018 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/EventMatchCondition.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/EventMatchCondition.kt
@@ -29,28 +29,25 @@ class EventMatchCondition(val key: String, val pattern: String) : Condition(Kind
return "'$key' Matches '$pattern'"
}
-
fun isSatisfied(event: Event): Boolean {
- //TODO encrypted events?
+ // TODO encrypted events?
val rawJson = MoshiProvider.providesMoshi().adapter(Event::class.java).toJsonValue(event) as? Map<*, *>
?: return false
val value = extractField(rawJson, key) ?: return false
- //Patterns with no special glob characters should be treated as having asterisks prepended
+ // Patterns with no special glob characters should be treated as having asterisks prepended
// and appended when testing the condition.
try {
val modPattern = if (hasSpecialGlobChar(pattern)) simpleGlobToRegExp(pattern) else simpleGlobToRegExp("*$pattern*")
val regex = Regex(modPattern, RegexOption.DOT_MATCHES_ALL)
return regex.containsMatchIn(value)
} catch (e: Throwable) {
- //e.g PatternSyntaxException
+ // e.g PatternSyntaxException
Timber.e(e, "Failed to evaluate push condition")
return false
}
-
}
-
private fun extractField(jsonObject: Map<*, *>, fieldPath: String): String? {
val fieldParts = fieldPath.split(".")
if (fieldParts.isEmpty()) return null
@@ -77,9 +74,9 @@ class EventMatchCondition(val key: String, val pattern: String) : Condition(Kind
return glob.contains("*") || glob.contains("?")
}
- //Very simple glob to regexp converter
+ // Very simple glob to regexp converter
private fun simpleGlobToRegExp(glob: String): String {
- var out = ""//"^"
+ var out = "" // "^"
for (i in 0 until glob.length) {
val c = glob[i]
when (c) {
@@ -90,8 +87,8 @@ class EventMatchCondition(val key: String, val pattern: String) : Condition(Kind
else -> out += c
}
}
- out += ""//'$'.toString()
+ out += "" // '$'.toString()
return out
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt
index c0204d181d..aa277ea8bd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt
@@ -27,10 +27,10 @@ interface PushRuleService {
*/
fun fetchPushRules(scope: String = RuleScope.GLOBAL)
- //TODO get push rule set
+ // TODO get push rule set
fun getPushRules(scope: String = RuleScope.GLOBAL): List
- //TODO update rule
+ // TODO update rule
fun updatePushRuleEnableStatus(kind: RuleKind, pushRule: PushRule, enabled: Boolean, callback: MatrixCallback): Cancelable
@@ -42,8 +42,9 @@ interface PushRuleService {
interface PushRuleListener {
fun onMatchRule(event: Event, actions: List)
+ fun onRoomJoined(roomId: String)
fun onRoomLeft(roomId: String)
fun onEventRedacted(redactedEventId: String)
fun batchFinish()
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RoomMemberCountCondition.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RoomMemberCountCondition.kt
index d0b76fbab7..d41788234b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RoomMemberCountCondition.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/RoomMemberCountCondition.kt
@@ -62,6 +62,5 @@ class RoomMemberCountCondition(val iz: String) : Condition(Kind.room_member_coun
Timber.d(t)
}
return null
-
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/SenderNotificationPermissionCondition.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/SenderNotificationPermissionCondition.kt
index 35b731c5c3..46fc9a5c6d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/SenderNotificationPermissionCondition.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/SenderNotificationPermissionCondition.kt
@@ -18,7 +18,6 @@ package im.vector.matrix.android.api.pushrules
import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.api.session.room.model.PowerLevels
-
class SenderNotificationPermissionCondition(val key: String) : Condition(Kind.sender_notification_permission) {
override fun isSatisfied(conditionResolver: ConditionResolver): Boolean {
@@ -29,8 +28,7 @@ class SenderNotificationPermissionCondition(val key: String) : Condition(Kind.se
return "User power level <$key>"
}
-
fun isSatisfied(event: Event, powerLevels: PowerLevels): Boolean {
return event.senderId != null && powerLevels.getUserPowerLevel(event.senderId) >= powerLevels.notificationLevel(key)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushCondition.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushCondition.kt
index 7b71a344a0..4b643a0b42 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushCondition.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushCondition.kt
@@ -76,4 +76,4 @@ data class PushCondition(
}
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushRule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushRule.kt
index 1e36a0d867..e9423d7c40 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushRule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushRule.kt
@@ -19,7 +19,6 @@ package im.vector.matrix.android.api.pushrules.rest
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
-
@JsonClass(generateAdapter = true)
data class PushRule(
/**
@@ -47,4 +46,3 @@ data class PushRule(
*/
val pattern: String? = null
)
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/Ruleset.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/Ruleset.kt
index 5f4ca15ac0..72692d5afd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/Ruleset.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/Ruleset.kt
@@ -24,4 +24,4 @@ data class Ruleset(
val room: List? = null,
val sender: List? = null,
val underride: List? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt
index a4c9d81beb..4d65179307 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt
@@ -26,4 +26,4 @@ interface InitialSyncProgressService {
@StringRes val statusText: Int,
val percentProgress: Int = 0
)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt
index 53dc8e77a0..2440713a40 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt
@@ -19,6 +19,7 @@ package im.vector.matrix.android.api.session
import androidx.annotation.MainThread
import androidx.lifecycle.LiveData
import im.vector.matrix.android.api.auth.data.SessionParams
+import im.vector.matrix.android.api.failure.ConsentNotGivenError
import im.vector.matrix.android.api.pushrules.PushRuleService
import im.vector.matrix.android.api.session.cache.CacheService
import im.vector.matrix.android.api.session.content.ContentUploadStateTracker
@@ -26,6 +27,7 @@ import im.vector.matrix.android.api.session.content.ContentUrlResolver
import im.vector.matrix.android.api.session.crypto.CryptoService
import im.vector.matrix.android.api.session.file.FileService
import im.vector.matrix.android.api.session.group.GroupService
+import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilitiesService
import im.vector.matrix.android.api.session.pushers.PushersService
import im.vector.matrix.android.api.session.room.RoomDirectoryService
import im.vector.matrix.android.api.session.room.RoomService
@@ -52,6 +54,7 @@ interface Session :
PushRuleService,
PushersService,
InitialSyncProgressService,
+ HomeServerCapabilitiesService,
SecureStorageService {
/**
@@ -65,7 +68,6 @@ interface Session :
val myUserId: String
get() = sessionParams.credentials.userId
-
/**
* This method allow to open a session. It does start some service on the background.
*/
@@ -138,6 +140,9 @@ interface Session :
*/
fun onInvalidToken()
+ /**
+ * A M_CONSENT_NOT_GIVEN error has been received from the homeserver
+ */
+ fun onConsentNotGivenError(consentNotGivenError: ConsentNotGivenError)
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/cache/CacheService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/cache/CacheService.kt
index 43ab78b5aa..f1e4ca6c7b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/cache/CacheService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/cache/CacheService.kt
@@ -27,5 +27,4 @@ interface CacheService {
* Clear the whole cached data, except credentials. Once done, the session is closed and has to be opened again
*/
fun clearCache(callback: MatrixCallback)
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentAttachmentData.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentAttachmentData.kt
index c8dca8692c..933657b2fb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentAttachmentData.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentAttachmentData.kt
@@ -17,6 +17,7 @@
package im.vector.matrix.android.api.session.content
import android.os.Parcelable
+import androidx.exifinterface.media.ExifInterface
import kotlinx.android.parcel.Parcelize
@Parcelize
@@ -26,6 +27,7 @@ data class ContentAttachmentData(
val date: Long = 0,
val height: Long? = 0,
val width: Long? = 0,
+ val exifOrientation: Int = ExifInterface.ORIENTATION_UNDEFINED,
val name: String? = null,
val path: String,
val mimeType: String,
@@ -38,5 +40,4 @@ data class ContentAttachmentData(
AUDIO,
VIDEO
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt
index 26273ebb8a..540b164aa5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt
@@ -35,4 +35,4 @@ interface ContentUploadStateTracker {
object Success : State()
data class Failure(val throwable: Throwable) : State()
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUrlResolver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUrlResolver.kt
index 0a20bef809..9ba1631aec 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUrlResolver.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUrlResolver.kt
@@ -44,4 +44,4 @@ interface ContentUrlResolver {
* @return the URL to access the described resource, or null if the url is invalid.
*/
fun resolveThumbnail(contentUrl: String?, width: Int, height: Int, method: ThumbnailMethod): String?
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/CryptoService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/CryptoService.kt
index 43c783a13d..706f89dfc9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/CryptoService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/CryptoService.kt
@@ -112,5 +112,4 @@ interface CryptoService {
fun addNewSessionListener(newSessionListener: NewSessionListener)
fun removeSessionListener(listener: NewSessionListener)
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/MXCryptoError.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/MXCryptoError.kt
index b61a1e4149..fe41b6c074 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/MXCryptoError.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/MXCryptoError.kt
@@ -90,4 +90,4 @@ sealed class MXCryptoError : Throwable() {
const val NO_MORE_ALGORITHM_REASON = "Room was previously configured to use encryption, but is no longer." +
" Perhaps the homeserver is hiding the configuration event."
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupService.kt
index 6728daa527..cb06dbf665 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupService.kt
@@ -210,5 +210,4 @@ interface KeysBackupService {
val isEnabled: Boolean
val isStucked: Boolean
val state: KeysBackupState
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupState.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupState.kt
index a1bd29e78d..a20f1c61b4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupState.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupState.kt
@@ -72,4 +72,4 @@ enum class KeysBackupState {
WillBackUp,
// e2e keys are being sent to the homeserver
BackingUp
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupStateListener.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupStateListener.kt
index f145d779f1..be1f2e5f3e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupStateListener.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/keysbackup/KeysBackupStateListener.kt
@@ -23,4 +23,4 @@ interface KeysBackupStateListener {
* @param newState the new state
*/
fun onStateChange(newState: KeysBackupState)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/CancelCode.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/CancelCode.kt
index d999d06fc5..92a69bcad6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/CancelCode.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/CancelCode.kt
@@ -30,4 +30,4 @@ enum class CancelCode(val value: String, val humanReadable: String) {
fun safeValueOf(code: String?): CancelCode {
return CancelCode.values().firstOrNull { code == it.value } ?: CancelCode.User
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/EmojiRepresentation.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/EmojiRepresentation.kt
index 0bcb96a999..031610f0c6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/EmojiRepresentation.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/EmojiRepresentation.kt
@@ -19,4 +19,4 @@ package im.vector.matrix.android.api.session.crypto.sas
import androidx.annotation.StringRes
data class EmojiRepresentation(val emoji: String,
- @StringRes val nameResId: Int)
\ No newline at end of file
+ @StringRes val nameResId: Int)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/IncomingSasVerificationTransaction.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/IncomingSasVerificationTransaction.kt
index 791c63dc15..57dfc74236 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/IncomingSasVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/IncomingSasVerificationTransaction.kt
@@ -31,4 +31,4 @@ interface IncomingSasVerificationTransaction {
CANCELLED_BY_ME,
CANCELLED_BY_OTHER
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/OutgoingSasVerificationRequest.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/OutgoingSasVerificationRequest.kt
index 6aeed55549..f2c16da997 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/OutgoingSasVerificationRequest.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/OutgoingSasVerificationRequest.kt
@@ -29,4 +29,4 @@ interface OutgoingSasVerificationRequest {
CANCELLED_BY_ME,
CANCELLED_BY_OTHER
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/Mode.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasMode.kt
similarity index 99%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/Mode.kt
rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasMode.kt
index da72e98bad..f58485decd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/Mode.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasMode.kt
@@ -19,4 +19,4 @@ package im.vector.matrix.android.api.session.crypto.sas
object SasMode {
const val DECIMAL = "decimal"
const val EMOJI = "emoji"
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationService.kt
index a11c69cd7e..88c0787b4d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationService.kt
@@ -36,4 +36,4 @@ interface SasVerificationService {
fun transactionUpdated(tx: SasVerificationTransaction)
fun markedAsManuallyVerified(userId: String, deviceId: String)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationTransaction.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationTransaction.kt
index dc489cf644..d24ccadb55 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationTransaction.kt
@@ -47,4 +47,4 @@ interface SasVerificationTransaction {
* both short codes do match
*/
fun userHasVerifiedShortCode()
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationTxState.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationTxState.kt
index 60ce8f0cc6..350ec2c381 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationTxState.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationTxState.kt
@@ -43,7 +43,7 @@ enum class SasVerificationTxState {
Verifying,
Verified,
- //Global: The verification has been cancelled (by me or other), see cancelReason for details
+ // Global: The verification has been cancelled (by me or other), see cancelReason for details
Cancelled,
OnCancelled
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedAnnotation.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedAnnotation.kt
index 3f1c619906..ef164cd17b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedAnnotation.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedAnnotation.kt
@@ -34,9 +34,9 @@ import com.squareup.moshi.JsonClass
*/
@JsonClass(generateAdapter = true)
-data class AggregatedAnnotation (
+data class AggregatedAnnotation(
override val limited: Boolean? = false,
override val count: Int? = 0,
val chunk: List? = null
-) : UnsignedRelationInfo
\ No newline at end of file
+) : UnsignedRelationInfo
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedRelations.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedRelations.kt
index 0f8d21f532..d04a72bac5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedRelations.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/AggregatedRelations.kt
@@ -50,4 +50,4 @@ import com.squareup.moshi.JsonClass
data class AggregatedRelations(
@Json(name = "m.annotation") val annotations: AggregatedAnnotation? = null,
@Json(name = "m.reference") val references: DefaultUnsignedRelationInfo? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/DefaultUnsignedRelationInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/DefaultUnsignedRelationInfo.kt
index 3e2df0aaf2..f7a573ca28 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/DefaultUnsignedRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/DefaultUnsignedRelationInfo.kt
@@ -23,4 +23,4 @@ data class DefaultUnsignedRelationInfo(
override val count: Int? = 0,
val chunk: List>? = null
-) : UnsignedRelationInfo
\ No newline at end of file
+) : UnsignedRelationInfo
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt
index 902515a239..bc6885eddc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.api.session.events.model
-import android.text.TextUtils
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import im.vector.matrix.android.api.session.crypto.MXCryptoError
@@ -35,18 +34,16 @@ typealias Content = JsonDict
* This methods is a facility method to map a json content to a model.
*/
inline fun Content?.toModel(catchError: Boolean = true): T? {
- return this?.let {
- val moshi = MoshiProvider.providesMoshi()
- val moshiAdapter = moshi.adapter(T::class.java)
- return try {
- moshiAdapter.fromJsonValue(it)
- } catch (e: Exception) {
- if (catchError) {
- Timber.e(e, "To model failed : $e")
- null
- } else {
- throw e
- }
+ val moshi = MoshiProvider.providesMoshi()
+ val moshiAdapter = moshi.adapter(T::class.java)
+ return try {
+ moshiAdapter.fromJsonValue(this)
+ } catch (e: Exception) {
+ if (catchError) {
+ Timber.e(e, "To model failed : $e")
+ null
+ } else {
+ throw e
}
}
}
@@ -55,12 +52,10 @@ inline fun Content?.toModel(catchError: Boolean = true): T? {
* This methods is a facility method to map a model to a json Content
*/
@Suppress("UNCHECKED_CAST")
-inline fun T?.toContent(): Content? {
- return this?.let {
- val moshi = MoshiProvider.providesMoshi()
- val moshiAdapter = moshi.adapter(T::class.java)
- return moshiAdapter.toJsonValue(it) as Content
- }
+inline fun T.toContent(): Content {
+ val moshi = MoshiProvider.providesMoshi()
+ val moshiAdapter = moshi.adapter(T::class.java)
+ return moshiAdapter.toJsonValue(this) as Content
}
/**
@@ -81,7 +76,6 @@ data class Event(
@Json(name = "redacts") val redacts: String? = null
) {
-
@Transient
var mxDecryptionResult: OlmDecryptionResult? = null
@@ -91,7 +85,6 @@ data class Event(
@Transient
var sendState: SendState = SendState.UNKNOWN
-
/**
* Check if event is a state event.
* @return true if event is state event.
@@ -100,15 +93,15 @@ data class Event(
return EventType.isStateEvent(getClearType())
}
- //==============================================================================================================
+ // ==============================================================================================================
// Crypto
- //==============================================================================================================
+ // ==============================================================================================================
/**
* @return true if this event is encrypted.
*/
fun isEncrypted(): Boolean {
- return TextUtils.equals(type, EventType.ENCRYPTED)
+ return type == EventType.ENCRYPTED
}
/**
@@ -136,11 +129,12 @@ data class Event(
* @return the event content
*/
fun getClearContent(): Content? {
+ @Suppress("UNCHECKED_CAST")
return mxDecryptionResult?.payload?.get("content") as? Content ?: content
}
fun toContentStringWithIndent(): String {
- val contentMap = toContent()?.toMutableMap() ?: HashMap()
+ val contentMap = toContent().toMutableMap()
return JSONObject(contentMap).toString(4)
}
@@ -194,10 +188,8 @@ data class Event(
result = 31 * result + sendState.hashCode()
return result
}
-
}
-
fun Event.isTextMessage(): Boolean {
return getClearType() == EventType.MESSAGE
&& when (getClearContent()?.toModel()?.type) {
@@ -214,4 +206,4 @@ fun Event.isImageMessage(): Boolean {
MessageType.MSGTYPE_IMAGE -> true
else -> false
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/EventType.kt
index 98ce6c0f9e..38c24fa89b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/EventType.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.api.session.events.model
-
/**
* Constants defining known event types from Matrix specifications.
*/
@@ -93,7 +92,6 @@ object EventType {
STATE_PINNED_EVENT
)
-
fun isStateEvent(type: String): Boolean {
return STATE_EVENTS.contains(type)
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/LocalEcho.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/LocalEcho.kt
new file mode 100644
index 0000000000..ca75871cda
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/LocalEcho.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.api.session.events.model
+
+import java.util.*
+
+object LocalEcho {
+
+ private const val PREFIX = "local."
+
+ fun isLocalEchoId(eventId: String) = eventId.startsWith(PREFIX)
+
+ fun createLocalEchoId() = "${PREFIX}${UUID.randomUUID()}"
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/RelationType.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/RelationType.kt
index 0f5421a05a..06b3e9bf2e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/RelationType.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/RelationType.kt
@@ -15,7 +15,6 @@
*/
package im.vector.matrix.android.api.session.events.model
-
/**
* Constants defining known event relation types from Matrix specifications
*/
@@ -27,5 +26,4 @@ object RelationType {
const val REPLACE = "m.replace"
/** Lets you define an event which references an existing event.*/
const val REFERENCE = "m.reference"
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedData.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedData.kt
index 4a9547e3f1..57eaa7dc76 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedData.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedData.kt
@@ -26,4 +26,4 @@ data class UnsignedData(
@Json(name = "transaction_id") val transactionId: String? = null,
@Json(name = "prev_content") val prevContent: Map? = null,
@Json(name = "m.relations") val relations: AggregatedRelations? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedRelationInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedRelationInfo.kt
index 5b627b6236..ad31ad3a32 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/UnsignedRelationInfo.kt
@@ -15,8 +15,7 @@
*/
package im.vector.matrix.android.api.session.events.model
-
interface UnsignedRelationInfo {
val limited : Boolean?
val count: Int?
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/FileService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/FileService.kt
index 296b7e1537..e1694199ed 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/FileService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/file/FileService.kt
@@ -20,7 +20,6 @@ import im.vector.matrix.android.api.MatrixCallback
import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
import java.io.File
-
/**
* This interface defines methods to get files.
*/
@@ -49,4 +48,4 @@ interface FileService {
url: String?,
elementToDecrypt: ElementToDecrypt?,
callback: MatrixCallback)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/Group.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/Group.kt
index ae41eb9eb7..3967c15704 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/Group.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/Group.kt
@@ -21,4 +21,4 @@ package im.vector.matrix.android.api.session.group
*/
interface Group {
val groupId: String
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/GroupService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/GroupService.kt
index 2ccfbff2c7..ff63d1a9e7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/GroupService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/GroupService.kt
@@ -19,7 +19,6 @@ package im.vector.matrix.android.api.session.group
import androidx.lifecycle.LiveData
import im.vector.matrix.android.api.session.group.model.GroupSummary
-
/**
* This interface defines methods to get groups. It's implemented at the session level.
*/
@@ -37,4 +36,4 @@ interface GroupService {
* @return the [LiveData] of [GroupSummary]
*/
fun liveGroupSummaries(): LiveData>
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/model/GroupSummary.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/model/GroupSummary.kt
index 328ca746a6..8e39d6d31a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/model/GroupSummary.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/group/model/GroupSummary.kt
@@ -30,4 +30,4 @@ data class GroupSummary(
val avatarUrl: String = "",
val roomIds: List = emptyList(),
val userIds: List = emptyList()
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilities.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilities.kt
new file mode 100644
index 0000000000..9b01cdef3b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilities.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.api.session.homeserver
+
+data class HomeServerCapabilities(
+ /**
+ * Max size of file which can be uploaded to the homeserver in bytes. [MAX_UPLOAD_FILE_SIZE_UNKNOWN] if unknown or not retrieved yet
+ */
+ val maxUploadFileSize: Long = MAX_UPLOAD_FILE_SIZE_UNKNOWN
+) {
+ companion object {
+ const val MAX_UPLOAD_FILE_SIZE_UNKNOWN = -1L
+ }
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilitiesService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilitiesService.kt
new file mode 100644
index 0000000000..e8b38735cf
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/homeserver/HomeServerCapabilitiesService.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.api.session.homeserver
+
+/**
+ * This interface defines a method to retrieve the homeserver capabilities.
+ */
+interface HomeServerCapabilitiesService {
+
+ /**
+ * Get the HomeServer capabilities
+ */
+ fun getHomeServerCapabilities(): HomeServerCapabilities
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/Pusher.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/Pusher.kt
index baedce9693..ba0af7d4dc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/Pusher.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/Pusher.kt
@@ -39,4 +39,4 @@ enum class PusherState {
data class PusherData(
val url: String? = null,
val format: String? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/PushersService.kt
index c905490432..d082faa7c7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/pushers/PushersService.kt
@@ -19,7 +19,6 @@ import androidx.lifecycle.LiveData
import im.vector.matrix.android.api.MatrixCallback
import java.util.UUID
-
interface PushersService {
/**
@@ -53,7 +52,6 @@ interface PushersService {
append: Boolean,
withEventIdOnly: Boolean): UUID
-
fun removeHttpPusher(pushkey: String, appId: String, callback: MatrixCallback)
companion object {
@@ -63,4 +61,4 @@ interface PushersService {
fun livePushers(): LiveData>
fun pushers() : List
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt
index 92414eb768..70c9c6e36c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt
@@ -21,11 +21,13 @@ import im.vector.matrix.android.api.session.room.crypto.RoomCryptoService
import im.vector.matrix.android.api.session.room.members.MembershipService
import im.vector.matrix.android.api.session.room.model.RoomSummary
import im.vector.matrix.android.api.session.room.model.relation.RelationService
+import im.vector.matrix.android.api.session.room.reporting.ReportingService
import im.vector.matrix.android.api.session.room.read.ReadService
import im.vector.matrix.android.api.session.room.send.DraftService
import im.vector.matrix.android.api.session.room.send.SendService
import im.vector.matrix.android.api.session.room.state.StateService
import im.vector.matrix.android.api.session.room.timeline.TimelineService
+import im.vector.matrix.android.api.util.Optional
/**
* This interface defines methods to interact within a room.
@@ -37,6 +39,7 @@ interface Room :
ReadService,
MembershipService,
StateService,
+ ReportingService,
RelationService,
RoomCryptoService {
@@ -49,8 +52,7 @@ interface Room :
* A live [RoomSummary] associated with the room
* You can observe this summary to get dynamic data from this room.
*/
- fun liveRoomSummary(): LiveData
+ fun getRoomSummaryLive(): LiveData>
fun roomSummary(): RoomSummary?
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomDirectoryService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomDirectoryService.kt
index 272ab5675b..930320d976 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomDirectoryService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomDirectoryService.kt
@@ -42,5 +42,4 @@ interface RoomDirectoryService {
* Includes both the available protocols and all fields required for queries against each protocol.
*/
fun getThirdPartyProtocol(callback: MatrixCallback>): Cancelable
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt
index 7ec50bd2ca..c7fedb2627 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt
@@ -54,4 +54,8 @@ interface RoomService {
*/
fun liveRoomSummaries(): LiveData>
-}
\ No newline at end of file
+ /**
+ * Mark all rooms as read
+ */
+ fun markAllAsRead(roomIds: List, callback: MatrixCallback): Cancelable
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/crypto/RoomCryptoService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/crypto/RoomCryptoService.kt
index 910002ab6e..f8c15fde47 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/crypto/RoomCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/crypto/RoomCryptoService.kt
@@ -23,4 +23,4 @@ interface RoomCryptoService {
fun encryptionAlgorithm(): String?
fun shouldEncryptForInvitedMembers(): Boolean
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/CreateRoomFailure.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/CreateRoomFailure.kt
index 086dc621ca..263f699e62 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/CreateRoomFailure.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/CreateRoomFailure.kt
@@ -21,5 +21,4 @@ import im.vector.matrix.android.api.failure.Failure
sealed class CreateRoomFailure : Failure.FeatureFailure() {
object CreatedWithTimeout: CreateRoomFailure()
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/JoinRoomFailure.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/JoinRoomFailure.kt
index 4c7dd62ad6..80393e5d3d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/JoinRoomFailure.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/failure/JoinRoomFailure.kt
@@ -21,5 +21,4 @@ import im.vector.matrix.android.api.failure.Failure
sealed class JoinRoomFailure : Failure.FeatureFailure() {
object JoinedWithTimeout : JoinRoomFailure()
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/MembershipService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/MembershipService.kt
index 9dba26cb3e..8d60bee9da 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/MembershipService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/MembershipService.kt
@@ -64,5 +64,4 @@ interface MembershipService {
* Leave the room, or reject an invitation.
*/
fun leave(callback: MatrixCallback): Cancelable
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/EventAnnotationsSummary.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/EventAnnotationsSummary.kt
index 18899f8700..0d403be2f4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/EventAnnotationsSummary.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/EventAnnotationsSummary.kt
@@ -19,4 +19,4 @@ data class EventAnnotationsSummary(
var eventId: String,
var reactionsSummary: List,
var editSummary: EditAggregatedSummary?
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Invite.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Invite.kt
index c808ad556c..c439143de5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Invite.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Invite.kt
@@ -27,4 +27,4 @@ data class Invite(
@Json(name = "display_name") val displayName: String,
@Json(name = "signed") val signed: Signed
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Membership.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Membership.kt
index d87bb9b3db..1894effc7a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Membership.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Membership.kt
@@ -43,5 +43,4 @@ enum class Membership(val value: String) {
fun isLeft(): Boolean {
return this == KNOCK || this == LEAVE || this == BAN
}
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PowerLevels.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PowerLevels.kt
index 964d618264..27f7820156 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PowerLevels.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/PowerLevels.kt
@@ -16,11 +16,9 @@
package im.vector.matrix.android.api.session.room.model
-import android.text.TextUtils
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import im.vector.matrix.android.api.session.events.model.EventType
-import java.util.*
/**
* Class representing the EventType.EVENT_TYPE_STATE_ROOM_POWER_LEVELS state event content.
@@ -45,14 +43,8 @@ data class PowerLevels(
* @param userId the user id
* @return the power level
*/
- fun getUserPowerLevel(userId: String): Int {
- // sanity check
- if (!TextUtils.isEmpty(userId)) {
- val powerLevel = users[userId]
- return powerLevel ?: usersDefault
- }
-
- return usersDefault
+ fun getUserPowerLevel(userId: String): Int {
+ return users.getOrElse(userId) { usersDefault }
}
/**
@@ -61,10 +53,8 @@ data class PowerLevels(
* @param userId the user
* @param powerLevel the new power level
*/
- fun setUserPowerLevel(userId: String?, powerLevel: Int) {
- if (null != userId) {
- users[userId] = Integer.valueOf(powerLevel)
- }
+ fun setUserPowerLevel(userId: String, powerLevel: Int) {
+ users[userId] = powerLevel
}
/**
@@ -74,11 +64,10 @@ data class PowerLevels(
* @param userId the user id
* @return true if the user can send the event
*/
- fun maySendEventOfType(eventTypeString: String, userId: String): Boolean {
- return if (!TextUtils.isEmpty(eventTypeString) && !TextUtils.isEmpty(userId)) {
+ fun maySendEventOfType(eventTypeString: String, userId: String): Boolean {
+ return if (eventTypeString.isNotEmpty() && userId.isNotEmpty()) {
getUserPowerLevel(userId) >= minimumPowerLevelForSendingEventAsMessage(eventTypeString)
} else false
-
}
/**
@@ -87,8 +76,8 @@ data class PowerLevels(
* @param userId the user id
* @return true if the user can send a room message
*/
- fun maySendMessage(userId: String): Boolean {
- return maySendEventOfType(EventType.MESSAGE, userId)
+ fun maySendMessage(userId: String): Boolean {
+ return maySendEventOfType(EventType.MESSAGE, userId)
}
/**
@@ -98,7 +87,7 @@ data class PowerLevels(
* @param eventTypeString the type of event (in Event.EVENT_TYPE_XXX values)
* @return the required minimum power level.
*/
- fun minimumPowerLevelForSendingEventAsMessage(eventTypeString: String?): Int {
+ fun minimumPowerLevelForSendingEventAsMessage(eventTypeString: String?): Int {
return events[eventTypeString] ?: eventsDefault
}
@@ -109,29 +98,24 @@ data class PowerLevels(
* @param eventTypeString the type of event (in Event.EVENT_TYPE_STATE_ values).
* @return the required minimum power level.
*/
- fun minimumPowerLevelForSendingEventAsStateEvent(eventTypeString: String?): Int {
+ fun minimumPowerLevelForSendingEventAsStateEvent(eventTypeString: String?): Int {
return events[eventTypeString] ?: stateDefault
}
-
/**
* Get the notification level for a dedicated key.
*
* @param key the notification key
* @return the level
*/
- fun notificationLevel(key: String?): Int {
- if (null != key && notifications.containsKey(key)) {
- val valAsVoid = notifications[key]
+ fun notificationLevel(key: String): Int {
+ val valAsVoid = notifications[key] ?: return 50
- // the first implementation was a string value
- return if (valAsVoid is String) {
- Integer.parseInt(valAsVoid)
- } else {
- valAsVoid as Int
- }
+ // the first implementation was a string value
+ return if (valAsVoid is String) {
+ valAsVoid.toInt()
+ } else {
+ valAsVoid as Int
}
-
- return 50
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReactionAggregatedSummary.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReactionAggregatedSummary.kt
index 7036f68186..5ab4804fae 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReactionAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReactionAggregatedSummary.kt
@@ -23,4 +23,4 @@ data class ReactionAggregatedSummary(
val firstTimestamp: Long, // unix timestamp
val sourceEvents: List,
val localEchoEvents: List
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReadReceipt.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReadReceipt.kt
index e168dc1e5b..4bb31bccdc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReadReceipt.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReadReceipt.kt
@@ -21,4 +21,4 @@ import im.vector.matrix.android.api.session.user.model.User
data class ReadReceipt(
val user: User,
val originServerTs: Long
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAliasesContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAliasesContent.kt
index 74b29b7aea..8a857a1c02 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAliasesContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAliasesContent.kt
@@ -25,4 +25,4 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class RoomAliasesContent(
@Json(name = "aliases") val aliases: List = emptyList()
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAvatarContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAvatarContent.kt
index 8f81632bf4..fc0814817c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAvatarContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAvatarContent.kt
@@ -25,4 +25,4 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class RoomAvatarContent(
@Json(name = "url") val avatarUrl: String? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomCanonicalAliasContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomCanonicalAliasContent.kt
index abaa9f0a6c..a66f23555d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomCanonicalAliasContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomCanonicalAliasContent.kt
@@ -25,4 +25,4 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class RoomCanonicalAliasContent(
@Json(name = "alias") val canonicalAlias: String? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomDirectoryVisibility.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomDirectoryVisibility.kt
index 2e1b5a3922..ab3407392c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomDirectoryVisibility.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomDirectoryVisibility.kt
@@ -21,4 +21,4 @@ import com.squareup.moshi.Json
enum class RoomDirectoryVisibility {
@Json(name = "private") PRIVATE,
@Json(name = "public") PUBLIC
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibility.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibility.kt
index 9260b0112c..a066aaadd5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibility.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibility.kt
@@ -23,4 +23,4 @@ enum class RoomHistoryVisibility {
@Json(name = "invited") INVITED,
@Json(name = "joined") JOINED,
@Json(name = "world_readable") WORLD_READABLE
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibilityContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibilityContent.kt
index 7781bcdaf7..96bd910781 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibilityContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibilityContent.kt
@@ -22,4 +22,4 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class RoomHistoryVisibilityContent(
@Json(name = "history_visibility") val historyVisibility: RoomHistoryVisibility? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomMember.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomMember.kt
index 10c3e8ec7c..aa73727685 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomMember.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomMember.kt
@@ -31,4 +31,4 @@ data class RoomMember(
@Json(name = "is_direct") val isDirect: Boolean = false,
@Json(name = "third_party_invite") val thirdPartyInvite: Invite? = null,
@Json(name = "unsigned") val unsignedData: UnsignedData? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomNameContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomNameContent.kt
index 48cbb91cac..72bdaf1d36 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomNameContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomNameContent.kt
@@ -25,4 +25,4 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class RoomNameContent(
@Json(name = "name") val name: String? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt
index 099deae937..447ba563de 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt
@@ -38,9 +38,13 @@ data class RoomSummary(
val tags: List = emptyList(),
val membership: Membership = Membership.NONE,
val versioningState: VersioningState = VersioningState.NONE,
+ val readMarkerId: String? = null,
val userDrafts: List = emptyList()
) {
val isVersioned: Boolean
get() = versioningState != VersioningState.NONE
-}
\ No newline at end of file
+
+ val hasNewMessages: Boolean
+ get() = notificationCount != 0
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomTopicContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomTopicContent.kt
index 8a6e3f90f3..2439618f46 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomTopicContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomTopicContent.kt
@@ -25,4 +25,4 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class RoomTopicContent(
@Json(name = "topic") val topic: String? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Signed.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Signed.kt
index 4f0e5212fb..43b957bde3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Signed.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Signed.kt
@@ -22,4 +22,4 @@ data class Signed(
@Json(name = "token") val token: String,
@Json(name = "signatures") val signatures: Any,
@Json(name = "mxid") val mxid: String
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/VersioningState.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/VersioningState.kt
index f2753fbf35..a878e10e3f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/VersioningState.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/VersioningState.kt
@@ -20,4 +20,4 @@ enum class VersioningState {
NONE,
UPGRADED_ROOM_NOT_JOINED,
UPGRADED_ROOM_JOINED
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallAnswerContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallAnswerContent.kt
index 0539571884..24eb68bd78 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallAnswerContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallAnswerContent.kt
@@ -31,5 +31,4 @@ data class CallAnswerContent(
@Json(name = "type") val type: String,
@Json(name = "sdp") val sdp: String
)
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallCandidatesContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallCandidatesContent.kt
index 48c02f3df8..5fb4db84a3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallCandidatesContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallCandidatesContent.kt
@@ -32,5 +32,4 @@ data class CallCandidatesContent(
@Json(name = "sdpMLineIndex") val sdpMLineIndex: String,
@Json(name = "candidate") val candidate: String
)
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallInviteContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallInviteContent.kt
index 58e5d561e6..29305d1420 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallInviteContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallInviteContent.kt
@@ -37,6 +37,5 @@ data class CallInviteContent(
}
}
-
fun isVideo(): Boolean = offer.sdp.contains(Offer.SDP_VIDEO)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt
index c707f3c3ef..598aab2d30 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt
@@ -145,15 +145,7 @@ class CreateRoomParams {
*/
fun setHistoryVisibility(historyVisibility: RoomHistoryVisibility?) {
// Remove the existing value if any.
- if (initialStates != null && !initialStates!!.isEmpty()) {
- val newInitialStates = ArrayList()
- for (event in initialStates!!) {
- if (event.getClearType() != EventType.STATE_HISTORY_VISIBILITY) {
- newInitialStates.add(event)
- }
- }
- initialStates = newInitialStates
- }
+ initialStates?.removeAll { it.getClearType() == EventType.STATE_HISTORY_VISIBILITY }
if (historyVisibility != null) {
val contentMap = HashMap()
@@ -243,4 +235,4 @@ class CreateRoomParams {
// TODO add phonenumbers when it will be available
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomPreset.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomPreset.kt
index 9548062bae..eafe9ef292 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomPreset.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomPreset.kt
@@ -27,4 +27,4 @@ enum class CreateRoomPreset {
@Json(name = "trusted_private_chat")
PRESET_TRUSTED_PRIVATE_CHAT
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/Invite3Pid.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/Invite3Pid.kt
index 5ad920a32b..8e3386080f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/Invite3Pid.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/Invite3Pid.kt
@@ -39,4 +39,4 @@ data class Invite3Pid(
* The invitee's third party identifier.
*/
val address: String
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/RoomCreateContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/RoomCreateContent.kt
index afb318bce9..323c7d7445 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/RoomCreateContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/RoomCreateContent.kt
@@ -28,5 +28,3 @@ data class RoomCreateContent(
@Json(name = "room_version") val roomVersion: String? = null,
@Json(name = "predecessor") val predecessor: Predecessor? = null
)
-
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/AudioInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/AudioInfo.kt
index de30d46024..eef6b283c6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/AudioInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/AudioInfo.kt
@@ -35,4 +35,4 @@ data class AudioInfo(
* The duration of the audio in milliseconds.
*/
@Json(name = "duration") val duration: Int = 0
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/FileInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/FileInfo.kt
index d5dfb04f19..b8ed516d9d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/FileInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/FileInfo.kt
@@ -46,4 +46,4 @@ data class FileInfo(
* Information on the encrypted thumbnail file, as specified in End-to-end encryption. Only present if the thumbnail is encrypted.
*/
@Json(name = "thumbnail_file") val thumbnailFile: EncryptedFileInfo? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ImageInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ImageInfo.kt
index 729bc604c1..20af927e46 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ImageInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ImageInfo.kt
@@ -42,16 +42,6 @@ data class ImageInfo(
*/
@Json(name = "size") val size: Int = 0,
- /**
- * Not documented
- */
- @Json(name = "rotation") val rotation: Int = 0,
-
- /**
- * Not documented
- */
- @Json(name = "orientation") val orientation: Int = 0,
-
/**
* Metadata about the image referred to in thumbnail_url.
*/
@@ -66,4 +56,4 @@ data class ImageInfo(
* Information on the encrypted thumbnail file, as specified in End-to-end encryption. Only present if the thumbnail is encrypted.
*/
@Json(name = "thumbnail_file") val thumbnailFile: EncryptedFileInfo? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/LocationInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/LocationInfo.kt
index f00d48826b..ab6e5e66e9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/LocationInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/LocationInfo.kt
@@ -36,4 +36,4 @@ data class LocationInfo(
* Information on the encrypted thumbnail file, as specified in End-to-end encryption. Only present if the thumbnail is encrypted.
*/
@Json(name = "thumbnail_file") val thumbnailFile: EncryptedFileInfo? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt
index c116c6b315..157ff00d69 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt
@@ -19,7 +19,6 @@ package im.vector.matrix.android.api.session.room.model.message
import im.vector.matrix.android.api.session.events.model.Content
import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-
interface MessageContent {
val type: String
val body: String
@@ -27,7 +26,6 @@ interface MessageContent {
val newContent: Content?
}
-
fun MessageContent?.isReply(): Boolean {
return this?.relatesTo?.inReplyTo?.eventId != null
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageDefaultContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageDefaultContent.kt
index 45ce9542e0..705dbf5d85 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageDefaultContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageDefaultContent.kt
@@ -27,4 +27,4 @@ data class MessageDefaultContent(
@Json(name = "body") override val body: String,
@Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
@Json(name = "m.new_content") override val newContent: Content? = null
-) : MessageContent
\ No newline at end of file
+) : MessageContent
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEmoteContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEmoteContent.kt
index 88fd3bc1cd..ec340659a2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEmoteContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEmoteContent.kt
@@ -29,4 +29,4 @@ data class MessageEmoteContent(
@Json(name = "formatted_body") val formattedBody: String? = null,
@Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
@Json(name = "m.new_content") override val newContent: Content? = null
-) : MessageContent
\ No newline at end of file
+) : MessageContent
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEncryptedContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEncryptedContent.kt
index 125c18bb00..110b9c68f0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEncryptedContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEncryptedContent.kt
@@ -18,7 +18,6 @@ package im.vector.matrix.android.api.session.room.model.message
import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
-
/**
* Interface for message which can contains an encrypted file
*/
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageLocationContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageLocationContent.kt
index deddec12a5..15c746fd38 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageLocationContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageLocationContent.kt
@@ -45,4 +45,4 @@ data class MessageLocationContent(
@Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
@Json(name = "m.new_content") override val newContent: Content? = null
-) : MessageContent
\ No newline at end of file
+) : MessageContent
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageNoticeContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageNoticeContent.kt
index 54037c600f..9a4fea1060 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageNoticeContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageNoticeContent.kt
@@ -29,4 +29,4 @@ data class MessageNoticeContent(
@Json(name = "formatted_body") val formattedBody: String? = null,
@Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
@Json(name = "m.new_content") override val newContent: Content? = null
-) : MessageContent
\ No newline at end of file
+) : MessageContent
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageTextContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageTextContent.kt
index 3256d8306f..001b9ff0dd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageTextContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageTextContent.kt
@@ -29,4 +29,4 @@ data class MessageTextContent(
@Json(name = "formatted_body") val formattedBody: String? = null,
@Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
@Json(name = "m.new_content") override val newContent: Content? = null
-) : MessageContent
\ No newline at end of file
+) : MessageContent
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt
index 7db3301898..8cef40f21a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageType.kt
@@ -30,4 +30,4 @@ object MessageType {
// 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"
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ThumbnailInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ThumbnailInfo.kt
index 1e308d79fa..0ef1b8f658 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ThumbnailInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/ThumbnailInfo.kt
@@ -40,4 +40,4 @@ data class ThumbnailInfo(
* The mimetype of the image, e.g. "image/jpeg".
*/
@Json(name = "mimetype") val mimeType: String
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/VideoInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/VideoInfo.kt
index 0622037896..a7d4708d33 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/VideoInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/VideoInfo.kt
@@ -61,4 +61,4 @@ data class VideoInfo(
* Information on the encrypted thumbnail file, as specified in End-to-end encryption. Only present if the thumbnail is encrypted.
*/
@Json(name = "thumbnail_file") val thumbnailFile: EncryptedFileInfo? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReactionInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReactionInfo.kt
index 72a30ec2e2..c4cbde98eb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReactionInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReactionInfo.kt
@@ -24,6 +24,6 @@ data class ReactionInfo(
@Json(name = "rel_type") override val type: String?,
@Json(name = "event_id") override val eventId: String,
val key: String,
- //always null for reaction
+ // always null for reaction
@Json(name = "m.in_reply_to") override val inReplyTo: ReplyToContent? = null
-) : RelationContent
\ No newline at end of file
+) : RelationContent
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationContent.kt
index 5f89a482d0..c66d1b9770 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationContent.kt
@@ -23,4 +23,4 @@ interface RelationContent {
val type: String?
val eventId: String?
val inReplyTo: ReplyToContent?
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationService.kt
index 0c4e1bebc1..5af5183dfa 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/RelationService.kt
@@ -21,6 +21,7 @@ import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.api.session.room.model.EventAnnotationsSummary
import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
import im.vector.matrix.android.api.util.Cancelable
+import im.vector.matrix.android.api.util.Optional
/**
* In some cases, events may wish to reference other events.
@@ -47,26 +48,21 @@ import im.vector.matrix.android.api.util.Cancelable
*/
interface RelationService {
-
/**
* Sends a reaction (emoji) to the targetedEvent.
- * @param reaction the reaction (preferably emoji)
* @param targetEventId the id of the event being reacted
+ * @param reaction the reaction (preferably emoji)
*/
- fun sendReaction(reaction: String,
- targetEventId: String): Cancelable
-
+ fun sendReaction(targetEventId: String,
+ reaction: String): Cancelable
/**
* Undo a reaction (emoji) to the targetedEvent.
- * @param reaction the reaction (preferably emoji)
* @param targetEventId the id of the event being reacted
- * @param myUserId used to know if a reaction event was made by the user
+ * @param reaction the reaction (preferably emoji)
*/
- fun undoReaction(reaction: String,
- targetEventId: String,
- myUserId: String)//: Cancelable
-
+ fun undoReaction(targetEventId: String,
+ reaction: String): Cancelable
/**
* Edit a text message body. Limited to "m.text" contentType
@@ -80,7 +76,6 @@ interface RelationService {
newBodyAutoMarkdown: Boolean,
compatibilityBodyText: String = "* $newBodyText"): Cancelable
-
/**
* Edit a reply. This is a special case because replies contains fallback text as a prefix.
* This method will take the new body (stripped from fallbacks) and re-add them before sending.
@@ -95,11 +90,10 @@ interface RelationService {
compatibilityBodyText: String = "* $newBodyText"): Cancelable
/**
- * Get's the edit history of the given event
+ * Get the edit history of the given event
*/
fun fetchEditHistory(eventId: String, callback: MatrixCallback>)
-
/**
* Reply to an event in the timeline (must be in same room)
* https://matrix.org/docs/spec/client_server/r0.4.0.html#id350
@@ -111,7 +105,5 @@ interface RelationService {
replyText: String,
autoMarkdown: Boolean = false): Cancelable?
- fun getEventSummaryLive(eventId: String): LiveData
-
-
-}
\ No newline at end of file
+ fun getEventSummaryLive(eventId: String): LiveData>
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTag.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTag.kt
index 0623e8d93c..9e85ba3255 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTag.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/tag/RoomTag.kt
@@ -27,5 +27,4 @@ data class RoomTag(
val ROOM_TAG_NO_TAG = "m.recent"
val ROOM_TAG_SERVER_NOTICE = "m.server_notice"
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/RoomDirectoryData.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/RoomDirectoryData.kt
index 11a347c0ee..e651500af1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/RoomDirectoryData.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/RoomDirectoryData.kt
@@ -51,5 +51,4 @@ data class RoomDirectoryData(
companion object {
const val DEFAULT_HOME_SERVER_NAME = "Matrix"
}
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocol.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocol.kt
index a31df79436..b066cff164 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocol.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocol.kt
@@ -59,4 +59,4 @@ data class ThirdPartyProtocol(
*/
@Json(name = "instances")
var instances: List? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt
index d2bea70051..50f92356fb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt
@@ -51,10 +51,9 @@ data class ThirdPartyProtocolInstance(
@Json(name = "instance_id")
var instanceId: String? = null,
-
/**
* FIXDOC Not documented on matrix.org doc
*/
@Json(name = "bot_user_id")
var botUserId: String? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/read/ReadService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/read/ReadService.kt
index d97fc497f0..c9bb6fbf9b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/read/ReadService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/read/ReadService.kt
@@ -19,6 +19,7 @@ package im.vector.matrix.android.api.session.room.read
import androidx.lifecycle.LiveData
import im.vector.matrix.android.api.MatrixCallback
import im.vector.matrix.android.api.session.room.model.ReadReceipt
+import im.vector.matrix.android.api.util.Optional
/**
* This interface defines methods to handle read receipts and read marker in a room. It's implemented at the room level.
@@ -40,7 +41,24 @@ interface ReadService {
*/
fun setReadMarker(fullyReadEventId: String, callback: MatrixCallback)
+ /**
+ * Check if an event is already read, ie. your read receipt is set on a more recent event.
+ */
fun isEventRead(eventId: String): Boolean
+ /**
+ * Returns a live read marker id for the room.
+ */
+ fun getReadMarkerLive(): LiveData>
+
+ /**
+ * Returns a live read receipt id for the room.
+ */
+ fun getMyReadReceiptLive(): LiveData>
+
+ /**
+ * Returns a live list of read receipts for a given event
+ * @param eventId: the event
+ */
fun getEventReadReceiptsLive(eventId: String): LiveData>
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/reporting/ReportingService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/reporting/ReportingService.kt
new file mode 100644
index 0000000000..71ce02ac69
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/reporting/ReportingService.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.api.session.room.reporting
+
+import im.vector.matrix.android.api.MatrixCallback
+import im.vector.matrix.android.api.util.Cancelable
+
+/**
+ * This interface defines methods to report content of an event.
+ */
+interface ReportingService {
+
+ /**
+ * Report content
+ * Ref: https://matrix.org/docs/spec/client_server/latest#post-matrix-client-r0-rooms-roomid-report-eventid
+ */
+ fun reportContent(eventId: String, score: Int, reason: String, callback: MatrixCallback): Cancelable
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/DraftService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/DraftService.kt
index c700b40a08..2324f1e221 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/DraftService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/DraftService.kt
@@ -35,5 +35,4 @@ interface DraftService {
* The draft list can contain one draft for {regular, reply, quote} and an arbitrary number of {edit} drafts
*/
fun getDraftsLive(): LiveData>
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendService.kt
index ae276adb73..8c783837a2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendService.kt
@@ -22,7 +22,6 @@ import im.vector.matrix.android.api.session.room.model.message.MessageType
import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
import im.vector.matrix.android.api.util.Cancelable
-
/**
* This interface defines methods to send events in a room. It's implemented at the room level.
*/
@@ -66,7 +65,6 @@ interface SendService {
*/
fun redactEvent(event: Event, reason: String?): Cancelable
-
/**
* Schedule this message to be resent
* @param localEcho the unsent local echo
@@ -79,7 +77,6 @@ interface SendService {
*/
fun resendMediaMessage(localEcho: TimelineEvent): Cancelable?
-
/**
* Remove this failed message from the timeline
* @param localEcho the unsent local echo
@@ -92,5 +89,4 @@ interface SendService {
* Resend all failed messages one by one (and keep order)
*/
fun resendAllFailedMessages()
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendState.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendState.kt
index aaa7020be6..cfe3c9ae1a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendState.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/SendState.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.api.session.room.send
-
enum class SendState {
UNKNOWN,
// the event has not been sent
@@ -46,7 +45,4 @@ enum class SendState {
fun hasFailed() = HAS_FAILED_STATES.contains(this)
fun isSending() = IS_SENDING_STATES.contains(this)
-
}
-
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/state/StateService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/state/StateService.kt
index 21aae95bdf..06f4a9c7ee 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/state/StateService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/state/StateService.kt
@@ -27,5 +27,4 @@ interface StateService {
fun updateTopic(topic: String, callback: MatrixCallback)
fun getStateEvent(eventType: String): Event?
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/Timeline.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/Timeline.kt
index 314c9f61b8..c03effd7ad 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/Timeline.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/Timeline.kt
@@ -32,6 +32,8 @@ interface Timeline {
var listener: Listener?
+ val isLive: Boolean
+
/**
* This should be called before any other method after creating the timeline. It ensures the underlying database is open
*/
@@ -42,6 +44,12 @@ interface Timeline {
*/
fun dispose()
+ /**
+ * This method restarts the timeline, erases all built events and pagination states.
+ * It then loads events around the eventId. If eventId is null, it does restart the live timeline.
+ */
+ fun restartWithEventId(eventId: String?)
+
/**
* Check if the timeline can be enriched by paginating.
* @param the direction to check in
@@ -56,9 +64,36 @@ interface Timeline {
*/
fun paginate(direction: Direction, count: Int)
- fun pendingEventCount() : Int
+ /**
+ * Returns the number of sending events
+ */
+ fun pendingEventCount(): Int
- fun failedToDeliverEventCount() : Int
+ /**
+ * Returns the number of failed sending events.
+ */
+ fun failedToDeliverEventCount(): Int
+
+ /**
+ * Returns the index of a built event or null.
+ */
+ fun getIndexOfEvent(eventId: String?): Int?
+
+ /**
+ * Returns the built [TimelineEvent] at index or null
+ */
+ fun getTimelineEventAtIndex(index: Int): TimelineEvent?
+
+ /**
+ * Returns the built [TimelineEvent] with eventId or null
+ */
+ fun getTimelineEventWithId(eventId: String?): TimelineEvent?
+
+ /**
+ * Returns the first displayable events starting from eventId.
+ * It does depend on the provided [TimelineSettings].
+ */
+ fun getFirstDisplayableEventId(eventId: String): String?
interface Listener {
/**
@@ -81,5 +116,4 @@ interface Timeline {
*/
BACKWARDS
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
index 73ef7b779a..43c1544ffd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
@@ -40,7 +40,8 @@ data class TimelineEvent(
val isUniqueDisplayName: Boolean,
val senderAvatar: String?,
val annotations: EventAnnotationsSummary? = null,
- val readReceipts: List = emptyList()
+ val readReceipts: List = emptyList(),
+ val hasReadMarker: Boolean = false
) {
val metadata = HashMap()
@@ -87,7 +88,6 @@ data class TimelineEvent(
}
}
-
/**
* Tells if the event has been edited
*/
@@ -106,7 +106,6 @@ fun TimelineEvent.getEditedEventId(): String? {
fun TimelineEvent.getLastMessageContent(): MessageContent? = annotations?.editSummary?.aggregatedContent?.toModel()
?: root.getClearContent().toModel()
-
/**
* Get last Message body, after a possible edition
*/
@@ -120,7 +119,6 @@ fun TimelineEvent.getLastMessageBody(): String? {
return null
}
-
fun TimelineEvent.getTextEditableContent(): String? {
val originalContent = root.getClearContent().toModel() ?: return null
val isReply = originalContent.isReply() || root.content.toModel()?.relatesTo?.inReplyTo?.eventId != null
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineService.kt
index fdf99bd22c..2b23ee40ca 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineService.kt
@@ -17,6 +17,7 @@
package im.vector.matrix.android.api.session.room.timeline
import androidx.lifecycle.LiveData
+import im.vector.matrix.android.api.util.Optional
/**
* This interface defines methods to interact with the timeline. It's implemented at the room level.
@@ -32,9 +33,7 @@ interface TimelineService {
*/
fun createTimeline(eventId: String?, settings: TimelineSettings): Timeline
-
fun getTimeLineEvent(eventId: String): TimelineEvent?
-
- fun liveTimeLineEvent(eventId: String): LiveData
-}
\ No newline at end of file
+ fun getTimeLineEventLive(eventId: String): LiveData>
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SecureStorageService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SecureStorageService.kt
index d56b6150ee..bae8132990 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SecureStorageService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/securestorage/SecureStorageService.kt
@@ -24,5 +24,4 @@ interface SecureStorageService {
fun securelyStoreObject(any: Any, keyAlias: String, outputStream: OutputStream)
fun loadSecureSecret(inputStream: InputStream, keyAlias: String): T?
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/signout/SignOutService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/signout/SignOutService.kt
index 11f7cd57f7..5a0638fb6e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/signout/SignOutService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/signout/SignOutService.kt
@@ -27,5 +27,4 @@ interface SignOutService {
* Sign out
*/
fun signOut(callback: MatrixCallback)
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/FilterService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/FilterService.kt
index 4a29013def..e995e775a9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/FilterService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/FilterService.kt
@@ -30,4 +30,4 @@ interface FilterService {
* Configure the filter for the sync
*/
fun setFilter(filterPreset: FilterPreset)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/SyncState.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/SyncState.kt
index 8c34e392b5..4db40b2c55 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/SyncState.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/SyncState.kt
@@ -23,4 +23,4 @@ sealed class SyncState {
object KILLING : SyncState()
object KILLED : SyncState()
object NO_NETWORK : SyncState()
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/UserService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/UserService.kt
index d3c58edd94..d3de777e34 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/UserService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/UserService.kt
@@ -21,6 +21,7 @@ import androidx.paging.PagedList
import im.vector.matrix.android.api.MatrixCallback
import im.vector.matrix.android.api.session.user.model.User
import im.vector.matrix.android.api.util.Cancelable
+import im.vector.matrix.android.api.util.Optional
/**
* This interface defines methods to get users. It's implemented at the session level.
@@ -47,9 +48,9 @@ interface UserService {
/**
* Observe a live user from a userId
* @param userId the userId to look for.
- * @return a Livedata of user with userId
+ * @return a LiveData of user with userId
*/
- fun liveUser(userId: String): LiveData
+ fun liveUser(userId: String): LiveData>
/**
* Observe a live list of users sorted alphabetically
@@ -63,5 +64,4 @@ interface UserService {
* @return a Livedata of users
*/
fun livePagedUsers(filter: String? = null): LiveData>
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/model/User.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/model/User.kt
index 50e76053bc..f569f5e47e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/model/User.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/user/model/User.kt
@@ -24,4 +24,4 @@ data class User(
val userId: String,
val displayName: String? = null,
val avatarUrl: String? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Cancelable.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Cancelable.kt
index d2573de455..7f3543dec2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Cancelable.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Cancelable.kt
@@ -26,7 +26,6 @@ interface Cancelable {
* The cancel method, it does nothing by default.
*/
fun cancel() {
- //no-op
+ // no-op
}
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/ContentUtils.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/ContentUtils.kt
index ad17d26b20..9131cf143b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/ContentUtils.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/ContentUtils.kt
@@ -15,7 +15,6 @@
*/
package im.vector.matrix.android.api.util
-
object ContentUtils {
fun extractUsefulTextFromReply(repliedBody: String): String {
val lines = repliedBody.lines()
@@ -39,9 +38,10 @@ object ContentUtils {
fun extractUsefulTextFromHtmlReply(repliedBody: String): String {
if (repliedBody.startsWith("")) {
val closingTagIndex = repliedBody.lastIndexOf("")
- if (closingTagIndex != -1)
+ if (closingTagIndex != -1) {
return repliedBody.substring(closingTagIndex + "".length).trim()
+ }
}
return repliedBody
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/MatrixCallbackDelegate.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/MatrixCallbackDelegate.kt
index 2b4e30a1e6..06b157daeb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/MatrixCallbackDelegate.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/MatrixCallbackDelegate.kt
@@ -21,4 +21,4 @@ import im.vector.matrix.android.api.MatrixCallback
/**
* Simple MatrixCallback implementation which delegate its calls to another callback
*/
-open class MatrixCallbackDelegate(private val callback: MatrixCallback) : MatrixCallback by callback
\ No newline at end of file
+open class MatrixCallbackDelegate(private val callback: MatrixCallback) : MatrixCallback by callback
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Optional.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Optional.kt
new file mode 100644
index 0000000000..2f602d0b84
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Optional.kt
@@ -0,0 +1,45 @@
+/*
+
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.api.util
+
+data class Optional constructor(private val value: T?) {
+
+ fun get(): T {
+ return value!!
+ }
+
+ fun getOrNull(): T? {
+ return value
+ }
+
+ fun getOrElse(fn: () -> T): T {
+ return value ?: fn()
+ }
+
+ fun hasValue(): Boolean {
+ return value != null
+ }
+
+ companion object {
+ fun from(value: T?): Optional {
+ return Optional(value)
+ }
+ }
+}
+
+fun T?.toOptional() = Optional(this)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Types.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Types.kt
index c2f710df1f..bfb9a59956 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Types.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/Types.kt
@@ -21,4 +21,4 @@ import java.lang.reflect.ParameterizedType
typealias JsonDict = Map
-internal val JSON_DICT_PARAMETERIZED_TYPE: ParameterizedType = Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java)
\ No newline at end of file
+internal val JSON_DICT_PARAMETERIZED_TYPE: ParameterizedType = Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt
index 21f16d3d03..c813a6813f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt
@@ -56,4 +56,4 @@ internal class SessionManager @Inject constructor(private val matrixComponent: M
.create(matrixComponent, sessionParams)
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthAPI.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthAPI.kt
index d42962c53e..bfc2b76db7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthAPI.kt
@@ -47,5 +47,4 @@ internal interface AuthAPI {
@Headers("CONNECT_TIMEOUT:60000", "READ_TIMEOUT:60000", "WRITE_TIMEOUT:60000")
@POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "login")
fun login(@Body loginParams: PasswordLoginParams): Call
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt
index 399605469d..31a85afbfb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt
@@ -55,11 +55,9 @@ internal abstract class AuthModule {
}
}
-
@Binds
abstract fun bindSessionParamsStore(sessionParamsStore: RealmSessionParamsStore): SessionParamsStore
@Binds
abstract fun bindAuthenticator(authenticator: DefaultAuthenticator): Authenticator
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt
index 949aa6611e..e379090677 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt
@@ -39,9 +39,10 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import okhttp3.OkHttpClient
import javax.inject.Inject
+import javax.inject.Provider
internal class DefaultAuthenticator @Inject constructor(@Unauthenticated
- private val okHttpClient: OkHttpClient,
+ private val okHttpClient: Provider,
private val retrofitFactory: RetrofitFactory,
private val coroutineDispatchers: MatrixCoroutineDispatchers,
private val sessionParamsStore: SessionParamsStore,
@@ -97,7 +98,6 @@ internal class DefaultAuthenticator @Inject constructor(@Unauthenticated
private suspend fun authenticate(homeServerConnectionConfig: HomeServerConnectionConfig,
login: String,
password: String) = withContext(coroutineDispatchers.io) {
-
val authAPI = buildAuthAPI(homeServerConnectionConfig)
val loginParams = if (Patterns.EMAIL_ADDRESS.matcher(login).matches()) {
PasswordLoginParams.thirdPartyIdentifier(ThreePidMedium.EMAIL, login, password, "Mobile")
@@ -119,9 +119,7 @@ internal class DefaultAuthenticator @Inject constructor(@Unauthenticated
}
private fun buildAuthAPI(homeServerConnectionConfig: HomeServerConnectionConfig): AuthAPI {
- val retrofit = retrofitFactory.create(okHttpClient, homeServerConnectionConfig.homeServerUri.toString())
+ val retrofit = retrofitFactory.create(okHttpClient.get(), homeServerConnectionConfig.homeServerUri.toString())
return retrofit.create(AuthAPI::class.java)
}
-
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt
index 9067e8188c..e1fef7e2eb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt
@@ -32,4 +32,4 @@ internal interface SessionParamsStore {
fun delete(userId: String): Try
fun deleteAll(): Try
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/InteractiveAuthenticationFlow.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/InteractiveAuthenticationFlow.kt
index e1f963ff3d..a6c027900f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/InteractiveAuthenticationFlow.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/InteractiveAuthenticationFlow.kt
@@ -38,4 +38,4 @@ data class InteractiveAuthenticationFlow(
const val TYPE_LOGIN_TOKEN = "m.login.token"
const val TYPE_LOGIN_PASSWORD = "m.login.password"
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt
index 78fd372beb..598506d0a7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt
@@ -23,4 +23,4 @@ import com.squareup.moshi.JsonClass
data class LoginFlowResponse(
@Json(name = "flows")
val flows: List
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowTypes.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowTypes.kt
index 1e129f1b45..81196c7414 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowTypes.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowTypes.kt
@@ -25,4 +25,4 @@ object LoginFlowTypes {
const val MSISDN = "m.login.msisdn"
const val RECAPTCHA = "m.login.recaptcha"
const val DUMMY = "m.login.dummy"
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginParams.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginParams.kt
index af859aeba4..e37977425a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginParams.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginParams.kt
@@ -18,4 +18,4 @@ package im.vector.matrix.android.internal.auth.data
internal interface LoginParams {
val type: String
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/PasswordLoginParams.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/PasswordLoginParams.kt
index 372b18a931..39b1dd8760 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/PasswordLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/PasswordLoginParams.kt
@@ -26,7 +26,6 @@ internal data class PasswordLoginParams(@Json(name = "identifier") val identifie
@Json(name = "initial_device_display_name") val deviceDisplayName: String?,
@Json(name = "device_id") val deviceId: String?) : LoginParams {
-
companion object {
val IDENTIFIER_KEY_TYPE_USER = "m.id.user"
@@ -40,7 +39,6 @@ internal data class PasswordLoginParams(@Json(name = "identifier") val identifie
val IDENTIFIER_KEY_COUNTRY = "country"
val IDENTIFIER_KEY_NUMBER = "number"
-
fun userIdentifier(user: String,
password: String,
deviceDisplayName: String? = null,
@@ -49,7 +47,6 @@ internal data class PasswordLoginParams(@Json(name = "identifier") val identifie
identifier[IDENTIFIER_KEY_TYPE] = IDENTIFIER_KEY_TYPE_USER
identifier[IDENTIFIER_KEY_USER] = user
return PasswordLoginParams(identifier, password, LoginFlowTypes.PASSWORD, deviceDisplayName, deviceId)
-
}
fun thirdPartyIdentifier(medium: String,
@@ -62,7 +59,6 @@ internal data class PasswordLoginParams(@Json(name = "identifier") val identifie
identifier[IDENTIFIER_KEY_MEDIUM] = medium
identifier[IDENTIFIER_KEY_ADDRESS] = address
return PasswordLoginParams(identifier, password, LoginFlowTypes.PASSWORD, deviceDisplayName, deviceId)
-
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/ThreePidMedium.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/ThreePidMedium.kt
index bf16544972..b1aeb9370b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/ThreePidMedium.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/ThreePidMedium.kt
@@ -19,4 +19,4 @@ package im.vector.matrix.android.internal.auth.data
internal object ThreePidMedium {
const val EMAIL = "email"
const val MSISDN = "msisdn"
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt
index 38771c91b3..7ec5d24559 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt
@@ -99,5 +99,4 @@ internal class RealmSessionParamsStore @Inject constructor(private val mapper: S
realm.close()
}
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsEntity.kt
index e6569d28ea..d0cc41d1ac 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsEntity.kt
@@ -23,4 +23,4 @@ internal open class SessionParamsEntity(
@PrimaryKey var userId: String = "",
var credentialsJson: String = "",
var homeServerConnectionConfigJson: String = ""
-) : RealmObject()
\ No newline at end of file
+) : RealmObject()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt
index 36a03ab19a..8e64e86582 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt
@@ -50,6 +50,4 @@ internal class SessionParamsMapper @Inject constructor(moshi: Moshi) {
}
return SessionParamsEntity(sessionParams.credentials.userId, credentialsJson, homeServerConnectionConfigJson)
}
-
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationFlowResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationFlowResponse.kt
index 0eb7b05bf8..218251cfe5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationFlowResponse.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/RegistrationFlowResponse.kt
@@ -50,4 +50,4 @@ data class RegistrationFlowResponse(
*/
@Json(name = "params")
var params: JsonDict? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt
index 742e3ff21a..5a7e28b70f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt
@@ -74,7 +74,6 @@ internal abstract class CryptoModule {
return RealmClearCacheTask(realmConfiguration)
}
-
@JvmStatic
@Provides
fun providesCryptoStore(@CryptoDatabase
@@ -104,7 +103,6 @@ internal abstract class CryptoModule {
fun providesCryptoConfig(): MXCryptoConfig {
return MXCryptoConfig()
}
-
}
@Binds
@@ -117,13 +115,13 @@ internal abstract class CryptoModule {
abstract fun bindGetDevicesTask(getDevicesTask: DefaultGetDevicesTask): GetDevicesTask
@Binds
- abstract fun bindSetDeviceNameTask(getDevicesTask: DefaultSetDeviceNameTask): SetDeviceNameTask
+ abstract fun bindSetDeviceNameTask(setDeviceNameTask: DefaultSetDeviceNameTask): SetDeviceNameTask
@Binds
- abstract fun bindUploadKeysTask(getDevicesTask: DefaultUploadKeysTask): UploadKeysTask
+ abstract fun bindUploadKeysTask(uploadKeysTask: DefaultUploadKeysTask): UploadKeysTask
@Binds
- abstract fun bindDownloadKeysForUsersTask(downloadKeysForUsers: DefaultDownloadKeysForUsers): DownloadKeysForUsersTask
+ abstract fun bindDownloadKeysForUsersTask(downloadKeysForUsersTask: DefaultDownloadKeysForUsers): DownloadKeysForUsersTask
@Binds
abstract fun bindCreateKeysBackupVersionTask(createKeysBackupVersionTask: DefaultCreateKeysBackupVersionTask): CreateKeysBackupVersionTask
@@ -135,10 +133,10 @@ internal abstract class CryptoModule {
abstract fun bindDeleteRoomSessionDataTask(deleteRoomSessionDataTask: DefaultDeleteRoomSessionDataTask): DeleteRoomSessionDataTask
@Binds
- abstract fun bindDeleteRoomSessionsDataTask(deleteRoomSessionDataTask: DefaultDeleteRoomSessionsDataTask): DeleteRoomSessionsDataTask
+ abstract fun bindDeleteRoomSessionsDataTask(deleteRoomSessionsDataTask: DefaultDeleteRoomSessionsDataTask): DeleteRoomSessionsDataTask
@Binds
- abstract fun bindDeleteSessionsDataTask(deleteRoomSessionDataTask: DefaultDeleteSessionsDataTask): DeleteSessionsDataTask
+ abstract fun bindDeleteSessionsDataTask(deleteSessionsDataTask: DefaultDeleteSessionsDataTask): DeleteSessionsDataTask
@Binds
abstract fun bindGetKeysBackupLastVersionTask(getKeysBackupLastVersionTask: DefaultGetKeysBackupLastVersionTask): GetKeysBackupLastVersionTask
@@ -150,19 +148,19 @@ internal abstract class CryptoModule {
abstract fun bindGetRoomSessionDataTask(getRoomSessionDataTask: DefaultGetRoomSessionDataTask): GetRoomSessionDataTask
@Binds
- abstract fun bindGetRoomSessionsDataTask(getRoomSessionDataTask: DefaultGetRoomSessionsDataTask): GetRoomSessionsDataTask
+ abstract fun bindGetRoomSessionsDataTask(getRoomSessionsDataTask: DefaultGetRoomSessionsDataTask): GetRoomSessionsDataTask
@Binds
- abstract fun bindGetSessionsDataTask(getRoomSessionDataTask: DefaultGetSessionsDataTask): GetSessionsDataTask
+ abstract fun bindGetSessionsDataTask(getSessionsDataTask: DefaultGetSessionsDataTask): GetSessionsDataTask
@Binds
abstract fun bindStoreRoomSessionDataTask(storeRoomSessionDataTask: DefaultStoreRoomSessionDataTask): StoreRoomSessionDataTask
@Binds
- abstract fun bindStoreRoomSessionsDataTask(storeRoomSessionDataTask: DefaultStoreRoomSessionsDataTask): StoreRoomSessionsDataTask
+ abstract fun bindStoreRoomSessionsDataTask(storeRoomSessionsDataTask: DefaultStoreRoomSessionsDataTask): StoreRoomSessionsDataTask
@Binds
- abstract fun bindStoreSessionsDataTask(storeRoomSessionDataTask: DefaultStoreSessionsDataTask): StoreSessionsDataTask
+ abstract fun bindStoreSessionsDataTask(storeSessionsDataTask: DefaultStoreSessionsDataTask): StoreSessionsDataTask
@Binds
abstract fun bindUpdateKeysBackupVersionTask(updateKeysBackupVersionTask: DefaultUpdateKeysBackupVersionTask): UpdateKeysBackupVersionTask
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt
index 1a94bebde4..cf5506a443 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt
@@ -21,7 +21,6 @@ package im.vector.matrix.android.internal.crypto
import android.content.Context
import android.os.Handler
import android.os.Looper
-import arrow.core.Try
import com.squareup.moshi.Types
import com.zhuinden.monarchy.Monarchy
import dagger.Lazy
@@ -31,9 +30,7 @@ import im.vector.matrix.android.api.failure.Failure
import im.vector.matrix.android.api.listeners.ProgressListener
import im.vector.matrix.android.api.session.crypto.CryptoService
import im.vector.matrix.android.api.session.crypto.MXCryptoError
-import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
import im.vector.matrix.android.api.session.crypto.keyshare.RoomKeysRequestListener
-import im.vector.matrix.android.api.session.crypto.sas.SasVerificationService
import im.vector.matrix.android.api.session.events.model.Content
import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.api.session.events.model.EventType
@@ -289,24 +286,18 @@ internal class DefaultCryptoService @Inject constructor(
outgoingRoomKeyRequestManager.stop()
}
- override fun isCryptoEnabled(): Boolean {
- // TODO Check that this test is correct
- return olmDevice != null
- }
+ // Aways enabled on RiotX
+ override fun isCryptoEnabled() = true
/**
* @return the Keys backup Service
*/
- override fun getKeysBackupService(): KeysBackupService {
- return keysBackup
- }
+ override fun getKeysBackupService() = keysBackup
/**
* @return the SasVerificationService
*/
- override fun getSasVerificationService(): SasVerificationService {
- return sasVerificationService
- }
+ override fun getSasVerificationService() = sasVerificationService
/**
* A sync response has been received
@@ -367,29 +358,16 @@ internal class DefaultCryptoService @Inject constructor(
*/
override fun setDevicesKnown(devices: List, callback: MatrixCallback?) {
// build a devices map
- val devicesIdListByUserId = HashMap>()
+ val devicesIdListByUserId = devices.groupBy({ it.userId }, { it.deviceId })
- for (di in devices) {
- var deviceIdsList: MutableList? = devicesIdListByUserId[di.userId]?.toMutableList()
-
- if (null == deviceIdsList) {
- deviceIdsList = ArrayList()
- devicesIdListByUserId[di.userId] = deviceIdsList
- }
- deviceIdsList.add(di.deviceId)
- }
-
- val userIds = devicesIdListByUserId.keys
-
- for (userId in userIds) {
+ for ((userId, deviceIds) in devicesIdListByUserId) {
val storedDeviceIDs = cryptoStore.getUserDevices(userId)
// sanity checks
if (null != storedDeviceIDs) {
var isUpdated = false
- val deviceIds = devicesIdListByUserId[userId]
- deviceIds?.forEach { deviceId ->
+ deviceIds.forEach { deviceId ->
val device = storedDeviceIDs[deviceId]
// assume if the device is either verified or blocked
@@ -406,7 +384,6 @@ internal class DefaultCryptoService @Inject constructor(
}
}
-
callback?.onSuccess(Unit)
}
@@ -446,7 +423,7 @@ internal class DefaultCryptoService @Inject constructor(
val encryptingClass = MXCryptoAlgorithms.hasEncryptorClassForAlgorithm(algorithm)
if (!encryptingClass) {
- Timber.e("## setEncryptionInRoom() : Unable to encrypt room ${roomId} with $algorithm")
+ Timber.e("## setEncryptionInRoom() : Unable to encrypt room $roomId with $algorithm")
return false
}
@@ -558,16 +535,10 @@ internal class DefaultCryptoService @Inject constructor(
val t0 = System.currentTimeMillis()
Timber.v("## encryptEventContent() starts")
runCatching {
- safeAlgorithm.encryptEventContent(eventContent, eventType, userIds)
- }
- .fold(
- {
- Timber.v("## encryptEventContent() : succeeds after ${System.currentTimeMillis() - t0} ms")
- callback.onSuccess(MXEncryptEventContentResult(it, EventType.ENCRYPTED))
- },
- { callback.onFailure(it) }
-
- )
+ val content = safeAlgorithm.encryptEventContent(eventContent, eventType, userIds)
+ Timber.v("## encryptEventContent() : succeeds after ${System.currentTimeMillis() - t0} ms")
+ MXEncryptEventContentResult(content, EventType.ENCRYPTED)
+ }.foldToCallback(callback)
} else {
val algorithm = getEncryptionAlgorithm(roomId)
val reason = String.format(MXCryptoError.UNABLE_TO_ENCRYPT_REASON,
@@ -659,7 +630,7 @@ internal class DefaultCryptoService @Inject constructor(
incomingRoomKeyRequestManager.onRoomKeyRequestEvent(event)
}
else -> {
- //ignore
+ // ignore
}
}
}
@@ -714,7 +685,6 @@ internal class DefaultCryptoService @Inject constructor(
} else {
RoomMembers(realm, roomId).getJoinedRoomMemberIds()
}
-
}
return userIds
}
@@ -761,7 +731,6 @@ internal class DefaultCryptoService @Inject constructor(
}
}
-
/**
* Upload my user's device keys.
*/
@@ -787,7 +756,7 @@ internal class DefaultCryptoService @Inject constructor(
GlobalScope.launch(coroutineDispatchers.main) {
runCatching {
exportRoomKeys(password, MXMegolmExportEncryption.DEFAULT_ITERATION_COUNT)
- }.fold(callback::onSuccess, callback::onFailure)
+ }.foldToCallback(callback)
}
}
@@ -796,7 +765,6 @@ internal class DefaultCryptoService @Inject constructor(
*
* @param password the password
* @param anIterationCount the encryption iteration count (0 means no encryption)
- * @param callback the exported keys
*/
private suspend fun exportRoomKeys(password: String, anIterationCount: Int): ByteArray {
return withContext(coroutineDispatchers.crypto) {
@@ -824,8 +792,8 @@ internal class DefaultCryptoService @Inject constructor(
progressListener: ProgressListener?,
callback: MatrixCallback) {
GlobalScope.launch(coroutineDispatchers.main) {
- withContext(coroutineDispatchers.crypto) {
- Try {
+ runCatching {
+ withContext(coroutineDispatchers.crypto) {
Timber.v("## importRoomKeys starts")
val t0 = System.currentTimeMillis()
@@ -872,19 +840,14 @@ internal class DefaultCryptoService @Inject constructor(
fun checkUnknownDevices(userIds: List, callback: MatrixCallback) {
// force the refresh to ensure that the devices list is up-to-date
GlobalScope.launch(coroutineDispatchers.crypto) {
- runCatching { deviceListManager.downloadKeys(userIds, true) }
- .fold(
- {
- val unknownDevices = getUnknownDevices(it)
- if (unknownDevices.map.isEmpty()) {
- callback.onSuccess(Unit)
- } else {
- // trigger an an unknown devices exception
- callback.onFailure(Failure.CryptoError(MXCryptoError.UnknownDevice(unknownDevices)))
- }
- },
- { callback.onFailure(it) }
- )
+ runCatching {
+ val keys = deviceListManager.downloadKeys(userIds, true)
+ val unknownDevices = getUnknownDevices(keys)
+ if (unknownDevices.map.isNotEmpty()) {
+ // trigger an an unknown devices exception
+ throw Failure.CryptoError(MXCryptoError.UnknownDevice(unknownDevices))
+ }
+ }.foldToCallback(callback)
}
}
@@ -945,7 +908,6 @@ internal class DefaultCryptoService @Inject constructor(
cryptoStore.setRoomsListBlacklistUnverifiedDevices(roomIds)
}
-
/**
* Add this room to the ones which don't encrypt messages to unverified devices.
*
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt
index e7cfdfe1a8..7f2a23e4c2 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt
@@ -17,7 +17,6 @@
package im.vector.matrix.android.internal.crypto
-import android.text.TextUtils
import im.vector.matrix.android.api.MatrixPatterns
import im.vector.matrix.android.api.auth.data.Credentials
import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
@@ -27,7 +26,6 @@ import im.vector.matrix.android.internal.crypto.tasks.DownloadKeysForUsersTask
import im.vector.matrix.android.internal.session.SessionScope
import im.vector.matrix.android.internal.session.sync.SyncTokenStore
import timber.log.Timber
-import java.util.*
import javax.inject.Inject
// Legacy name: MXDeviceList
@@ -39,13 +37,12 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
private val downloadKeysForUsersTask: DownloadKeysForUsersTask) {
// HS not ready for retry
- private val notReadyToRetryHS = HashSet()
+ private val notReadyToRetryHS = mutableSetOf()
init {
var isUpdated = false
val deviceTrackingStatuses = cryptoStore.getDeviceTrackingStatuses().toMutableMap()
- for (userId in deviceTrackingStatuses.keys) {
- val status = deviceTrackingStatuses[userId]!!
+ for ((userId, status) in deviceTrackingStatuses) {
if (TRACKING_STATUS_DOWNLOAD_IN_PROGRESS == status || TRACKING_STATUS_UNREACHABLE_SERVER == status) {
// if a download was in progress when we got shut down, it isn't any more.
deviceTrackingStatuses[userId] = TRACKING_STATUS_PENDING_DOWNLOAD
@@ -66,7 +63,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
private fun canRetryKeysDownload(userId: String): Boolean {
var res = false
- if (!TextUtils.isEmpty(userId) && userId.contains(":")) {
+ if (':' in userId) {
try {
synchronized(notReadyToRetryHS) {
res = !notReadyToRetryHS.contains(userId.substring(userId.lastIndexOf(":") + 1))
@@ -74,7 +71,6 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
} catch (e: Exception) {
Timber.e(e, "## canRetryKeysDownload() failed")
}
-
}
return res
@@ -120,27 +116,23 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
* @param changed the user ids list which have new devices
* @param left the user ids list which left a room
*/
- fun handleDeviceListsChanges(changed: List?, left: List?) {
+ fun handleDeviceListsChanges(changed: Collection, left: Collection) {
var isUpdated = false
val deviceTrackingStatuses = cryptoStore.getDeviceTrackingStatuses().toMutableMap()
- if (changed?.isNotEmpty() == true) {
- for (userId in changed) {
- if (deviceTrackingStatuses.containsKey(userId)) {
- Timber.v("## invalidateUserDeviceList() : Marking device list outdated for $userId")
- deviceTrackingStatuses[userId] = TRACKING_STATUS_PENDING_DOWNLOAD
- isUpdated = true
- }
+ for (userId in changed) {
+ if (deviceTrackingStatuses.containsKey(userId)) {
+ Timber.v("## invalidateUserDeviceList() : Marking device list outdated for $userId")
+ deviceTrackingStatuses[userId] = TRACKING_STATUS_PENDING_DOWNLOAD
+ isUpdated = true
}
}
- if (left?.isNotEmpty() == true) {
- for (userId in left) {
- if (deviceTrackingStatuses.containsKey(userId)) {
- Timber.v("## invalidateUserDeviceList() : No longer tracking device list for $userId")
- deviceTrackingStatuses[userId] = TRACKING_STATUS_NOT_TRACKED
- isUpdated = true
- }
+ for (userId in left) {
+ if (deviceTrackingStatuses.containsKey(userId)) {
+ Timber.v("## invalidateUserDeviceList() : No longer tracking device list for $userId")
+ deviceTrackingStatuses[userId] = TRACKING_STATUS_NOT_TRACKED
+ isUpdated = true
}
}
@@ -154,7 +146,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
* + update
*/
fun invalidateAllDeviceLists() {
- handleDeviceListsChanges(ArrayList(cryptoStore.getDeviceTrackingStatuses().keys), null)
+ handleDeviceListsChanges(cryptoStore.getDeviceTrackingStatuses().keys, emptyList())
}
/**
@@ -164,9 +156,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
*/
private fun onKeysDownloadFailed(userIds: List) {
val deviceTrackingStatuses = cryptoStore.getDeviceTrackingStatuses().toMutableMap()
- for (userId in userIds) {
- deviceTrackingStatuses[userId] = TRACKING_STATUS_PENDING_DOWNLOAD
- }
+ userIds.associateWithTo(deviceTrackingStatuses) { TRACKING_STATUS_PENDING_DOWNLOAD }
cryptoStore.saveDeviceTrackingStatuses(deviceTrackingStatuses)
}
@@ -178,21 +168,15 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
*/
private fun onKeysDownloadSucceed(userIds: List, failures: Map>?): MXUsersDevicesMap {
if (failures != null) {
- val keys = failures.keys
- for (k in keys) {
- val value = failures[k]
- if (value!!.containsKey("status")) {
- val statusCodeAsVoid = value["status"]
- var statusCode = 0
- if (statusCodeAsVoid is Double) {
- statusCode = statusCodeAsVoid.toInt()
- } else if (statusCodeAsVoid is Int) {
- statusCode = statusCodeAsVoid.toInt()
- }
- if (statusCode == 503) {
- synchronized(notReadyToRetryHS) {
- notReadyToRetryHS.add(k)
- }
+ for ((k, value) in failures) {
+ val statusCode = when (val status = value["status"]) {
+ is Double -> status.toInt()
+ is Int -> status.toInt()
+ else -> 0
+ }
+ if (statusCode == 503) {
+ synchronized(notReadyToRetryHS) {
+ notReadyToRetryHS.add(k)
}
}
}
@@ -229,11 +213,9 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
/**
* Download the device keys for a list of users and stores the keys in the MXStore.
* It must be called in getEncryptingThreadHandler() thread.
- * The callback is called in the UI thread.
*
* @param userIds The users to fetch.
* @param forceDownload Always download the keys even if cached.
- * @param callback the asynchronous callback
*/
suspend fun downloadKeys(userIds: List?, forceDownload: Boolean): MXUsersDevicesMap {
Timber.v("## downloadKeys() : forceDownload $forceDownload : $userIds")
@@ -271,7 +253,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
Timber.v("## downloadKeys() : starts")
val t0 = System.currentTimeMillis()
val result = doKeyDownloadForUsers(downloadUsers)
- Timber.v("## downloadKeys() : doKeyDownloadForUsers succeeds after " + (System.currentTimeMillis() - t0) + " ms")
+ Timber.v("## downloadKeys() : doKeyDownloadForUsers succeeds after ${System.currentTimeMillis() - t0} ms")
result.also {
it.addEntriesFromMap(stored)
}
@@ -304,16 +286,14 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
val devices = response.deviceKeys?.get(userId)
Timber.v("## doKeyDownloadForUsers() : Got keys for $userId : $devices")
if (devices != null) {
- val mutableDevices = HashMap(devices)
- val deviceIds = ArrayList(mutableDevices.keys)
- for (deviceId in deviceIds) {
+ val mutableDevices = devices.toMutableMap()
+ for ((deviceId, deviceInfo) in devices) {
// Get the potential previously store device keys for this device
val previouslyStoredDeviceKeys = cryptoStore.getUserDevice(deviceId, userId)
- val deviceInfo = mutableDevices[deviceId]
// in some race conditions (like unit tests)
// the self device must be seen as verified
- if (TextUtils.equals(deviceInfo!!.deviceId, credentials.deviceId) && TextUtils.equals(userId, credentials.userId)) {
+ if (deviceInfo.deviceId == credentials.deviceId && userId == credentials.userId) {
deviceInfo.verified = MXDeviceInfo.DEVICE_VERIFICATION_VERIFIED
}
// Validate received keys
@@ -366,13 +346,13 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
}
// Check that the user_id and device_id in the received deviceKeys are correct
- if (!TextUtils.equals(deviceKeys.userId, userId)) {
- Timber.e("## validateDeviceKeys() : Mismatched user_id " + deviceKeys.userId + " from " + userId + ":" + deviceId)
+ if (deviceKeys.userId != userId) {
+ Timber.e("## validateDeviceKeys() : Mismatched user_id ${deviceKeys.userId} from $userId:$deviceId")
return false
}
- if (!TextUtils.equals(deviceKeys.deviceId, deviceId)) {
- Timber.e("## validateDeviceKeys() : Mismatched device_id " + deviceKeys.deviceId + " from " + userId + ":" + deviceId)
+ if (deviceKeys.deviceId != deviceId) {
+ Timber.e("## validateDeviceKeys() : Mismatched device_id ${deviceKeys.deviceId} from $userId:$deviceId")
return false
}
@@ -380,21 +360,21 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
val signKey = deviceKeys.keys?.get(signKeyId)
if (null == signKey) {
- Timber.e("## validateDeviceKeys() : Device " + userId + ":" + deviceKeys.deviceId + " has no ed25519 key")
+ Timber.e("## validateDeviceKeys() : Device $userId:${deviceKeys.deviceId} has no ed25519 key")
return false
}
val signatureMap = deviceKeys.signatures?.get(userId)
if (null == signatureMap) {
- Timber.e("## validateDeviceKeys() : Device " + userId + ":" + deviceKeys.deviceId + " has no map for " + userId)
+ Timber.e("## validateDeviceKeys() : Device $userId:${deviceKeys.deviceId} has no map for $userId")
return false
}
val signature = signatureMap[signKeyId]
if (null == signature) {
- Timber.e("## validateDeviceKeys() : Device " + userId + ":" + deviceKeys.deviceId + " is not signed")
+ Timber.e("## validateDeviceKeys() : Device $userId:${deviceKeys.deviceId} is not signed")
return false
}
@@ -415,7 +395,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
}
if (null != previouslyStoredDeviceKeys) {
- if (!TextUtils.equals(previouslyStoredDeviceKeys.fingerprint(), signKey)) {
+ if (previouslyStoredDeviceKeys.fingerprint() != signKey) {
// This should only happen if the list has been MITMed; we are
// best off sticking with the original keys.
//
@@ -425,7 +405,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
+ previouslyStoredDeviceKeys.fingerprint() + " -> " + signKey)
Timber.e("## validateDeviceKeys() : $previouslyStoredDeviceKeys -> $deviceKeys")
- Timber.e("## validateDeviceKeys() : " + previouslyStoredDeviceKeys.keys + " -> " + deviceKeys.keys)
+ Timber.e("## validateDeviceKeys() : ${previouslyStoredDeviceKeys.keys} -> ${deviceKeys.keys}")
return false
}
@@ -439,27 +419,18 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
* This method must be called on getEncryptingThreadHandler() thread.
*/
suspend fun refreshOutdatedDeviceLists() {
- val users = ArrayList()
-
val deviceTrackingStatuses = cryptoStore.getDeviceTrackingStatuses().toMutableMap()
- for (userId in deviceTrackingStatuses.keys) {
- if (TRACKING_STATUS_PENDING_DOWNLOAD == deviceTrackingStatuses[userId]) {
- users.add(userId)
- }
+ val users = deviceTrackingStatuses.keys.filterTo(mutableListOf()) { userId ->
+ TRACKING_STATUS_PENDING_DOWNLOAD == deviceTrackingStatuses[userId]
}
- if (users.size == 0) {
+ if (users.isEmpty()) {
return
}
// update the statuses
- for (userId in users) {
- val status = deviceTrackingStatuses[userId]
- if (null != status && TRACKING_STATUS_PENDING_DOWNLOAD == status) {
- deviceTrackingStatuses.put(userId, TRACKING_STATUS_DOWNLOAD_IN_PROGRESS)
- }
- }
+ users.associateWithTo(deviceTrackingStatuses) { TRACKING_STATUS_DOWNLOAD_IN_PROGRESS }
cryptoStore.saveDeviceTrackingStatuses(deviceTrackingStatuses)
runCatching {
@@ -506,4 +477,4 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
const val TRACKING_STATUS_UP_TO_DATE = 3
const val TRACKING_STATUS_UNREACHABLE_SERVER = 4
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequest.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequest.kt
index 056d99425e..fe1f69f904 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequest.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequest.kt
@@ -17,7 +17,6 @@
package im.vector.matrix.android.internal.crypto
-
import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.api.session.events.model.toModel
import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
@@ -77,4 +76,3 @@ open class IncomingRoomKeyRequest {
*/
constructor()
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequestManager.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequestManager.kt
index 86f7813083..3c8d70f2f1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingRoomKeyRequestManager.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.internal.crypto
-import android.text.TextUtils
import im.vector.matrix.android.api.auth.data.Credentials
import im.vector.matrix.android.api.session.crypto.keyshare.RoomKeysRequestListener
import im.vector.matrix.android.api.session.events.model.Event
@@ -25,7 +24,6 @@ import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyShare
import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
import im.vector.matrix.android.internal.session.SessionScope
import timber.log.Timber
-import java.util.*
import javax.inject.Inject
import kotlin.collections.ArrayList
@@ -35,7 +33,6 @@ internal class IncomingRoomKeyRequestManager @Inject constructor(
private val cryptoStore: IMXCryptoStore,
private val roomDecryptorProvider: RoomDecryptorProvider) {
-
// list of IncomingRoomKeyRequests/IncomingRoomKeyRequestCancellations
// we received in the current sync.
private val receivedRoomKeyRequests = ArrayList()
@@ -59,7 +56,7 @@ internal class IncomingRoomKeyRequestManager @Inject constructor(
when (roomKeyShare?.action) {
RoomKeyShare.ACTION_SHARE_REQUEST -> receivedRoomKeyRequests.add(IncomingRoomKeyRequest(event))
RoomKeyShare.ACTION_SHARE_CANCELLATION -> receivedRoomKeyRequestCancellations.add(IncomingRoomKeyRequestCancellation(event))
- else -> Timber.e("## onRoomKeyRequestEvent() : unsupported action " + roomKeyShare?.action)
+ else -> Timber.e("## onRoomKeyRequestEvent() : unsupported action ${roomKeyShare?.action}")
}
}
@@ -69,7 +66,7 @@ internal class IncomingRoomKeyRequestManager @Inject constructor(
* It must be called on CryptoThread
*/
fun processReceivedRoomKeyRequests() {
- val roomKeyRequestsToProcess = ArrayList(receivedRoomKeyRequests)
+ val roomKeyRequestsToProcess = receivedRoomKeyRequests.toList()
receivedRoomKeyRequests.clear()
for (request in roomKeyRequestsToProcess) {
val userId = request.userId
@@ -78,7 +75,7 @@ internal class IncomingRoomKeyRequestManager @Inject constructor(
val roomId = body!!.roomId
val alg = body.algorithm
- Timber.v("m.room_key_request from " + userId + ":" + deviceId + " for " + roomId + " / " + body.sessionId + " id " + request.requestId)
+ Timber.v("m.room_key_request from $userId:$deviceId for $roomId / ${body.sessionId} id ${request.requestId}")
if (userId == null || credentials.userId != userId) {
// TODO: determine if we sent this device the keys already: in
Timber.e("## processReceivedRoomKeyRequests() : Ignoring room key request from other user for now")
@@ -93,12 +90,12 @@ internal class IncomingRoomKeyRequestManager @Inject constructor(
continue
}
if (!decryptor.hasKeysForKeyRequest(request)) {
- Timber.e("## processReceivedRoomKeyRequests() : room key request for unknown session " + body.sessionId!!)
+ Timber.e("## processReceivedRoomKeyRequests() : room key request for unknown session ${body.sessionId!!}")
cryptoStore.deleteIncomingRoomKeyRequest(request)
continue
}
- if (TextUtils.equals(deviceId, credentials.deviceId) && TextUtils.equals(credentials.userId, userId)) {
+ if (credentials.deviceId == deviceId && credentials.userId == userId) {
Timber.v("## processReceivedRoomKeyRequests() : oneself device - ignored")
cryptoStore.deleteIncomingRoomKeyRequest(request)
continue
@@ -133,7 +130,7 @@ internal class IncomingRoomKeyRequestManager @Inject constructor(
var receivedRoomKeyRequestCancellations: List? = null
synchronized(this.receivedRoomKeyRequestCancellations) {
- if (!this.receivedRoomKeyRequestCancellations.isEmpty()) {
+ if (this.receivedRoomKeyRequestCancellations.isNotEmpty()) {
receivedRoomKeyRequestCancellations = this.receivedRoomKeyRequestCancellations.toList()
this.receivedRoomKeyRequestCancellations.clear()
}
@@ -166,12 +163,10 @@ internal class IncomingRoomKeyRequestManager @Inject constructor(
} catch (e: Exception) {
Timber.e(e, "## onRoomKeyRequest() failed")
}
-
}
}
}
-
/**
* A room key request cancellation has been received.
*
@@ -185,7 +180,6 @@ internal class IncomingRoomKeyRequestManager @Inject constructor(
} catch (e: Exception) {
Timber.e(e, "## onRoomKeyRequestCancellation() failed")
}
-
}
}
}
@@ -201,5 +195,4 @@ internal class IncomingRoomKeyRequestManager @Inject constructor(
roomKeysRequestListeners.remove(listener)
}
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXCryptoAlgorithms.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXCryptoAlgorithms.kt
index 8f42c422df..92b6adabc5 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXCryptoAlgorithms.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXCryptoAlgorithms.kt
@@ -55,4 +55,4 @@ internal object MXCryptoAlgorithms {
fun supportedAlgorithms(): List {
return listOf(MXCRYPTO_ALGORITHM_MEGOLM, MXCRYPTO_ALGORITHM_OLM)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXMegolmExportEncryption.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXMegolmExportEncryption.kt
index b9cb59a0f5..0aa7a15ce2 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXMegolmExportEncryption.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXMegolmExportEncryption.kt
@@ -16,20 +16,19 @@
package im.vector.matrix.android.internal.crypto
-import android.text.TextUtils
import android.util.Base64
import im.vector.matrix.android.internal.extensions.toUnsignedInt
import timber.log.Timber
import java.io.ByteArrayOutputStream
import java.nio.charset.Charset
import java.security.SecureRandom
-import java.util.*
import javax.crypto.Cipher
import javax.crypto.Mac
import javax.crypto.spec.IvParameterSpec
import javax.crypto.spec.SecretKeySpec
import kotlin.experimental.and
import kotlin.experimental.xor
+import kotlin.math.min
/**
* Utility class to import/export the crypto data
@@ -51,7 +50,7 @@ object MXMegolmExportEncryption {
* @return the AES key
*/
private fun getAesKey(keyBits: ByteArray): ByteArray {
- return Arrays.copyOfRange(keyBits, 0, 32)
+ return keyBits.copyOfRange(0, 32)
}
/**
@@ -61,7 +60,7 @@ object MXMegolmExportEncryption {
* @return the Hmac key.
*/
private fun getHmacKey(keyBits: ByteArray): ByteArray {
- return Arrays.copyOfRange(keyBits, 32, keyBits.size)
+ return keyBits.copyOfRange(32, keyBits.size)
}
/**
@@ -77,7 +76,7 @@ object MXMegolmExportEncryption {
val body = unpackMegolmKeyFile(data)
// check we have a version byte
- if (null == body || body.size == 0) {
+ if (null == body || body.isEmpty()) {
Timber.e("## decryptMegolmKeyFile() : Invalid file: too short")
throw Exception("Invalid file: too short")
}
@@ -93,27 +92,27 @@ object MXMegolmExportEncryption {
throw Exception("Invalid file: too short")
}
- if (TextUtils.isEmpty(password)) {
+ if (password.isEmpty()) {
throw Exception("Empty password is not supported")
}
- val salt = Arrays.copyOfRange(body, 1, 1 + 16)
- val iv = Arrays.copyOfRange(body, 17, 17 + 16)
+ val salt = body.copyOfRange(1, 1 + 16)
+ val iv = body.copyOfRange(17, 17 + 16)
val iterations =
(body[33].toUnsignedInt() shl 24) or (body[34].toUnsignedInt() shl 16) or (body[35].toUnsignedInt() shl 8) or body[36].toUnsignedInt()
- val ciphertext = Arrays.copyOfRange(body, 37, 37 + ciphertextLength)
- val hmac = Arrays.copyOfRange(body, body.size - 32, body.size)
+ val ciphertext = body.copyOfRange(37, 37 + ciphertextLength)
+ val hmac = body.copyOfRange(body.size - 32, body.size)
val deriveKey = deriveKeys(salt, iterations, password)
- val toVerify = Arrays.copyOfRange(body, 0, body.size - 32)
+ val toVerify = body.copyOfRange(0, body.size - 32)
val macKey = SecretKeySpec(getHmacKey(deriveKey), "HmacSHA256")
val mac = Mac.getInstance("HmacSHA256")
mac.init(macKey)
val digest = mac.doFinal(toVerify)
- if (!Arrays.equals(hmac, digest)) {
+ if (!hmac.contentEquals(digest)) {
Timber.e("## decryptMegolmKeyFile() : Authentication check failed: incorrect password?")
throw Exception("Authentication check failed: incorrect password?")
}
@@ -146,7 +145,7 @@ object MXMegolmExportEncryption {
@Throws(Exception::class)
@JvmOverloads
fun encryptMegolmKeyFile(data: String, password: String, kdf_rounds: Int = DEFAULT_ITERATION_COUNT): ByteArray {
- if (TextUtils.isEmpty(password)) {
+ if (password.isEmpty()) {
throw Exception("Empty password is not supported")
}
@@ -196,7 +195,7 @@ object MXMegolmExportEncryption {
System.arraycopy(cipherArray, 0, resultBuffer, idx, cipherArray.size)
idx += cipherArray.size
- val toSign = Arrays.copyOfRange(resultBuffer, 0, idx)
+ val toSign = resultBuffer.copyOfRange(0, idx)
val macKey = SecretKeySpec(getHmacKey(deriveKey), "HmacSHA256")
val mac = Mac.getInstance("HmacSHA256")
@@ -234,7 +233,7 @@ object MXMegolmExportEncryption {
// start the next line after the newline
lineStart = lineEnd + 1
- if (TextUtils.equals(line, HEADER_LINE)) {
+ if (line == HEADER_LINE) {
break
}
}
@@ -244,15 +243,13 @@ object MXMegolmExportEncryption {
// look for the end line
while (true) {
val lineEnd = fileStr.indexOf('\n', lineStart)
- val line: String
-
- if (lineEnd < 0) {
- line = fileStr.substring(lineStart).trim()
+ val line = if (lineEnd < 0) {
+ fileStr.substring(lineStart)
} else {
- line = fileStr.substring(lineStart, lineEnd).trim()
- }
+ fileStr.substring(lineStart, lineEnd)
+ }.trim()
- if (TextUtils.equals(line, TRAILER_LINE)) {
+ if (line == TRAILER_LINE) {
break
}
@@ -290,7 +287,7 @@ object MXMegolmExportEncryption {
for (i in 1..nLines) {
outStream.write("\n".toByteArray())
- val len = Math.min(LINE_LENGTH, data.size - o)
+ val len = min(LINE_LENGTH, data.size - o)
outStream.write(Base64.encode(data, o, len, Base64.DEFAULT))
o += LINE_LENGTH
}
@@ -318,7 +315,7 @@ object MXMegolmExportEncryption {
// it is simpler than the generic algorithm because the expected key length is equal to the mac key length.
// noticed as dklen/hlen
val prf = Mac.getInstance("HmacSHA512")
- prf.init(SecretKeySpec(password.toByteArray(charset("UTF-8")), "HmacSHA512"))
+ prf.init(SecretKeySpec(password.toByteArray(Charsets.UTF_8), "HmacSHA512"))
// 512 bits key length
val key = ByteArray(64)
@@ -326,8 +323,7 @@ object MXMegolmExportEncryption {
// U1 = PRF(Password, Salt || INT_32_BE(i))
prf.update(salt)
- val int32BE = ByteArray(4)
- Arrays.fill(int32BE, 0.toByte())
+ val int32BE = ByteArray(4) { 0.toByte() }
int32BE[3] = 1.toByte()
prf.update(int32BE)
prf.doFinal(Uc, 0)
@@ -346,7 +342,7 @@ object MXMegolmExportEncryption {
}
}
- Timber.v("## deriveKeys() : " + iterations + " in " + (System.currentTimeMillis() - t0) + " ms")
+ Timber.v("## deriveKeys() : $iterations in ${System.currentTimeMillis() - t0} ms")
return key
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt
index 7c5131fcce..68aaaf3831 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt
@@ -17,7 +17,6 @@
package im.vector.matrix.android.internal.crypto
-import android.text.TextUtils
import im.vector.matrix.android.api.session.crypto.MXCryptoError
import im.vector.matrix.android.api.util.JSON_DICT_PARAMETERIZED_TYPE
import im.vector.matrix.android.api.util.JsonDict
@@ -33,7 +32,6 @@ import im.vector.matrix.android.internal.util.convertToUTF8
import org.matrix.olm.*
import timber.log.Timber
import java.net.URLEncoder
-import java.util.*
import javax.inject.Inject
// The libolm wrapper.
@@ -94,7 +92,6 @@ internal class MXOlmDevice @Inject constructor(
} catch (e: Exception) {
Timber.e(e, "MXOlmDevice : cannot initialize olmAccount")
}
-
} else {
Timber.v("MXOlmDevice : use an existing account")
}
@@ -217,7 +214,6 @@ internal class MXOlmDevice @Inject constructor(
Timber.v("## createOutboundSession() ; olmSession.sessionIdentifier: $sessionIdentifier")
return sessionIdentifier
-
} catch (e: Exception) {
Timber.e(e, "## createOutboundSession() failed")
@@ -236,7 +232,6 @@ internal class MXOlmDevice @Inject constructor(
* @return {{payload: string, session_id: string}} decrypted payload, and session id of new session.
*/
fun createInboundSession(theirDeviceIdentityKey: String, messageType: Int, ciphertext: String): Map? {
-
Timber.v("## createInboundSession() : theirIdentityKey: $theirDeviceIdentityKey")
var olmSession: OlmSession? = null
@@ -250,7 +245,7 @@ internal class MXOlmDevice @Inject constructor(
return null
}
- Timber.v("## createInboundSession() : sessionId: " + olmSession.sessionIdentifier())
+ Timber.v("## createInboundSession() : sessionId: ${olmSession.sessionIdentifier()}")
try {
olmAccount!!.removeOneTimeKeys(olmSession)
@@ -262,7 +257,7 @@ internal class MXOlmDevice @Inject constructor(
Timber.v("## createInboundSession() : ciphertext: $ciphertext")
try {
val sha256 = olmUtility!!.sha256(URLEncoder.encode(ciphertext, "utf-8"))
- Timber.v("## createInboundSession() :ciphertext: SHA256:" + sha256)
+ Timber.v("## createInboundSession() :ciphertext: SHA256: $sha256")
} catch (e: Exception) {
Timber.e(e, "## createInboundSession() :ciphertext: cannot encode ciphertext")
}
@@ -343,7 +338,7 @@ internal class MXOlmDevice @Inject constructor(
if (olmSessionWrapper != null) {
try {
Timber.v("## encryptMessage() : olmSession.sessionIdentifier: $sessionId")
- //Timber.v("## encryptMessage() : payloadString: " + payloadString);
+ // Timber.v("## encryptMessage() : payloadString: " + payloadString);
olmMessage = olmSessionWrapper.olmSession.encryptMessage(payloadString)
store.storeSession(olmSessionWrapper, theirDeviceIdentityKey)
@@ -352,9 +347,8 @@ internal class MXOlmDevice @Inject constructor(
res["body"] = olmMessage.mCipherText
res["type"] = olmMessage.mType
} catch (e: Exception) {
- Timber.e(e, "## encryptMessage() : failed " + e.message)
+ Timber.e(e, "## encryptMessage() : failed")
}
-
}
return res
@@ -384,9 +378,8 @@ internal class MXOlmDevice @Inject constructor(
olmSessionWrapper.onMessageReceived()
store.storeSession(olmSessionWrapper, theirDeviceIdentityKey)
} catch (e: Exception) {
- Timber.e(e, "## decryptMessage() : decryptMessage failed " + e.message)
+ Timber.e(e, "## decryptMessage() : decryptMessage failed")
}
-
}
return payloadString
@@ -410,7 +403,6 @@ internal class MXOlmDevice @Inject constructor(
return null != olmSessionWrapper && olmSessionWrapper.olmSession.matchesInboundSession(ciphertext)
}
-
// Outbound group session
/**
@@ -425,7 +417,7 @@ internal class MXOlmDevice @Inject constructor(
outboundGroupSessionStore[session.sessionIdentifier()] = session
return session.sessionIdentifier()
} catch (e: Exception) {
- Timber.e(e, "createOutboundGroupSession " + e.message)
+ Timber.e(e, "createOutboundGroupSession")
session?.releaseSession()
}
@@ -440,13 +432,12 @@ internal class MXOlmDevice @Inject constructor(
* @return the base64-encoded secret key.
*/
fun getSessionKey(sessionId: String): String? {
- if (!TextUtils.isEmpty(sessionId)) {
+ if (sessionId.isNotEmpty()) {
try {
return outboundGroupSessionStore[sessionId]!!.sessionKey()
} catch (e: Exception) {
- Timber.e(e, "## getSessionKey() : failed " + e.message)
+ Timber.e(e, "## getSessionKey() : failed")
}
-
}
return null
}
@@ -458,7 +449,7 @@ internal class MXOlmDevice @Inject constructor(
* @return the current chain index.
*/
fun getMessageIndex(sessionId: String): Int {
- return if (!TextUtils.isEmpty(sessionId)) {
+ return if (sessionId.isNotEmpty()) {
outboundGroupSessionStore[sessionId]!!.messageIndex()
} else 0
}
@@ -471,13 +462,12 @@ internal class MXOlmDevice @Inject constructor(
* @return ciphertext
*/
fun encryptGroupMessage(sessionId: String, payloadString: String): String? {
- if (!TextUtils.isEmpty(sessionId) && !TextUtils.isEmpty(payloadString)) {
+ if (sessionId.isNotEmpty() && payloadString.isNotEmpty()) {
try {
return outboundGroupSessionStore[sessionId]!!.encryptMessage(payloadString)
} catch (e: Exception) {
- Timber.e(e, "## encryptGroupMessage() : failed " + e.message)
+ Timber.e(e, "## encryptGroupMessage() : failed")
}
-
}
return null
}
@@ -513,7 +503,7 @@ internal class MXOlmDevice @Inject constructor(
val existingFirstKnown = it.firstKnownIndex!!
val newKnownFirstIndex = session.firstKnownIndex
- //If our existing session is better we keep it
+ // If our existing session is better we keep it
if (newKnownFirstIndex != null && existingFirstKnown <= newKnownFirstIndex) {
session.olmInboundGroupSession?.releaseSession()
return false
@@ -531,7 +521,7 @@ internal class MXOlmDevice @Inject constructor(
}
try {
- if (!TextUtils.equals(session.olmInboundGroupSession!!.sessionIdentifier(), sessionId)) {
+ if (session.olmInboundGroupSession!!.sessionIdentifier() != sessionId) {
Timber.e("## addInboundGroupSession : ERROR: Mismatched group session ID from senderKey: $senderKey")
session.olmInboundGroupSession!!.releaseSession()
return false
@@ -562,7 +552,6 @@ internal class MXOlmDevice @Inject constructor(
val sessions = ArrayList(megolmSessionsData.size)
for (megolmSessionData in megolmSessionsData) {
-
val sessionId = megolmSessionData.sessionId
val senderKey = megolmSessionData.senderKey
val roomId = megolmSessionData.roomId
@@ -582,8 +571,8 @@ internal class MXOlmDevice @Inject constructor(
}
try {
- if (!TextUtils.equals(session.olmInboundGroupSession?.sessionIdentifier(), sessionId)) {
- Timber.e("## importInboundGroupSession : ERROR: Mismatched group session ID from senderKey: " + senderKey!!)
+ if (session.olmInboundGroupSession?.sessionIdentifier() != sessionId) {
+ Timber.e("## importInboundGroupSession : ERROR: Mismatched group session ID from senderKey: $senderKey")
if (session.olmInboundGroupSession != null) session.olmInboundGroupSession!!.releaseSession()
continue
}
@@ -601,7 +590,7 @@ internal class MXOlmDevice @Inject constructor(
// For now we just ignore updates. TODO: implement something here
if (it.firstKnownIndex!! <= session.firstKnownIndex!!) {
- //Ignore this, keep existing
+ // Ignore this, keep existing
session.olmInboundGroupSession!!.releaseSession()
} else {
sessions.add(session)
@@ -652,9 +641,8 @@ internal class MXOlmDevice @Inject constructor(
// Check that the room id matches the original one for the session. This stops
// the HS pretending a message was targeting a different room.
if (roomId == session.roomId) {
- var decryptResult: OlmInboundGroupSession.DecryptMessageResult? = null
- try {
- decryptResult = session.olmInboundGroupSession!!.decryptMessage(body)
+ val decryptResult = try {
+ session.olmInboundGroupSession!!.decryptMessage(body)
} catch (e: OlmException) {
Timber.e(e, "## decryptGroupMessage () : decryptMessage failed")
throw MXCryptoError.OlmError(e)
@@ -747,7 +735,6 @@ internal class MXOlmDevice @Inject constructor(
return if (theirDeviceIdentityKey.isEmpty() || sessionId.isEmpty()) null else {
store.getDeviceSession(sessionId, theirDeviceIdentityKey)
}
-
}
/**
@@ -769,7 +756,7 @@ internal class MXOlmDevice @Inject constructor(
if (session != null) {
// Check that the room id matches the original one for the session. This stops
// the HS pretending a message was targeting a different room.
- if (!TextUtils.equals(roomId, session.roomId)) {
+ if (roomId != session.roomId) {
val errorDescription = String.format(MXCryptoError.INBOUND_SESSION_MISMATCH_ROOM_ID_REASON, roomId, session.roomId)
Timber.e("## getInboundGroupSession() : $errorDescription")
throw MXCryptoError.Base(MXCryptoError.ErrorType.INBOUND_SESSION_MISMATCH_ROOM_ID, errorDescription)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MyDeviceInfoHolder.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MyDeviceInfoHolder.kt
index 4223983298..f93245de12 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MyDeviceInfoHolder.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MyDeviceInfoHolder.kt
@@ -16,12 +16,10 @@
package im.vector.matrix.android.internal.crypto
-import android.text.TextUtils
import im.vector.matrix.android.api.auth.data.Credentials
import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
import im.vector.matrix.android.internal.session.SessionScope
-import java.util.*
import javax.inject.Inject
@SessionScope
@@ -42,11 +40,11 @@ internal class MyDeviceInfoHolder @Inject constructor(
init {
val keys = HashMap()
- if (!TextUtils.isEmpty(olmDevice.deviceEd25519Key)) {
+ if (!olmDevice.deviceEd25519Key.isNullOrEmpty()) {
keys["ed25519:" + credentials.deviceId] = olmDevice.deviceEd25519Key!!
}
- if (!TextUtils.isEmpty(olmDevice.deviceCurve25519Key)) {
+ if (!olmDevice.deviceCurve25519Key.isNullOrEmpty()) {
keys["curve25519:" + credentials.deviceId] = olmDevice.deviceCurve25519Key!!
}
@@ -58,16 +56,10 @@ internal class MyDeviceInfoHolder @Inject constructor(
// Add our own deviceinfo to the store
val endToEndDevicesForUser = cryptoStore.getUserDevices(credentials.userId)
- val myDevices: MutableMap
-
- if (null != endToEndDevicesForUser) {
- myDevices = HashMap(endToEndDevicesForUser)
- } else {
- myDevices = HashMap()
- }
+ val myDevices = endToEndDevicesForUser.orEmpty().toMutableMap()
myDevices[myDevice.deviceId] = myDevice
cryptoStore.storeUserDevices(credentials.userId, myDevices)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/NewSessionListener.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/NewSessionListener.kt
index 7881b1ea7f..e113e64146 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/NewSessionListener.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/NewSessionListener.kt
@@ -15,7 +15,6 @@
*/
package im.vector.matrix.android.internal.crypto
-
interface NewSessionListener {
fun onNewSession(roomId: String?, senderKey: String, sessionId: String)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/ObjectSigner.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/ObjectSigner.kt
index 625f81de86..be15f3753e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/ObjectSigner.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/ObjectSigner.kt
@@ -42,13 +42,11 @@ internal class ObjectSigner @Inject constructor(private val credentials: Credent
val content = HashMap()
-
content["ed25519:" + credentials.deviceId] = olmDevice.signMessage(strToSign)
- ?: "" //null reported by rageshake if happens during logout
+ ?: "" // null reported by rageshake if happens during logout
result[credentials.userId] = content
return result
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OneTimeKeysUploader.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OneTimeKeysUploader.kt
index f0d7662f0f..e6b57d149f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OneTimeKeysUploader.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OneTimeKeysUploader.kt
@@ -24,8 +24,9 @@ import im.vector.matrix.android.internal.session.SessionScope
import im.vector.matrix.android.internal.util.JsonCanonicalizer
import org.matrix.olm.OlmAccount
import timber.log.Timber
-import java.util.*
import javax.inject.Inject
+import kotlin.math.floor
+import kotlin.math.min
@SessionScope
internal class OneTimeKeysUploader @Inject constructor(
@@ -53,7 +54,6 @@ internal class OneTimeKeysUploader @Inject constructor(
oneTimeKeyCount = currentCount
}
-
/**
* Check if the OTK must be uploaded.
*/
@@ -78,7 +78,7 @@ internal class OneTimeKeysUploader @Inject constructor(
// If we run out of slots when generating new keys then olm will
// discard the oldest private keys first. This will eventually clean
// out stale private keys that won't receive a message.
- val keyLimit = Math.floor(maxOneTimeKeys / 2.0).toInt()
+ val keyLimit = floor(maxOneTimeKeys / 2.0).toInt()
if (oneTimeKeyCount != null) {
uploadOTK(oneTimeKeyCount!!, keyLimit)
} else {
@@ -117,7 +117,7 @@ internal class OneTimeKeysUploader @Inject constructor(
// If we don't need to generate any more keys then we are done.
return
}
- val keysThisLoop = Math.min(keyLimit - keyCount, ONE_TIME_KEY_GENERATION_MAX_NUMBER)
+ val keysThisLoop = min(keyLimit - keyCount, ONE_TIME_KEY_GENERATION_MAX_NUMBER)
olmDevice.generateOneTimeKeys(keysThisLoop)
val response = uploadOneTimeKeys()
if (response.hasOneTimeKeyCountsForAlgorithm(MXKey.KEY_SIGNED_CURVE_25519_TYPE)) {
@@ -133,14 +133,14 @@ internal class OneTimeKeysUploader @Inject constructor(
*/
private suspend fun uploadOneTimeKeys(): KeysUploadResponse {
val oneTimeKeys = olmDevice.getOneTimeKeys()
- val oneTimeJson = HashMap()
+ val oneTimeJson = mutableMapOf()
val curve25519Map = oneTimeKeys?.get(OlmAccount.JSON_KEY_ONE_TIME_KEY)
if (null != curve25519Map) {
- for (key_id in curve25519Map.keys) {
- val k = HashMap()
- k["key"] = curve25519Map.getValue(key_id)
+ for ((key_id, value) in curve25519Map) {
+ val k = mutableMapOf()
+ k["key"] = value
// the key is also signed
val canonicalJson = JsonCanonicalizer.getCanonicalJson(Map::class.java, k)
@@ -170,4 +170,4 @@ internal class OneTimeKeysUploader @Inject constructor(
// frequency with which to check & upload one-time keys
private const val ONE_TIME_KEY_UPLOAD_PERIOD = (60 * 1000).toLong() // one minute
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequest.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequest.kt
index 89de5a078b..a66b0242ec 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequest.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequest.kt
@@ -116,4 +116,3 @@ class OutgoingRoomKeyRequest(
}
}
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequestManager.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequestManager.kt
index c0702f70e5..89a27c9463 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequestManager.kt
@@ -90,7 +90,6 @@ internal class OutgoingRoomKeyRequestManager @Inject constructor(
val req = cryptoStore.getOrAddOutgoingRoomKeyRequest(
OutgoingRoomKeyRequest(requestBody, recipients, makeTxnId(), OutgoingRoomKeyRequest.RequestState.UNSENT))
-
if (req?.state == OutgoingRoomKeyRequest.RequestState.UNSENT) {
startTimer()
}
@@ -154,7 +153,6 @@ internal class OutgoingRoomKeyRequestManager @Inject constructor(
}
}
-
/**
* Start the background timer to send queued requests, if the timer isn't already running.
*/
@@ -261,7 +259,6 @@ internal class OutgoingRoomKeyRequestManager @Inject constructor(
startTimer()
}
-
override fun onSuccess(data: Unit) {
Timber.v("## sendOutgoingRoomKeyRequestCancellation() : done")
val resend = request.state === OutgoingRoomKeyRequest.RequestState.CANCELLATION_PENDING_AND_WILL_RESEND
@@ -312,6 +309,5 @@ internal class OutgoingRoomKeyRequestManager @Inject constructor(
private const val SEND_KEY_REQUESTS_DELAY_MS = 500
private val BACKGROUND_HANDLER = createBackgroundHandler("OutgoingRoomKeyRequest")
-
}
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomDecryptorProvider.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomDecryptorProvider.kt
index 3dd7b932f9..a17a524923 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomDecryptorProvider.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/RoomDecryptorProvider.kt
@@ -16,13 +16,11 @@
package im.vector.matrix.android.internal.crypto
-import android.text.TextUtils
import im.vector.matrix.android.internal.crypto.algorithms.IMXDecrypting
import im.vector.matrix.android.internal.crypto.algorithms.megolm.MXMegolmDecryptionFactory
import im.vector.matrix.android.internal.crypto.algorithms.olm.MXOlmDecryptionFactory
import im.vector.matrix.android.internal.session.SessionScope
import timber.log.Timber
-import java.util.*
import javax.inject.Inject
@SessionScope
@@ -62,10 +60,8 @@ internal class RoomDecryptorProvider @Inject constructor(
}
if (roomId != null && roomId.isNotEmpty()) {
synchronized(roomDecryptors) {
- if (!roomDecryptors.containsKey(roomId)) {
- roomDecryptors[roomId] = HashMap()
- }
- val alg = roomDecryptors[roomId]?.get(algorithm)
+ val decryptors = roomDecryptors.getOrPut(roomId) { mutableMapOf() }
+ val alg = decryptors[algorithm]
if (alg != null) {
return alg
}
@@ -76,12 +72,12 @@ internal class RoomDecryptorProvider @Inject constructor(
val alg = when (algorithm) {
MXCRYPTO_ALGORITHM_MEGOLM -> megolmDecryptionFactory.create().apply {
this.newSessionListener = object : NewSessionListener {
- override fun onNewSession(rid: String?, senderKey: String, sessionId: String) {
+ override fun onNewSession(roomId: String?, senderKey: String, sessionId: String) {
+ // PR reviewer: the parameter has been renamed so is now in conflict with the parameter of getOrCreateRoomDecryptor
newSessionListeners.forEach {
try {
it.onNewSession(roomId, senderKey, sessionId)
} catch (e: Throwable) {
-
}
}
}
@@ -89,7 +85,7 @@ internal class RoomDecryptorProvider @Inject constructor(
}
else -> olmDecryptionFactory.create()
}
- if (roomId != null && !TextUtils.isEmpty(roomId)) {
+ if (!roomId.isNullOrEmpty()) {
synchronized(roomDecryptors) {
roomDecryptors[roomId]?.put(algorithm, alg)
}
@@ -105,4 +101,4 @@ internal class RoomDecryptorProvider @Inject constructor(
}
return roomDecryptors[roomId]?.get(algorithm)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
index 7a56f46bd1..0283d3c85b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.internal.crypto.actions
-import android.text.TextUtils
import im.vector.matrix.android.internal.crypto.MXOlmDevice
import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
import im.vector.matrix.android.internal.crypto.model.MXKey
@@ -24,30 +23,24 @@ import im.vector.matrix.android.internal.crypto.model.MXOlmSessionResult
import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
import im.vector.matrix.android.internal.crypto.tasks.ClaimOneTimeKeysForUsersDeviceTask
import timber.log.Timber
-import java.util.*
import javax.inject.Inject
internal class EnsureOlmSessionsForDevicesAction @Inject constructor(private val olmDevice: MXOlmDevice,
private val oneTimeKeysForUsersDeviceTask: ClaimOneTimeKeysForUsersDeviceTask) {
-
suspend fun handle(devicesByUser: Map>): MXUsersDevicesMap {
val devicesWithoutSession = ArrayList()
val results = MXUsersDevicesMap()
- val userIds = devicesByUser.keys
-
- for (userId in userIds) {
- val deviceInfos = devicesByUser[userId]
-
- for (deviceInfo in deviceInfos!!) {
+ for ((userId, deviceInfos) in devicesByUser) {
+ for (deviceInfo in deviceInfos) {
val deviceId = deviceInfo.deviceId
val key = deviceInfo.identityKey()
val sessionId = olmDevice.getSessionId(key!!)
- if (TextUtils.isEmpty(sessionId)) {
+ if (sessionId.isNullOrEmpty()) {
devicesWithoutSession.add(deviceInfo)
}
@@ -80,9 +73,8 @@ internal class EnsureOlmSessionsForDevicesAction @Inject constructor(private val
val claimParams = ClaimOneTimeKeysForUsersDeviceTask.Params(usersDevicesToClaim)
val oneTimeKeys = oneTimeKeysForUsersDeviceTask.execute(claimParams)
Timber.v("## claimOneTimeKeysForUsersDevices() : keysClaimResponse.oneTimeKeys: $oneTimeKeys")
- for (userId in userIds) {
- val deviceInfos = devicesByUser[userId]
- for (deviceInfo in deviceInfos!!) {
+ for ((userId, deviceInfos) in devicesByUser) {
+ for (deviceInfo in deviceInfos) {
var oneTimeKey: MXKey? = null
val deviceIds = oneTimeKeys.getUserDeviceIds(userId)
if (null != deviceIds) {
@@ -117,24 +109,22 @@ internal class EnsureOlmSessionsForDevicesAction @Inject constructor(private val
val signKeyId = "ed25519:$deviceId"
val signature = oneTimeKey.signatureForUserId(userId, signKeyId)
- if (!TextUtils.isEmpty(signature) && !TextUtils.isEmpty(deviceInfo.fingerprint())) {
+ if (!signature.isNullOrEmpty() && !deviceInfo.fingerprint().isNullOrEmpty()) {
var isVerified = false
var errorMessage: String? = null
- if (signature != null) {
- try {
- olmDevice.verifySignature(deviceInfo.fingerprint()!!, oneTimeKey.signalableJSONDictionary(), signature)
- isVerified = true
- } catch (e: Exception) {
- errorMessage = e.message
- }
+ try {
+ olmDevice.verifySignature(deviceInfo.fingerprint()!!, oneTimeKey.signalableJSONDictionary(), signature)
+ isVerified = true
+ } catch (e: Exception) {
+ errorMessage = e.message
}
// Check one-time key signature
if (isVerified) {
sessionId = olmDevice.createOutboundSession(deviceInfo.identityKey()!!, oneTimeKey.value)
- if (!TextUtils.isEmpty(sessionId)) {
+ if (!sessionId.isNullOrEmpty()) {
Timber.v("## verifyKeyAndStartSession() : Started new sessionid " + sessionId
+ " for device " + deviceInfo + "(theirOneTimeKey: " + oneTimeKey.value + ")")
} else {
@@ -149,5 +139,4 @@ internal class EnsureOlmSessionsForDevicesAction @Inject constructor(private val
return sessionId
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
index f929859d76..0c649cce89 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
@@ -16,14 +16,11 @@
package im.vector.matrix.android.internal.crypto.actions
-import android.text.TextUtils
import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
import im.vector.matrix.android.internal.crypto.model.MXOlmSessionResult
import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
import timber.log.Timber
-import java.util.*
import javax.inject.Inject
internal class EnsureOlmSessionsForUsersAction @Inject constructor(private val olmDevice: MXOlmDevice,
@@ -36,29 +33,16 @@ internal class EnsureOlmSessionsForUsersAction @Inject constructor(private val o
*/
suspend fun handle(users: List): MXUsersDevicesMap {
Timber.v("## ensureOlmSessionsForUsers() : ensureOlmSessionsForUsers $users")
- val devicesByUser = HashMap>()
-
- for (userId in users) {
- devicesByUser[userId] = ArrayList()
-
+ val devicesByUser = users.associateWith { userId ->
val devices = cryptoStore.getUserDevices(userId)?.values ?: emptyList()
- for (device in devices) {
- val key = device.identityKey()
-
- if (TextUtils.equals(key, olmDevice.deviceCurve25519Key)) {
- // Don't bother setting up session to ourself
- continue
- }
-
- if (device.isVerified) {
- // Don't bother setting up sessions with blocked users
- continue
- }
-
- devicesByUser[userId]!!.add(device)
+ devices.filter {
+ // Don't bother setting up session to ourself
+ it.identityKey() != olmDevice.deviceCurve25519Key
+ // Don't bother setting up sessions with blocked users
+ && !it.isVerified
}
}
return ensureOlmSessionsForDevicesAction.handle(devicesByUser)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MegolmSessionDataImporter.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MegolmSessionDataImporter.kt
index 9d345dfbc3..62b4f1b851 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MegolmSessionDataImporter.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MegolmSessionDataImporter.kt
@@ -112,4 +112,4 @@ internal class MegolmSessionDataImporter @Inject constructor(private val olmDevi
return ImportRoomKeysResult(totalNumbersOfKeys, totalNumbersOfImportedKeys)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MessageEncrypter.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MessageEncrypter.kt
index 3328de0eaf..ebe219600d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MessageEncrypter.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MessageEncrypter.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.internal.crypto.actions
-import android.text.TextUtils
import im.vector.matrix.android.api.auth.data.Credentials
import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_OLM
import im.vector.matrix.android.internal.crypto.MXOlmDevice
@@ -25,7 +24,6 @@ import im.vector.matrix.android.internal.crypto.model.rest.EncryptedMessage
import im.vector.matrix.android.internal.util.JsonCanonicalizer
import im.vector.matrix.android.internal.util.convertToUTF8
import timber.log.Timber
-import java.util.*
import javax.inject.Inject
internal class MessageEncrypter @Inject constructor(private val credentials: Credentials,
@@ -40,18 +38,12 @@ internal class MessageEncrypter @Inject constructor(private val credentials: Cre
* @return the content for an m.room.encrypted event.
*/
fun encryptMessage(payloadFields: Map, deviceInfos: List): EncryptedMessage {
- val deviceInfoParticipantKey = HashMap()
- val participantKeys = ArrayList()
+ val deviceInfoParticipantKey = deviceInfos.associateBy { it.identityKey()!! }
- for (di in deviceInfos) {
- participantKeys.add(di.identityKey()!!)
- deviceInfoParticipantKey[di.identityKey()!!] = di
- }
-
- val payloadJson = HashMap(payloadFields)
+ val payloadJson = payloadFields.toMutableMap()
payloadJson["sender"] = credentials.userId
- payloadJson["sender_device"] = credentials.deviceId
+ payloadJson["sender_device"] = credentials.deviceId!!
// Include the Ed25519 key so that the recipient knows what
// device this message came from.
@@ -67,31 +59,24 @@ internal class MessageEncrypter @Inject constructor(private val credentials: Cre
val ciphertext = HashMap()
- for (deviceKey in participantKeys) {
+ for ((deviceKey, deviceInfo) in deviceInfoParticipantKey) {
val sessionId = olmDevice.getSessionId(deviceKey)
- if (!TextUtils.isEmpty(sessionId)) {
+ if (!sessionId.isNullOrEmpty()) {
Timber.v("Using sessionid $sessionId for device $deviceKey")
- val deviceInfo = deviceInfoParticipantKey[deviceKey]
- payloadJson["recipient"] = deviceInfo!!.userId
-
- val recipientsKeysMap = HashMap()
- recipientsKeysMap["ed25519"] = deviceInfo.fingerprint()!!
- payloadJson["recipient_keys"] = recipientsKeysMap
+ payloadJson["recipient"] = deviceInfo.userId
+ payloadJson["recipient_keys"] = mapOf("ed25519" to deviceInfo.fingerprint()!!)
val payloadString = convertToUTF8(JsonCanonicalizer.getCanonicalJson(Map::class.java, payloadJson))
- ciphertext[deviceKey] = olmDevice.encryptMessage(deviceKey, sessionId!!, payloadString!!)!!
+ ciphertext[deviceKey] = olmDevice.encryptMessage(deviceKey, sessionId, payloadString)!!
}
}
- val res = EncryptedMessage()
-
- res.algorithm = MXCRYPTO_ALGORITHM_OLM
- res.senderKey = olmDevice.deviceCurve25519Key
- res.cipherText = ciphertext
-
- return res
+ return EncryptedMessage(
+ algorithm = MXCRYPTO_ALGORITHM_OLM,
+ senderKey = olmDevice.deviceCurve25519Key,
+ cipherText = ciphertext
+ )
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/SetDeviceVerificationAction.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/SetDeviceVerificationAction.kt
index 078d016e42..3eafa73fab 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/SetDeviceVerificationAction.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/SetDeviceVerificationAction.kt
@@ -47,4 +47,4 @@ internal class SetDeviceVerificationAction @Inject constructor(private val crypt
}
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
index c518872d44..0230141e1b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
@@ -17,7 +17,6 @@
package im.vector.matrix.android.internal.crypto.algorithms.megolm
-import android.text.TextUtils
import im.vector.matrix.android.api.session.crypto.MXCryptoError
import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.api.session.events.model.EventType
@@ -129,7 +128,6 @@ internal class MXMegolmDecryption(private val userId: String,
)
}
-
/**
* Helper for the real decryptEvent and for _retryDecryption. If
* requestKeysOnFail is true, we'll send an m.room_key_request when we fail
@@ -149,7 +147,7 @@ internal class MXMegolmDecryption(private val userId: String,
selfMap["deviceId"] = "*"
recipients.add(selfMap)
- if (!TextUtils.equals(sender, userId)) {
+ if (sender != userId) {
val senderMap = HashMap()
senderMap["userId"] = sender
senderMap["deviceId"] = encryptedEventContent.deviceId!!
@@ -177,18 +175,12 @@ internal class MXMegolmDecryption(private val userId: String,
val encryptedEventContent = event.content.toModel() ?: return
val pendingEventsKey = "${encryptedEventContent.senderKey}|${encryptedEventContent.sessionId}"
+ val timeline = pendingEvents.getOrPut(pendingEventsKey) { HashMap() }
+ val events = timeline.getOrPut(timelineId) { ArrayList() }
- if (!pendingEvents.containsKey(pendingEventsKey)) {
- pendingEvents[pendingEventsKey] = HashMap()
- }
-
- if (pendingEvents[pendingEventsKey]?.containsKey(timelineId) == false) {
- pendingEvents[pendingEventsKey]?.put(timelineId, ArrayList())
- }
-
- if (pendingEvents[pendingEventsKey]?.get(timelineId)?.contains(event) == false) {
- Timber.v("## addEventToPendingList() : add Event " + event.eventId + " in room id " + event.roomId)
- pendingEvents[pendingEventsKey]?.get(timelineId)?.add(event)
+ if (event !in events) {
+ Timber.v("## addEventToPendingList() : add Event ${event.eventId} in room id ${event.roomId}")
+ events.add(event)
}
}
@@ -205,7 +197,7 @@ internal class MXMegolmDecryption(private val userId: String,
var keysClaimed: MutableMap = HashMap()
val forwardingCurve25519KeyChain: MutableList = ArrayList()
- if (TextUtils.isEmpty(roomKeyContent.roomId) || TextUtils.isEmpty(roomKeyContent.sessionId) || TextUtils.isEmpty(roomKeyContent.sessionKey)) {
+ if (roomKeyContent.roomId.isNullOrEmpty() || roomKeyContent.sessionId.isNullOrEmpty() || roomKeyContent.sessionKey.isNullOrEmpty()) {
Timber.e("## onRoomKeyEvent() : Key event is missing fields")
return
}
@@ -252,13 +244,6 @@ internal class MXMegolmDecryption(private val userId: String,
keysClaimed = event.getKeysClaimed().toMutableMap()
}
- if (roomKeyContent.sessionId == null
- || roomKeyContent.sessionKey == null
- || roomKeyContent.roomId == null) {
- Timber.e("## invalid roomKeyContent")
- return
- }
-
val added = olmDevice.addInboundGroupSession(roomKeyContent.sessionId,
roomKeyContent.sessionKey,
roomKeyContent.roomId,
@@ -352,4 +337,3 @@ internal class MXMegolmDecryption(private val userId: String,
}
}
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
index 54c412526d..b7329221ab 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
@@ -49,4 +49,4 @@ internal class MXMegolmDecryptionFactory @Inject constructor(@UserId private val
sendToDeviceTask,
coroutineDispatchers)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index b465cb6e67..897a1f0a5d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -18,7 +18,6 @@
package im.vector.matrix.android.internal.crypto.algorithms.megolm
-import android.text.TextUtils
import im.vector.matrix.android.api.auth.data.Credentials
import im.vector.matrix.android.api.session.crypto.MXCryptoError
import im.vector.matrix.android.api.session.events.model.Content
@@ -38,7 +37,6 @@ import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
import im.vector.matrix.android.internal.util.JsonCanonicalizer
import im.vector.matrix.android.internal.util.convertToUTF8
import timber.log.Timber
-import java.util.*
internal class MXMegolmEncryption(
// The id of the room we will be sending to.
@@ -54,7 +52,6 @@ internal class MXMegolmEncryption(
private val warnOnUnknownDevicesRepository: WarnOnUnknownDeviceRepository
) : IMXEncrypting {
-
// OutboundSessionInfo. Null if we haven't yet started setting one up. Note
// that even if this is non-null, it may not be ready for use (in which
// case outboundSession.shareOperation will be non-null.)
@@ -86,7 +83,7 @@ internal class MXMegolmEncryption(
keysClaimedMap["ed25519"] = olmDevice.deviceEd25519Key!!
olmDevice.addInboundGroupSession(sessionId!!, olmDevice.getSessionKey(sessionId)!!, roomId, olmDevice.deviceCurve25519Key!!,
- ArrayList(), keysClaimedMap, false)
+ emptyList(), keysClaimedMap, false)
keysBackup.maybeBackupKeys()
@@ -116,10 +113,8 @@ internal class MXMegolmEncryption(
for (deviceId in deviceIds!!) {
val deviceInfo = devicesInRoom.getObject(userId, deviceId)
if (deviceInfo != null && null == safeSession.sharedWithDevices.getObject(userId, deviceId)) {
- if (!shareMap.containsKey(userId)) {
- shareMap[userId] = ArrayList()
- }
- shareMap[userId]!!.add(deviceInfo)
+ val devices = shareMap.getOrPut(userId) { ArrayList() }
+ devices.add(deviceInfo)
}
}
}
@@ -142,21 +137,17 @@ internal class MXMegolmEncryption(
}
// reduce the map size to avoid request timeout when there are too many devices (Users size * devices per user)
val subMap = HashMap>()
- val userIds = ArrayList()
var devicesCount = 0
- for (userId in devicesByUsers.keys) {
- devicesByUsers[userId]?.let {
- userIds.add(userId)
- subMap[userId] = it
- devicesCount += it.size
- }
+ for ((userId, devices) in devicesByUsers) {
+ subMap[userId] = devices
+ devicesCount += devices.size
if (devicesCount > 100) {
break
}
}
- Timber.v("## shareKey() ; userId $userIds")
+ Timber.v("## shareKey() ; userId ${subMap.keys}")
shareUserDevicesKey(session, subMap)
- val remainingDevices = devicesByUsers.filterKeys { userIds.contains(it).not() }
+ val remainingDevices = devicesByUsers - subMap.keys
shareKey(session, remainingDevices)
}
@@ -165,7 +156,6 @@ internal class MXMegolmEncryption(
*
* @param session the session info
* @param devicesByUser the devices map
- * @param callback the asynchronous callback
*/
private suspend fun shareUserDevicesKey(session: MXOutboundSessionInfo,
devicesByUser: Map>) {
@@ -211,8 +201,7 @@ internal class MXMegolmEncryption(
continue
}
Timber.v("## shareUserDevicesKey() : Sharing keys with device $userId:$deviceID")
- //noinspection ArraysAsListWithZeroOrOneArgument,ArraysAsListWithZeroOrOneArgument
- contentMap.setObject(userId, deviceID, messageEncrypter.encryptMessage(payload, Arrays.asList(sessionResult.deviceInfo)))
+ contentMap.setObject(userId, deviceID, messageEncrypter.encryptMessage(payload, listOf(sessionResult.deviceInfo)))
haveTargets = true
}
}
@@ -229,9 +218,8 @@ internal class MXMegolmEncryption(
// attempted to share with) rather than the contentMap (those we did
// share with), because we don't want to try to claim a one-time-key
// for dead devices on every message.
- for (userId in devicesByUser.keys) {
- val devicesToShareWith = devicesByUser[userId]
- for ((deviceId) in devicesToShareWith!!) {
+ for ((userId, devicesToShareWith) in devicesByUser) {
+ for ((deviceId) in devicesToShareWith) {
session.sharedWithDevices.setObject(userId, deviceId, chainIndex)
}
}
@@ -253,7 +241,7 @@ internal class MXMegolmEncryption(
// Get canonical Json from
val payloadString = convertToUTF8(JsonCanonicalizer.getCanonicalJson(Map::class.java, payloadJson))
- val ciphertext = olmDevice.encryptGroupMessage(session.sessionId, payloadString!!)
+ val ciphertext = olmDevice.encryptGroupMessage(session.sessionId, payloadString)
val map = HashMap()
map["algorithm"] = MXCRYPTO_ALGORITHM_MEGOLM
@@ -273,7 +261,6 @@ internal class MXMegolmEncryption(
* This method must be called in getDecryptingThreadHandler() thread.
*
* @param userIds the user ids whose devices must be checked.
- * @param callback the asynchronous callback
*/
private suspend fun getDevicesInRoom(userIds: List): MXUsersDevicesMap {
// We are happy to use a cached version here: we assume that if we already
@@ -305,7 +292,7 @@ internal class MXMegolmEncryption(
continue
}
- if (TextUtils.equals(deviceInfo.identityKey(), olmDevice.deviceCurve25519Key)) {
+ if (deviceInfo.identityKey() == olmDevice.deviceCurve25519Key) {
// Don't bother sending to ourself
continue
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
index 682a3c11e3..dadd810a4b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
@@ -51,4 +51,4 @@ internal class MXMegolmEncryptionFactory @Inject constructor(
messageEncrypter,
warnOnUnknownDevicesRepository)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryption.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryption.kt
index 9433e364cb..2f3b8a8f4a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryption.kt
@@ -63,6 +63,7 @@ internal class MXOlmDecryption(
}
// The message for myUser
+ @Suppress("UNCHECKED_CAST")
val message = messageAny as JsonDict
val decryptedPayload = decryptMessage(message, senderKey)
@@ -72,10 +73,6 @@ internal class MXOlmDecryption(
throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE, MXCryptoError.BAD_ENCRYPTED_MESSAGE_REASON)
}
val payloadString = convertFromUTF8(decryptedPayload)
- if (payloadString == null) {
- Timber.e("## decryptEvent() Failed to decrypt Olm event (id= ${event.eventId} from $senderKey")
- throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE, MXCryptoError.BAD_ENCRYPTED_MESSAGE_REASON)
- }
val adapter = MoshiProvider.providesMoshi().adapter(JSON_DICT_PARAMETERIZED_TYPE)
val payload = adapter.fromJson(payloadString)
@@ -104,7 +101,8 @@ internal class MXOlmDecryption(
}
val recipientKeys = olmPayloadContent.recipient_keys ?: run {
- Timber.e("## decryptEvent() : Olm event (id=${event.eventId}) contains no 'recipient_keys' property; cannot prevent unknown-key attack")
+ Timber.e("## decryptEvent() : Olm event (id=${event.eventId}) contains no 'recipient_keys'" +
+ " property; cannot prevent unknown-key attack")
throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY,
String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "recipient_keys"))
}
@@ -161,9 +159,9 @@ internal class MXOlmDecryption(
val messageBody = message["body"] as? String ?: return null
val messageType = when (val typeAsVoid = message["type"]) {
is Double -> typeAsVoid.toInt()
- is Int -> typeAsVoid
- is Long -> typeAsVoid.toInt()
- else -> return null
+ is Int -> typeAsVoid
+ is Long -> typeAsVoid.toInt()
+ else -> return null
}
// Try each session in turn
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
index 12937a2b2e..52a9a4f8c6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
@@ -28,4 +28,4 @@ internal class MXOlmDecryptionFactory @Inject constructor(private val olmDevice:
olmDevice,
userId)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryption.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryption.kt
index 10d481dcfe..1c275940af 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryption.kt
@@ -18,7 +18,6 @@
package im.vector.matrix.android.internal.crypto.algorithms.olm
-import android.text.TextUtils
import im.vector.matrix.android.api.session.events.model.Content
import im.vector.matrix.android.api.session.events.model.toContent
import im.vector.matrix.android.internal.crypto.DeviceListManager
@@ -28,7 +27,6 @@ import im.vector.matrix.android.internal.crypto.actions.MessageEncrypter
import im.vector.matrix.android.internal.crypto.algorithms.IMXEncrypting
import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import java.util.*
internal class MXOlmEncryption(
private var roomId: String,
@@ -49,7 +47,7 @@ internal class MXOlmEncryption(
val devices = cryptoStore.getUserDevices(userId)?.values ?: emptyList()
for (device in devices) {
val key = device.identityKey()
- if (TextUtils.equals(key, olmDevice.deviceCurve25519Key)) {
+ if (key == olmDevice.deviceCurve25519Key) {
// Don't bother setting up session to ourself
continue
}
@@ -61,16 +59,16 @@ internal class MXOlmEncryption(
}
}
- val messageMap = HashMap()
- messageMap["room_id"] = roomId
- messageMap["type"] = eventType
- messageMap["content"] = eventContent
+ val messageMap = mapOf(
+ "room_id" to roomId,
+ "type" to eventType,
+ "content" to eventContent
+ )
messageEncrypter.encryptMessage(messageMap, deviceInfos)
- return messageMap.toContent()!!
+ return messageMap.toContent()
}
-
/**
* Ensure that the session
*
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
index eff833cf21..ef4057fe26 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
@@ -40,4 +40,4 @@ internal class MXOlmEncryptionFactory @Inject constructor(private val olmDevice:
deviceListManager,
ensureOlmSessionsForUsersAction)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/api/CryptoApi.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/api/CryptoApi.kt
index 263cfef2f8..f4821f8ef3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/api/CryptoApi.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/api/CryptoApi.kt
@@ -16,7 +16,6 @@
*/
package im.vector.matrix.android.internal.crypto.api
-
import im.vector.matrix.android.internal.crypto.model.rest.*
import im.vector.matrix.android.internal.network.NetworkConstants
import retrofit2.Call
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/ElementToDecrypt.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/ElementToDecrypt.kt
index 3bd29ae262..a3fc98f674 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/ElementToDecrypt.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/ElementToDecrypt.kt
@@ -20,7 +20,6 @@ import android.os.Parcelable
import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
import kotlinx.android.parcel.Parcelize
-
fun EncryptedFileInfo.toElementToDecrypt(): ElementToDecrypt? {
// Check the validity of some fields
if (isValid()) {
@@ -35,7 +34,6 @@ fun EncryptedFileInfo.toElementToDecrypt(): ElementToDecrypt? {
return null
}
-
/**
* Represent data to decode an attachment
*/
@@ -44,4 +42,4 @@ data class ElementToDecrypt(
val iv: String,
val k: String,
val sha256: String
-) : Parcelable
\ No newline at end of file
+) : Parcelable
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/MXEncryptedAttachments.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/MXEncryptedAttachments.kt
index c699325562..5f90b636ac 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/MXEncryptedAttachments.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/attachments/MXEncryptedAttachments.kt
@@ -17,7 +17,6 @@
package im.vector.matrix.android.internal.crypto.attachments
import android.util.Base64
-import arrow.core.Try
import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileInfo
import im.vector.matrix.android.internal.crypto.model.rest.EncryptedFileKey
import timber.log.Timber
@@ -50,7 +49,7 @@ object MXEncryptedAttachments {
* @param mimetype the mime type
* @return the encryption file info
*/
- fun encryptAttachment(attachmentStream: InputStream, mimetype: String): Try {
+ fun encryptAttachment(attachmentStream: InputStream, mimetype: String): EncryptionResult {
val t0 = System.currentTimeMillis()
val secureRandom = SecureRandom()
@@ -70,7 +69,7 @@ object MXEncryptedAttachments {
val outStream = ByteArrayOutputStream()
- try {
+ outStream.use {
val encryptCipher = Cipher.getInstance(CIPHER_ALGORITHM)
val secretKeySpec = SecretKeySpec(key, SECRET_KEY_SPEC_ALGORITHM)
val ivParameterSpec = IvParameterSpec(initVectorBytes)
@@ -104,29 +103,17 @@ object MXEncryptedAttachments {
ext = true,
key_ops = listOf("encrypt", "decrypt"),
kty = "oct",
- k = base64ToBase64Url(Base64.encodeToString(key, Base64.DEFAULT))!!
+ k = base64ToBase64Url(Base64.encodeToString(key, Base64.DEFAULT))
),
iv = Base64.encodeToString(initVectorBytes, Base64.DEFAULT).replace("\n", "").replace("=", ""),
- hashes = mapOf("sha256" to base64ToUnpaddedBase64(Base64.encodeToString(messageDigest.digest(), Base64.DEFAULT))!!),
+ hashes = mapOf("sha256" to base64ToUnpaddedBase64(Base64.encodeToString(messageDigest.digest(), Base64.DEFAULT))),
v = "v2"
),
encryptedByteArray = outStream.toByteArray()
)
Timber.v("Encrypt in ${System.currentTimeMillis() - t0} ms")
- return Try.just(result)
- } catch (oom: OutOfMemoryError) {
- Timber.e(oom, "## encryptAttachment failed")
- return Try.Failure(oom)
- } catch (e: Exception) {
- Timber.e(e, "## encryptAttachment failed")
- return Try.Failure(e)
- } finally {
- try {
- outStream.close()
- } catch (e: Exception) {
- Timber.e(e, "## encryptAttachment() : fail to close outStream")
- }
+ return result
}
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackup.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackup.kt
index 786923dad5..b3ee138591 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackup.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackup.kt
@@ -21,7 +21,6 @@ import android.os.Looper
import androidx.annotation.UiThread
import androidx.annotation.VisibleForTesting
import androidx.annotation.WorkerThread
-import arrow.core.Try
import im.vector.matrix.android.api.MatrixCallback
import im.vector.matrix.android.api.auth.data.Credentials
import im.vector.matrix.android.api.failure.Failure
@@ -31,6 +30,7 @@ import im.vector.matrix.android.api.listeners.StepProgressListener
import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener
+import im.vector.matrix.android.api.util.JsonDict
import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
import im.vector.matrix.android.internal.crypto.MXOlmDevice
import im.vector.matrix.android.internal.crypto.MegolmSessionData
@@ -49,6 +49,7 @@ import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrap
import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
import im.vector.matrix.android.internal.crypto.store.db.model.KeysBackupDataEntity
import im.vector.matrix.android.internal.di.MoshiProvider
+import im.vector.matrix.android.internal.di.UserId
import im.vector.matrix.android.internal.extensions.foldToCallback
import im.vector.matrix.android.internal.session.SessionScope
import im.vector.matrix.android.internal.task.Task
@@ -57,6 +58,7 @@ import im.vector.matrix.android.internal.task.TaskThread
import im.vector.matrix.android.internal.task.configureWith
import im.vector.matrix.android.internal.util.JsonCanonicalizer
import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import im.vector.matrix.android.internal.util.awaitCallback
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
@@ -76,6 +78,7 @@ import kotlin.random.Random
@SessionScope
internal class KeysBackup @Inject constructor(
+ @UserId private val userId: String,
private val credentials: Credentials,
private val cryptoStore: IMXCryptoStore,
private val olmDevice: MXOlmDevice,
@@ -141,8 +144,8 @@ internal class KeysBackup @Inject constructor(
progressListener: ProgressListener?,
callback: MatrixCallback) {
GlobalScope.launch(coroutineDispatchers.main) {
- withContext(coroutineDispatchers.crypto) {
- Try {
+ runCatching {
+ withContext(coroutineDispatchers.crypto) {
val olmPkDecryption = OlmPkDecryption()
val megolmBackupAuthData = MegolmBackupAuthData()
@@ -178,7 +181,6 @@ internal class KeysBackup @Inject constructor(
megolmBackupAuthData.signatures = objectSigner.signObject(canonicalJson)
-
val megolmBackupCreationInfo = MegolmBackupCreationInfo()
megolmBackupCreationInfo.algorithm = MXCRYPTO_ALGORITHM_MEGOLM_BACKUP
megolmBackupCreationInfo.authData = megolmBackupAuthData
@@ -194,22 +196,23 @@ internal class KeysBackup @Inject constructor(
callback: MatrixCallback) {
val createKeysBackupVersionBody = CreateKeysBackupVersionBody()
createKeysBackupVersionBody.algorithm = keysBackupCreationInfo.algorithm
+ @Suppress("UNCHECKED_CAST")
createKeysBackupVersionBody.authData = MoshiProvider.providesMoshi().adapter(Map::class.java)
- .fromJson(keysBackupCreationInfo.authData?.toJsonString()) as Map?
+ .fromJson(keysBackupCreationInfo.authData?.toJsonString() ?: "") as JsonDict?
keysBackupStateManager.state = KeysBackupState.Enabling
createKeysBackupVersionTask
.configureWith(createKeysBackupVersionBody) {
this.callback = object : MatrixCallback {
- override fun onSuccess(info: KeysVersion) {
+ override fun onSuccess(data: KeysVersion) {
// Reset backup markers.
cryptoStore.resetBackupMarkers()
val keyBackupVersion = KeysVersionResult()
keyBackupVersion.algorithm = createKeysBackupVersionBody.algorithm
keyBackupVersion.authData = createKeysBackupVersionBody.authData
- keyBackupVersion.version = info.version
+ keyBackupVersion.version = data.version
// We can consider that the server does not have keys yet
keyBackupVersion.count = 0
@@ -217,7 +220,7 @@ internal class KeysBackup @Inject constructor(
enableKeysBackup(keyBackupVersion)
- callback.onSuccess(info)
+ callback.onSuccess(data)
}
override fun onFailure(failure: Throwable) {
@@ -275,7 +278,8 @@ internal class KeysBackup @Inject constructor(
val keysBackupData = cryptoStore.getKeysBackupData()
val totalNumberOfKeysServer = keysBackupData?.backupLastServerNumberOfKeys ?: -1
- val hashServer = keysBackupData?.backupLastServerHash
+ // Not used for the moment
+ // val hashServer = keysBackupData?.backupLastServerHash
return when {
totalNumberOfKeysLocally < totalNumberOfKeysServer -> {
@@ -293,7 +297,6 @@ internal class KeysBackup @Inject constructor(
override fun getTotalNumbersOfKeys(): Int {
return cryptoStore.inboundGroupSessionsCount(false)
-
}
override fun getTotalNumbersOfBackedUpKeys(): Int {
@@ -374,8 +377,6 @@ internal class KeysBackup @Inject constructor(
*/
@WorkerThread
private fun getKeysBackupTrustBg(keysBackupVersion: KeysVersionResult): KeysBackupVersionTrust {
- val myUserId = credentials.userId
-
val keysBackupVersionTrust = KeysBackupVersionTrust()
val authData = keysBackupVersion.getAuthDataAsMegolmBackupAuthData()
@@ -387,13 +388,13 @@ internal class KeysBackup @Inject constructor(
return keysBackupVersionTrust
}
- val mySigs = authData.signatures?.get(myUserId)
+ val mySigs = authData.signatures?.get(userId)
if (mySigs.isNullOrEmpty()) {
Timber.v("getKeysBackupTrust: Ignoring key backup because it lacks any signatures from this user")
return keysBackupVersionTrust
}
- for (keyId in mySigs.keys) {
+ for ((keyId, mySignature) in mySigs) {
// XXX: is this how we're supposed to get the device id?
var deviceId: String? = null
val components = keyId.split(":")
@@ -402,7 +403,7 @@ internal class KeysBackup @Inject constructor(
}
if (deviceId != null) {
- val device = cryptoStore.getUserDevice(deviceId, myUserId)
+ val device = cryptoStore.getUserDevice(deviceId, userId)
var isSignatureValid = false
if (device == null) {
@@ -411,10 +412,10 @@ internal class KeysBackup @Inject constructor(
val fingerprint = device.fingerprint()
if (fingerprint != null) {
try {
- olmDevice.verifySignature(fingerprint, authData.signalableJSONDictionary(), mySigs[keyId] as String)
+ olmDevice.verifySignature(fingerprint, authData.signalableJSONDictionary(), mySignature)
isSignatureValid = true
} catch (e: OlmException) {
- Timber.v("getKeysBackupTrust: Bad signature from device " + device.deviceId + " " + e.localizedMessage)
+ Timber.v(e, "getKeysBackupTrust: Bad signature from device ${device.deviceId}")
}
}
@@ -449,10 +450,8 @@ internal class KeysBackup @Inject constructor(
} else {
GlobalScope.launch(coroutineDispatchers.main) {
val updateKeysBackupVersionBody = withContext(coroutineDispatchers.crypto) {
- val myUserId = credentials.userId
-
// Get current signatures, or create an empty set
- val myUserSignatures = authData.signatures?.get(myUserId)?.toMutableMap()
+ val myUserSignatures = authData.signatures?.get(userId)?.toMutableMap()
?: HashMap()
if (trust) {
@@ -461,7 +460,7 @@ internal class KeysBackup @Inject constructor(
val deviceSignatures = objectSigner.signObject(canonicalJson)
- deviceSignatures[myUserId]?.forEach { entry ->
+ deviceSignatures[userId]?.forEach { entry ->
myUserSignatures[entry.key] = entry.value
}
} else {
@@ -477,13 +476,14 @@ internal class KeysBackup @Inject constructor(
val newMegolmBackupAuthData = authData.copy()
val newSignatures = newMegolmBackupAuthData.signatures!!.toMutableMap()
- newSignatures[myUserId] = myUserSignatures
+ newSignatures[userId] = myUserSignatures
newMegolmBackupAuthData.signatures = newSignatures
val moshi = MoshiProvider.providesMoshi()
val adapter = moshi.adapter(Map::class.java)
+ @Suppress("UNCHECKED_CAST")
updateKeysBackupVersionBody.authData = adapter.fromJson(newMegolmBackupAuthData.toJsonString()) as Map?
updateKeysBackupVersionBody
@@ -615,8 +615,8 @@ internal class KeysBackup @Inject constructor(
Timber.v("restoreKeysWithRecoveryKey: From backup version: ${keysVersionResult.version}")
GlobalScope.launch(coroutineDispatchers.main) {
- withContext(coroutineDispatchers.crypto) {
- Try {
+ runCatching {
+ val decryption = withContext(coroutineDispatchers.crypto) {
// Check if the recovery is valid before going any further
if (!isValidRecoveryKeyForKeysBackupVersion(recoveryKey, keysVersionResult)) {
Timber.e("restoreKeysWithRecoveryKey: Invalid recovery key for this keys version")
@@ -624,85 +624,66 @@ internal class KeysBackup @Inject constructor(
}
// Get a PK decryption instance
- val decryption = pkDecryptionFromRecoveryKey(recoveryKey)
- if (decryption == null) {
- // This should not happen anymore
- Timber.e("restoreKeysWithRecoveryKey: Invalid recovery key. Error")
- throw InvalidParameterException("Invalid recovery key")
- }
-
- decryption!!
+ pkDecryptionFromRecoveryKey(recoveryKey)
+ }
+ if (decryption == null) {
+ // This should not happen anymore
+ Timber.e("restoreKeysWithRecoveryKey: Invalid recovery key. Error")
+ throw InvalidParameterException("Invalid recovery key")
}
- }.fold(
- {
- callback.onFailure(it)
- },
- { decryption ->
- stepProgressListener?.onStepProgress(StepProgressListener.Step.DownloadingKey)
- // Get backed up keys from the homeserver
- getKeys(sessionId, roomId, keysVersionResult.version!!, object : MatrixCallback {
- override fun onSuccess(data: KeysBackupData) {
- GlobalScope.launch(coroutineDispatchers.main) {
- val importRoomKeysResult = withContext(coroutineDispatchers.crypto) {
- val sessionsData = ArrayList()
- // Restore that data
- var sessionsFromHsCount = 0
- for (roomIdLoop in data.roomIdToRoomKeysBackupData.keys) {
- for (sessionIdLoop in data.roomIdToRoomKeysBackupData[roomIdLoop]!!.sessionIdToKeyBackupData.keys) {
- sessionsFromHsCount++
+ stepProgressListener?.onStepProgress(StepProgressListener.Step.DownloadingKey)
- val keyBackupData = data.roomIdToRoomKeysBackupData[roomIdLoop]!!.sessionIdToKeyBackupData[sessionIdLoop]!!
+ // Get backed up keys from the homeserver
+ val data = getKeys(sessionId, roomId, keysVersionResult.version!!)
- val sessionData = decryptKeyBackupData(keyBackupData, sessionIdLoop, roomIdLoop, decryption)
+ withContext(coroutineDispatchers.crypto) {
+ val sessionsData = ArrayList()
+ // Restore that data
+ var sessionsFromHsCount = 0
+ for ((roomIdLoop, backupData) in data.roomIdToRoomKeysBackupData) {
+ for ((sessionIdLoop, keyBackupData) in backupData.sessionIdToKeyBackupData) {
+ sessionsFromHsCount++
- sessionData?.let {
- sessionsData.add(it)
- }
- }
- }
- Timber.v("restoreKeysWithRecoveryKey: Decrypted " + sessionsData.size + " keys out of "
- + sessionsFromHsCount + " from the backup store on the homeserver")
+ val sessionData = decryptKeyBackupData(keyBackupData, sessionIdLoop, roomIdLoop, decryption)
- // Do not trigger a backup for them if they come from the backup version we are using
- val backUp = keysVersionResult.version != keysBackupVersion?.version
- if (backUp) {
- Timber.v("restoreKeysWithRecoveryKey: Those keys will be backed up to backup version: "
- + keysBackupVersion?.version)
- }
-
- // Import them into the crypto store
- val progressListener = if (stepProgressListener != null) {
- object : ProgressListener {
- override fun onProgress(progress: Int, total: Int) {
- // Note: no need to post to UI thread, importMegolmSessionsData() will do it
- stepProgressListener.onStepProgress(StepProgressListener.Step.ImportingKey(progress, total))
- }
- }
- } else {
- null
- }
-
- val result = megolmSessionDataImporter.handle(sessionsData, !backUp, uiHandler, progressListener)
-
- // Do not back up the key if it comes from a backup recovery
- if (backUp) {
- maybeBackupKeys()
- }
-
- result
- }
-
- callback.onSuccess(importRoomKeysResult)
- }
+ sessionData?.let {
+ sessionsData.add(it)
}
-
- override fun onFailure(failure: Throwable) {
- callback.onFailure(failure)
- }
- })
+ }
}
- )
+ Timber.v("restoreKeysWithRecoveryKey: Decrypted ${sessionsData.size} keys out" +
+ " of $sessionsFromHsCount from the backup store on the homeserver")
+
+ // Do not trigger a backup for them if they come from the backup version we are using
+ val backUp = keysVersionResult.version != keysBackupVersion?.version
+ if (backUp) {
+ Timber.v("restoreKeysWithRecoveryKey: Those keys will be backed up" +
+ " to backup version: ${keysBackupVersion?.version}")
+ }
+
+ // Import them into the crypto store
+ val progressListener = if (stepProgressListener != null) {
+ object : ProgressListener {
+ override fun onProgress(progress: Int, total: Int) {
+ // Note: no need to post to UI thread, importMegolmSessionsData() will do it
+ stepProgressListener.onStepProgress(StepProgressListener.Step.ImportingKey(progress, total))
+ }
+ }
+ } else {
+ null
+ }
+
+ val result = megolmSessionDataImporter.handle(sessionsData, !backUp, uiHandler, progressListener)
+
+ // Do not back up the key if it comes from a backup recovery
+ if (backUp) {
+ maybeBackupKeys()
+ }
+
+ result
+ }
+ }.foldToCallback(callback)
}
}
@@ -715,7 +696,7 @@ internal class KeysBackup @Inject constructor(
Timber.v("[MXKeyBackup] restoreKeyBackup with password: From backup version: ${keysBackupVersion.version}")
GlobalScope.launch(coroutineDispatchers.main) {
- withContext(coroutineDispatchers.crypto) {
+ runCatching {
val progressListener = if (stepProgressListener != null) {
object : ProgressListener {
override fun onProgress(progress: Int, total: Int) {
@@ -728,22 +709,18 @@ internal class KeysBackup @Inject constructor(
null
}
- Try {
+ val recoveryKey = withContext(coroutineDispatchers.crypto) {
recoveryKeyFromPassword(password, keysBackupVersion, progressListener)
}
- }.fold(
- {
- callback.onFailure(it)
- },
- { recoveryKey ->
- if (recoveryKey == null) {
- Timber.v("backupKeys: Invalid configuration")
- callback.onFailure(IllegalStateException("Invalid configuration"))
- } else {
- restoreKeysWithRecoveryKey(keysBackupVersion, recoveryKey, roomId, sessionId, stepProgressListener, callback)
- }
+ if (recoveryKey == null) {
+ Timber.v("backupKeys: Invalid configuration")
+ throw IllegalStateException("Invalid configuration")
+ } else {
+ awaitCallback {
+ restoreKeysWithRecoveryKey(keysBackupVersion, recoveryKey, roomId, sessionId, stepProgressListener, it)
}
- )
+ }
+ }.foldToCallback(callback)
}
}
@@ -751,60 +728,26 @@ internal class KeysBackup @Inject constructor(
* Same method as [RoomKeysRestClient.getRoomKey] except that it accepts nullable
* parameters and always returns a KeysBackupData object through the Callback
*/
- private fun getKeys(sessionId: String?,
+ private suspend fun getKeys(sessionId: String?,
roomId: String?,
- version: String,
- callback: MatrixCallback) {
- if (roomId != null && sessionId != null) {
+ version: String): KeysBackupData {
+ return if (roomId != null && sessionId != null) {
// Get key for the room and for the session
- getRoomSessionDataTask
- .configureWith(GetRoomSessionDataTask.Params(roomId, sessionId, version)) {
- this.callback = object : MatrixCallback {
- override fun onSuccess(data: KeyBackupData) {
- // Convert to KeysBackupData
- val keysBackupData = KeysBackupData()
- keysBackupData.roomIdToRoomKeysBackupData = HashMap()
- val roomKeysBackupData = RoomKeysBackupData()
- roomKeysBackupData.sessionIdToKeyBackupData = HashMap()
- roomKeysBackupData.sessionIdToKeyBackupData[sessionId] = data
- keysBackupData.roomIdToRoomKeysBackupData[roomId] = roomKeysBackupData
-
- callback.onSuccess(keysBackupData)
- }
-
- override fun onFailure(failure: Throwable) {
- callback.onFailure(failure)
- }
- }
- }
- .executeBy(taskExecutor)
+ val data = getRoomSessionDataTask.execute(GetRoomSessionDataTask.Params(roomId, sessionId, version))
+ // Convert to KeysBackupData
+ KeysBackupData(mutableMapOf(
+ roomId to RoomKeysBackupData(mutableMapOf(
+ sessionId to data
+ ))
+ ))
} else if (roomId != null) {
// Get all keys for the room
- getRoomSessionsDataTask
- .configureWith(GetRoomSessionsDataTask.Params(roomId, version)) {
- this.callback = object : MatrixCallback {
- override fun onSuccess(data: RoomKeysBackupData) {
- // Convert to KeysBackupData
- val keysBackupData = KeysBackupData()
- keysBackupData.roomIdToRoomKeysBackupData = HashMap()
- keysBackupData.roomIdToRoomKeysBackupData[roomId] = data
-
- callback.onSuccess(keysBackupData)
- }
-
- override fun onFailure(failure: Throwable) {
- callback.onFailure(failure)
- }
- }
- }
- .executeBy(taskExecutor)
+ val data = getRoomSessionsDataTask.execute(GetRoomSessionsDataTask.Params(roomId, version))
+ // Convert to KeysBackupData
+ KeysBackupData(mutableMapOf(roomId to data))
} else {
// Get all keys
- getSessionsDataTask
- .configureWith(GetSessionsDataTask.Params(version)) {
- this.callback = callback
- }
- .executeBy(taskExecutor)
+ getSessionsDataTask.execute(GetSessionsDataTask.Params(version))
}
}
@@ -823,7 +766,6 @@ internal class KeysBackup @Inject constructor(
} catch (e: OlmException) {
Timber.e(e, "OlmException")
}
-
}
return decryption
@@ -981,12 +923,11 @@ internal class KeysBackup @Inject constructor(
keysBackupStateManager.state = KeysBackupState.Disabled
} else {
getKeysBackupTrust(keyBackupVersion, object : MatrixCallback {
-
override fun onSuccess(data: KeysBackupVersionTrust) {
val versionInStore = cryptoStore.getKeyBackupVersion()
if (data.usable) {
- Timber.v("checkAndStartWithKeysBackupVersion: Found usable key backup. version: " + keyBackupVersion.version)
+ Timber.v("checkAndStartWithKeysBackupVersion: Found usable key backup. version: ${keyBackupVersion.version}")
// Check the version we used at the previous app run
if (versionInStore != null && versionInStore != keyBackupVersion.version) {
Timber.v(" -> clean the previously used version $versionInStore")
@@ -996,7 +937,7 @@ internal class KeysBackup @Inject constructor(
Timber.v(" -> enabling key backups")
enableKeysBackup(keyBackupVersion)
} else {
- Timber.v("checkAndStartWithKeysBackupVersion: No usable key backup. version: " + keyBackupVersion.version)
+ Timber.v("checkAndStartWithKeysBackupVersion: No usable key backup. version: ${keyBackupVersion.version}")
if (versionInStore != null) {
Timber.v(" -> disabling key backup")
resetKeysBackupData()
@@ -1009,7 +950,6 @@ internal class KeysBackup @Inject constructor(
override fun onFailure(failure: Throwable) {
// Cannot happen
}
-
})
}
}
@@ -1201,7 +1141,7 @@ internal class KeysBackup @Inject constructor(
// Get a chunk of keys to backup
val olmInboundGroupSessionWrappers = cryptoStore.inboundGroupSessionsToBackup(KEY_BACKUP_SEND_KEYS_MAX_COUNT)
- Timber.v("backupKeys: 1 - " + olmInboundGroupSessionWrappers.size + " sessions to back up")
+ Timber.v("backupKeys: 1 - ${olmInboundGroupSessionWrappers.size} sessions to back up")
if (olmInboundGroupSessionWrappers.isEmpty()) {
// Backup is up to date
@@ -1412,5 +1352,5 @@ internal class KeysBackup @Inject constructor(
* DEBUG INFO
* ========================================================================================== */
- override fun toString() = "KeysBackup for ${credentials.userId}"
+ override fun toString() = "KeysBackup for $userId"
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPassword.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPassword.kt
index eabd5dff04..344ba61277 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPassword.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPassword.kt
@@ -27,7 +27,6 @@ import javax.crypto.Mac
import javax.crypto.spec.SecretKeySpec
import kotlin.experimental.xor
-
private const val SALT_LENGTH = 32
private const val DEFAULT_ITERATION = 500_000
@@ -133,7 +132,7 @@ private fun deriveKey(password: String,
}
}
- Timber.v("KeysBackupPassword", "## deriveKeys() : " + iterations + " in " + (System.currentTimeMillis() - t0) + " ms")
+ Timber.v("KeysBackupPassword: deriveKeys() : " + iterations + " in " + (System.currentTimeMillis() - t0) + " ms")
return dk
}
@@ -149,4 +148,4 @@ private fun generateSalt(): String {
}
return salt.substring(0, SALT_LENGTH)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/api/RoomKeysApi.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/api/RoomKeysApi.kt
index 73b6112fd8..f5d89fb5eb 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/api/RoomKeysApi.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/api/RoomKeysApi.kt
@@ -142,7 +142,6 @@ internal interface RoomKeysApi {
@GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "room_keys/keys")
fun getSessionsData(@Query("version") version: String): Call
-
/* ==========================================================================================
* Deleting keys
* ========================================================================================== */
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt
index fce77b33e5..caf4aaad0b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt
@@ -32,5 +32,4 @@ class KeyBackupVersionTrustSignature {
*Flag to indicate the signature from this device is valid.
*/
var valid = false
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt
index ed765d1449..fc642b3fb2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt
@@ -30,4 +30,4 @@ data class KeysBackupVersionTrust(
* Signatures found in the backup version.
*/
var signatures: MutableList = ArrayList()
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt
index afa6b77921..d91189a4bf 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt
@@ -38,5 +38,4 @@ class KeysBackupVersionTrustSignature {
* Flag to indicate the signature from this device is valid.
*/
var valid = false
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt
index 2be7806b86..a08ba9ba96 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt
@@ -35,5 +35,4 @@ class MegolmBackupCreationInfo {
* The Base58 recovery key.
*/
var recoveryKey: String = ""
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt
index 20e7357a39..6fba833589 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt
@@ -17,6 +17,7 @@
package im.vector.matrix.android.internal.crypto.keysbackup.model.rest
import com.squareup.moshi.Json
+import im.vector.matrix.android.api.util.JsonDict
import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupAuthData
import im.vector.matrix.android.internal.di.MoshiProvider
@@ -49,7 +50,7 @@ open class KeysAlgorithmAndData {
* algorithm-dependent data, for "m.megolm_backup.v1.curve25519-aes-sha2" see [im.vector.matrix.android.internal.crypto.keysbackup.MegolmBackupAuthData]
*/
@Json(name = "auth_data")
- var authData: Map? = null
+ var authData: JsonDict? = null
/**
* Facility method to convert authData to a MegolmBackupAuthData object
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt
index bff8f13894..4510cdd773 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt
@@ -28,4 +28,4 @@ data class KeysVersionResult(
// The number of keys stored in the backup.
var count: Int? = null
-) : KeysAlgorithmAndData()
\ No newline at end of file
+) : KeysAlgorithmAndData()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt
index e2d628c459..cb8ba5e26c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt
@@ -22,4 +22,4 @@ import com.squareup.moshi.JsonClass
data class UpdateKeysBackupVersionBody(
// the backup version, mandatory
val version: String
-) : KeysAlgorithmAndData()
\ No newline at end of file
+) : KeysAlgorithmAndData()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
index 5aaaaea5b3..78ae0f7ea6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
@@ -28,7 +28,6 @@ internal interface CreateKeysBackupVersionTask : Task {
data class Params(
val version: String
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
index 3007622690..874a1749d6 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
@@ -27,7 +27,6 @@ internal interface GetKeysBackupLastVersionTask : Task
internal class DefaultGetKeysBackupLastVersionTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
: GetKeysBackupLastVersionTask {
-
override suspend fun execute(params: Unit): KeysVersionResult {
return executeRequest {
apiCall = roomKeysApi.getKeysBackupLastVersion()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
index c36f039c3c..ea0b9b9f3a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
@@ -27,7 +27,6 @@ internal interface GetKeysBackupVersionTask : Task
internal class DefaultGetKeysBackupVersionTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
: GetKeysBackupVersionTask {
-
override suspend fun execute(params: String): KeysVersionResult {
return executeRequest {
apiCall = roomKeysApi.getKeysBackupVersion(params)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
index e8888f2590..ba903de8c1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
@@ -22,7 +22,6 @@ import im.vector.matrix.android.internal.network.executeRequest
import im.vector.matrix.android.internal.task.Task
import javax.inject.Inject
-
internal interface GetRoomSessionsDataTask : Task {
data class Params(
val roomId: String,
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
index 28aedaf800..30b60af418 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
@@ -32,7 +32,6 @@ internal interface UpdateKeysBackupVersionTask : Task? = null
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXUsersDevicesMap.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXUsersDevicesMap.kt
index 348b6ade12..bbad25ef51 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXUsersDevicesMap.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXUsersDevicesMap.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.internal.crypto.model
-
class MXUsersDevicesMap {
// A map of maps (userId -> (deviceId -> Object)).
@@ -119,4 +118,4 @@ class MXUsersDevicesMap {
override fun toString(): String {
return "MXUsersDevicesMap $map"
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmInboundGroupSessionWrapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
index 646f6b9c5b..361b8bc205 100755
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
@@ -17,13 +17,11 @@
package im.vector.matrix.android.internal.crypto.model
-import android.text.TextUtils
import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
import im.vector.matrix.android.internal.crypto.MegolmSessionData
import org.matrix.olm.OlmInboundGroupSession
import timber.log.Timber
import java.io.Serializable
-import java.util.*
/**
* This class adds more context to a OlmInboundGroupSession object.
@@ -57,7 +55,6 @@ class OlmInboundGroupSessionWrapper : Serializable {
} catch (e: Exception) {
Timber.e(e, "## getFirstKnownIndex() : getFirstKnownIndex failed")
}
-
}
return null
@@ -79,7 +76,6 @@ class OlmInboundGroupSessionWrapper : Serializable {
} catch (e: Exception) {
Timber.e(e, "Cannot create")
}
-
}
/**
@@ -93,7 +89,7 @@ class OlmInboundGroupSessionWrapper : Serializable {
try {
olmInboundGroupSession = OlmInboundGroupSession.importSession(megolmSessionData.sessionKey!!)
- if (!TextUtils.equals(olmInboundGroupSession!!.sessionIdentifier(), megolmSessionData.sessionId)) {
+ if (olmInboundGroupSession!!.sessionIdentifier() != megolmSessionData.sessionId) {
throw Exception("Mismatched group session Id")
}
@@ -149,9 +145,8 @@ class OlmInboundGroupSessionWrapper : Serializable {
} catch (e: Exception) {
Timber.e(e, "## exportSession() : export failed")
}
-
}
return null
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmSessionWrapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmSessionWrapper.kt
index a413abd5d8..acd056d9b9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmSessionWrapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/OlmSessionWrapper.kt
@@ -33,4 +33,4 @@ data class OlmSessionWrapper(
fun onMessageReceived() {
lastReceivedMessageTs = System.currentTimeMillis()
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptedEventContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptedEventContent.kt
index 4d06b737e8..3efb2f59ad 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptedEventContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptedEventContent.kt
@@ -55,6 +55,6 @@ data class EncryptedEventContent(
@Json(name = "session_id")
val sessionId: String? = null,
- //Relation context is in clear in encrypted message
+ // Relation context is in clear in encrypted message
@Json(name = "m.relates_to") val relatesTo: RelationDefaultContent? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptionEventContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptionEventContent.kt
index 22df41e903..6de50f84c2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptionEventContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/EncryptionEventContent.kt
@@ -41,4 +41,4 @@ data class EncryptionEventContent(
*/
@Json(name = "rotation_period_msgs")
var rotationPeriodMsgs: Long? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/OlmPayloadContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/OlmPayloadContent.kt
index c33ddb41a9..bf5833a44f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/OlmPayloadContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/event/OlmPayloadContent.kt
@@ -58,5 +58,3 @@ data class OlmPayloadContent(
}
}
}
-
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceInfo.kt
index 1bd5f671cc..1289ef3d92 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/DeviceInfo.kt
@@ -59,5 +59,4 @@ data class DeviceInfo(
override val date: Long
get() = lastSeenTs ?: 0
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedFileKey.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedFileKey.kt
index 3cf1e3083a..799819ceee 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedFileKey.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedFileKey.kt
@@ -77,4 +77,3 @@ data class EncryptedFileKey(
return true
}
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedMessage.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedMessage.kt
index bd070e3186..c546cd04c4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedMessage.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/EncryptedMessage.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.internal.crypto.model.rest
-
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/ForwardedRoomKeyContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/ForwardedRoomKeyContent.kt
index b887989f23..cf8652352c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/ForwardedRoomKeyContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/ForwardedRoomKeyContent.kt
@@ -44,4 +44,4 @@ data class ForwardedRoomKeyContent(
@Json(name = "sender_claimed_ed25519_key")
val senderClaimedEd25519Key: String? = null
-)
\ No newline at end of file
+)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationCancel.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationCancel.kt
index 1d4a9b345a..b5c45e9566 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationCancel.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationCancel.kt
@@ -57,4 +57,4 @@ data class KeyVerificationCancel(
}
return true
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationKey.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationKey.kt
index b5e3323236..4c6243fee3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationKey.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationKey.kt
@@ -18,7 +18,6 @@ package im.vector.matrix.android.internal.crypto.model.rest
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
-
/**
* Sent by both devices to send their ephemeral Curve25519 public key to the other device.
*/
@@ -54,5 +53,4 @@ data class KeyVerificationKey(
}
return true
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationMac.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationMac.kt
index 19dbbe5dda..8732e366d2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationMac.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationMac.kt
@@ -62,5 +62,4 @@ data class KeyVerificationMac(
}
}
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationStart.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationStart.kt
index b042e32fef..081b19161a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationStart.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationStart.kt
@@ -74,7 +74,6 @@ class KeyVerificationStart : SendToDeviceObject {
@Json(name = "short_authentication_string")
var shortAuthenticationStrings: List? = null
-
companion object {
const val VERIF_METHOD_SAS = "m.sas.v1"
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimBody.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimBody.kt
index 3ae5ba20ad..87b9891ffa 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimBody.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimBody.kt
@@ -37,4 +37,3 @@ data class KeysClaimBody(
@Json(name = "one_time_keys")
var oneTimeKeys: Map>
)
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimResponse.kt
index 989267946b..976743d8bc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimResponse.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysClaimResponse.kt
@@ -32,4 +32,3 @@ data class KeysClaimResponse(
@Json(name = "one_time_keys")
var oneTimeKeys: Map>>>? = null
)
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysUploadResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysUploadResponse.kt
index 72e148baf5..b68c13bf4d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysUploadResponse.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeysUploadResponse.kt
@@ -51,4 +51,3 @@ data class KeysUploadResponse(
return oneTimeKeyCounts?.containsKey(algorithm) == true
}
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShare.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShare.kt
index 5d7d49f564..00ad490e1d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShare.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShare.kt
@@ -35,4 +35,4 @@ open class RoomKeyShare : SendToDeviceObject {
const val ACTION_SHARE_REQUEST = "request"
const val ACTION_SHARE_CANCELLATION = "request_cancellation"
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShareCancellation.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShareCancellation.kt
index d763c5544b..768c2d71c5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShareCancellation.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShareCancellation.kt
@@ -25,4 +25,4 @@ class RoomKeyShareCancellation : RoomKeyShare() {
init {
action = ACTION_SHARE_CANCELLATION
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShareRequest.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShareRequest.kt
index 4374325870..0d8f7f8738 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShareRequest.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/RoomKeyShareRequest.kt
@@ -29,4 +29,4 @@ class RoomKeyShareRequest : RoomKeyShare() {
init {
action = ACTION_SHARE_REQUEST
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SendToDeviceBody.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SendToDeviceBody.kt
index 0c873e8247..8b95d7c686 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SendToDeviceBody.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/SendToDeviceBody.kt
@@ -25,4 +25,4 @@ class SendToDeviceBody {
* The device ID may also be *, meaning all known devices for the user.
*/
var messages: Map>? = null
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UpdateDeviceInfoBody.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UpdateDeviceInfoBody.kt
index 3a7da69db8..161c5d0354 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UpdateDeviceInfoBody.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/UpdateDeviceInfoBody.kt
@@ -29,4 +29,3 @@ data class UpdateDeviceInfoBody(
var displayName: String? = null
)
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt
index 24d213cfdb..879e565b57 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt
@@ -41,5 +41,4 @@ internal class WarnOnUnknownDeviceRepository @Inject constructor() {
fun setWarnOnUnknownDevices(warn: Boolean) {
warnOnUnknownDevices = warn
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/IMXCryptoStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/IMXCryptoStore.kt
index 1b19db2b89..4e8dfcb2b0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/IMXCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/IMXCryptoStore.kt
@@ -179,7 +179,7 @@ internal interface IMXCryptoStore {
* @param userId The user's id.
* @param devices A map from device id to 'MXDevice' object for the device.
*/
- fun storeUserDevices(userId: String, devices: Map)
+ fun storeUserDevices(userId: String, devices: Map?)
/**
* Retrieve the known devices for a user.
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/Helper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/Helper.kt
index 4ba484ae1a..5ef2b9b1a2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/Helper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/Helper.kt
@@ -27,46 +27,42 @@ import java.io.ObjectInputStream
import java.io.ObjectOutputStream
import java.util.zip.GZIPInputStream
-
/**
* Get realm, invoke the action, close realm, and return the result of the action
*/
fun doWithRealm(realmConfiguration: RealmConfiguration, action: (Realm) -> T): T {
- val realm = Realm.getInstance(realmConfiguration)
- val result = action.invoke(realm)
- realm.close()
- return result
+ return Realm.getInstance(realmConfiguration).use { realm ->
+ action.invoke(realm)
+ }
}
/**
* Get realm, do the query, copy from realm, close realm, and return the copied result
*/
fun doRealmQueryAndCopy(realmConfiguration: RealmConfiguration, action: (Realm) -> T?): T? {
- val realm = Realm.getInstance(realmConfiguration)
- val result = action.invoke(realm)
- val copiedResult = result?.let { realm.copyFromRealm(result) }
- realm.close()
- return copiedResult
+ return Realm.getInstance(realmConfiguration).use { realm ->
+ val result = action.invoke(realm)
+ result?.let { realm.copyFromRealm(it) }
+ }
}
/**
* Get realm, do the list query, copy from realm, close realm, and return the copied result
*/
fun doRealmQueryAndCopyList(realmConfiguration: RealmConfiguration, action: (Realm) -> Iterable): Iterable {
- val realm = Realm.getInstance(realmConfiguration)
- val result = action.invoke(realm)
- val copiedResult = realm.copyFromRealm(result)
- realm.close()
- return copiedResult
+ return Realm.getInstance(realmConfiguration).use { realm ->
+ val result = action.invoke(realm)
+ realm.copyFromRealm(result)
+ }
}
/**
* Get realm instance, invoke the action in a transaction and close realm
*/
fun doRealmTransaction(realmConfiguration: RealmConfiguration, action: (Realm) -> Unit) {
- val realm = Realm.getInstance(realmConfiguration)
- realm.executeTransaction { action.invoke(it) }
- realm.close()
+ Realm.getInstance(realmConfiguration).use { realm ->
+ realm.executeTransaction { action.invoke(realm) }
+ }
}
/**
@@ -101,6 +97,7 @@ fun deserializeFromRealm(string: String?): T? {
val gzis = GZIPInputStream(bais)
val ois = ObjectInputStream(gzis)
+ @Suppress("UNCHECKED_CAST")
val result = ois.readObject() as T
ois.close()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt
index 9865614c9f..d88a84de9e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.internal.crypto.store.db
-import android.text.TextUtils
import im.vector.matrix.android.api.auth.data.Credentials
import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest
import im.vector.matrix.android.internal.crypto.NewSessionListener
@@ -60,7 +59,6 @@ internal class RealmCryptoStore(private val realmConfiguration: RealmConfigurati
// Cache for InboundGroupSession, to release them properly
private val inboundGroupSessionToRelease = HashMap()
-
private val newSessionListeners = ArrayList()
override fun addNewSessionListener(listener: NewSessionListener) {
@@ -102,8 +100,8 @@ internal class RealmCryptoStore(private val realmConfiguration: RealmConfigurati
// Check credentials
// The device id may not have been provided in credentials.
// Check it only if provided, else trust the stored one.
- if (!TextUtils.equals(currentMetadata.userId, credentials.userId)
- || (credentials.deviceId != null && !TextUtils.equals(credentials.deviceId, currentMetadata.deviceId))) {
+ if (currentMetadata.userId != credentials.userId
+ || (credentials.deviceId != null && credentials.deviceId != currentMetadata.deviceId)) {
Timber.w("## open() : Credentials do not match, close this store and delete data")
deleteAll = true
currentMetadata = null
@@ -209,10 +207,7 @@ internal class RealmCryptoStore(private val realmConfiguration: RealmConfigurati
?.getDeviceInfo()
}
- override fun storeUserDevices(userId: String, devices: Map) {
- if (userId == null) {
- return
- }
+ override fun storeUserDevices(userId: String, devices: Map?) {
doRealmTransaction(realmConfiguration) { realm ->
if (devices == null) {
// Remove the user
@@ -281,7 +276,7 @@ internal class RealmCryptoStore(private val realmConfiguration: RealmConfigurati
try {
sessionIdentifier = olmSessionWrapper.olmSession.sessionIdentifier()
} catch (e: OlmException) {
- Timber.e(e, "## storeSession() : sessionIdentifier failed " + e.message)
+ Timber.e(e, "## storeSession() : sessionIdentifier failed")
}
if (sessionIdentifier != null) {
@@ -360,14 +355,14 @@ internal class RealmCryptoStore(private val realmConfiguration: RealmConfigurati
return
}
- doRealmTransaction(realmConfiguration) {
+ doRealmTransaction(realmConfiguration) { realm ->
sessions.forEach { session ->
var sessionIdentifier: String? = null
try {
sessionIdentifier = session.olmInboundGroupSession?.sessionIdentifier()
} catch (e: OlmException) {
- Timber.e(e, "## storeInboundGroupSession() : sessionIdentifier failed " + e.message)
+ Timber.e(e, "## storeInboundGroupSession() : sessionIdentifier failed")
}
if (sessionIdentifier != null) {
@@ -387,7 +382,7 @@ internal class RealmCryptoStore(private val realmConfiguration: RealmConfigurati
putInboundGroupSession(session)
}
- it.insertOrUpdate(realmOlmInboundGroupSession)
+ realm.insertOrUpdate(realmOlmInboundGroupSession)
}
}
}
@@ -737,5 +732,4 @@ internal class RealmCryptoStore(private val realmConfiguration: RealmConfigurati
}
.toMutableList()
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreModule.kt
index ff2f6cc42e..998274020a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreModule.kt
@@ -34,4 +34,4 @@ import io.realm.annotations.RealmModule
OutgoingRoomKeyRequestEntity::class,
UserEntity::class
])
-internal class RealmCryptoStoreModule
\ No newline at end of file
+internal class RealmCryptoStoreModule
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoMetadataEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoMetadataEntity.kt
index 2c96bb25ed..eae202f966 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoMetadataEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoMetadataEntity.kt
@@ -37,7 +37,6 @@ internal open class CryptoMetadataEntity(
var backupVersion: String? = null
) : RealmObject() {
-
// Deserialize data
fun getOlmAccount(): OlmAccount? {
return deserializeFromRealm(olmAccountData)
@@ -47,4 +46,4 @@ internal open class CryptoMetadataEntity(
fun putOlmAccount(olmAccount: OlmAccount?) {
olmAccountData = serializeForRealm(olmAccount)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoRoomEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoRoomEntity.kt
index fcec259ed9..531f44a838 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoRoomEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoRoomEntity.kt
@@ -27,5 +27,4 @@ internal open class CryptoRoomEntity(
: RealmObject() {
companion object
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/IncomingRoomKeyRequestEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/IncomingRoomKeyRequestEntity.kt
index 707418ab7e..9b1d116aa9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/IncomingRoomKeyRequestEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/IncomingRoomKeyRequestEntity.kt
@@ -53,4 +53,4 @@ internal open class IncomingRoomKeyRequestEntity(
requestBodySessionId = it.sessionId
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/KeysBackupDataEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/KeysBackupDataEntity.kt
index 53ebf146d8..f88202dead 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/KeysBackupDataEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/KeysBackupDataEntity.kt
@@ -27,4 +27,4 @@ internal open class KeysBackupDataEntity(
var backupLastServerHash: String? = null,
// The last known number of backed up keys on the server
var backupLastServerNumberOfKeys: Int? = null
-) : RealmObject()
\ No newline at end of file
+) : RealmObject()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
index 4835300e66..caa8cb9668 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
@@ -44,4 +44,4 @@ internal open class OlmInboundGroupSessionEntity(
}
companion object
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmSessionEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmSessionEntity.kt
index dbc860eff0..c051fe56a2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmSessionEntity.kt
@@ -41,4 +41,4 @@ internal open class OlmSessionEntity(@PrimaryKey var primaryKey: String = "",
}
companion object
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OutgoingRoomKeyRequestEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OutgoingRoomKeyRequestEntity.kt
index d468285882..b7bcb603f5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OutgoingRoomKeyRequestEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OutgoingRoomKeyRequestEntity.kt
@@ -73,5 +73,3 @@ internal open class OutgoingRoomKeyRequestEntity(
}
}
}
-
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/UserEntitiesQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/UserEntitiesQueries.kt
index 3860d8d8ce..8088a14825 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/UserEntitiesQueries.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/UserEntitiesQueries.kt
@@ -42,4 +42,3 @@ internal fun UserEntity.Companion.delete(realm: Realm, userId: String) {
.findFirst()
?.deleteFromRealm()
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
index 23b0f958bf..80f326e083 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
@@ -44,18 +44,14 @@ internal class DefaultClaimOneTimeKeysForUsersDevice @Inject constructor(private
}
val map = MXUsersDevicesMap()
keysClaimResponse.oneTimeKeys?.let { oneTimeKeys ->
- for (userId in oneTimeKeys.keys) {
- val mapByUserId = oneTimeKeys[userId]
+ for ((userId, mapByUserId) in oneTimeKeys) {
+ for ((deviceId, deviceKey) in mapByUserId) {
+ val mxKey = MXKey.from(deviceKey)
- if (mapByUserId != null) {
- for (deviceId in mapByUserId.keys) {
- val mxKey = MXKey.from(mapByUserId[deviceId])
-
- if (mxKey != null) {
- map.setObject(userId, deviceId, mxKey)
- } else {
- Timber.e("## claimOneTimeKeysForUsersDevices : fail to create a MXKey")
- }
+ if (mxKey != null) {
+ map.setObject(userId, deviceId, mxKey)
+ } else {
+ Timber.e("## claimOneTimeKeysForUsersDevices : fail to create a MXKey")
}
}
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt
index 3e6e4d8ca2..0e52c118d9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt
@@ -55,7 +55,6 @@ internal class DefaultDeleteDeviceTask @Inject constructor(private val cryptoApi
} else {
throw throwable
}
-
} else {
// Other error
throw throwable
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DownloadKeysForUsersTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DownloadKeysForUsersTask.kt
index 92908071a1..230af3874e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DownloadKeysForUsersTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DownloadKeysForUsersTask.kt
@@ -16,13 +16,11 @@
package im.vector.matrix.android.internal.crypto.tasks
-import android.text.TextUtils
import im.vector.matrix.android.internal.crypto.api.CryptoApi
import im.vector.matrix.android.internal.crypto.model.rest.KeysQueryBody
import im.vector.matrix.android.internal.crypto.model.rest.KeysQueryResponse
import im.vector.matrix.android.internal.network.executeRequest
import im.vector.matrix.android.internal.task.Task
-import java.util.*
import javax.inject.Inject
internal interface DownloadKeysForUsersTask : Task {
@@ -37,19 +35,13 @@ internal class DefaultDownloadKeysForUsers @Inject constructor(private val crypt
: DownloadKeysForUsersTask {
override suspend fun execute(params: DownloadKeysForUsersTask.Params): KeysQueryResponse {
- val downloadQuery = HashMap>()
-
- if (null != params.userIds) {
- for (userId in params.userIds) {
- downloadQuery[userId] = HashMap()
- }
- }
+ val downloadQuery = params.userIds?.associateWith { emptyMap() }.orEmpty()
val body = KeysQueryBody(
deviceKeys = downloadQuery
)
- if (!TextUtils.isEmpty(params.token)) {
+ if (!params.token.isNullOrEmpty()) {
body.token = params.token
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SetDeviceNameTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SetDeviceNameTask.kt
index 1abef5763e..47f3050b88 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SetDeviceNameTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SetDeviceNameTask.kt
@@ -16,7 +16,6 @@
package im.vector.matrix.android.internal.crypto.tasks
-import android.text.TextUtils
import im.vector.matrix.android.internal.crypto.api.CryptoApi
import im.vector.matrix.android.internal.crypto.model.rest.UpdateDeviceInfoBody
import im.vector.matrix.android.internal.network.executeRequest
@@ -37,7 +36,7 @@ internal class DefaultSetDeviceNameTask @Inject constructor(private val cryptoAp
override suspend fun execute(params: SetDeviceNameTask.Params) {
val body = UpdateDeviceInfoBody(
- displayName = if (TextUtils.isEmpty(params.deviceName)) "" else params.deviceName
+ displayName = params.deviceName
)
return executeRequest {
apiCall = cryptoApi.updateDeviceInfo(params.deviceId, body)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultSasVerificationService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultSasVerificationService.kt
index e071fc8571..ca1157e583 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultSasVerificationService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultSasVerificationService.kt
@@ -37,7 +37,6 @@ import im.vector.matrix.android.internal.crypto.model.rest.*
import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.task.TaskConstraints
import im.vector.matrix.android.internal.task.TaskExecutor
import im.vector.matrix.android.internal.task.configureWith
import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
@@ -90,7 +89,7 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
onMacReceived(event)
}
else -> {
- //ignore
+ // ignore
}
}
}
@@ -120,7 +119,6 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
} catch (e: Throwable) {
Timber.e(e, "## Error while notifying listeners")
}
-
}
}
}
@@ -167,7 +165,7 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
}
return
}
- //Download device keys prior to everything
+ // Download device keys prior to everything
checkKeysAreDownloaded(
otherUserId!!,
startReq,
@@ -177,19 +175,19 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
val existing = getExistingTransaction(otherUserId, tid)
val existingTxs = getExistingTransactionsForUser(otherUserId)
if (existing != null) {
- //should cancel both!
+ // should cancel both!
Timber.v("## SAS onStartRequestReceived - Request exist with same if ${startReq.transactionID!!}")
existing.cancel(CancelCode.UnexpectedMessage)
cancelTransaction(tid, otherUserId, startReq.fromDevice!!, CancelCode.UnexpectedMessage)
} else if (existingTxs?.isEmpty() == false) {
Timber.v("## SAS onStartRequestReceived - There is already a transaction with this user ${startReq.transactionID!!}")
- //Multiple keyshares between two devices: any two devices may only have at most one key verification in flight at a time.
+ // Multiple keyshares between two devices: any two devices may only have at most one key verification in flight at a time.
existingTxs.forEach {
it.cancel(CancelCode.UnexpectedMessage)
}
cancelTransaction(tid, otherUserId, startReq.fromDevice!!, CancelCode.UnexpectedMessage)
} else {
- //Ok we can create
+ // Ok we can create
if (KeyVerificationStart.VERIF_METHOD_SAS == startReq.method) {
Timber.v("## SAS onStartRequestReceived - request accepted ${startReq.transactionID!!}")
val tx = IncomingSASVerificationTransaction(
@@ -241,7 +239,7 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
val cancelReq = event.getClearContent().toModel()!!
if (!cancelReq.isValid()) {
- //ignore
+ // ignore
Timber.e("## Received invalid accept request")
return
}
@@ -263,7 +261,7 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
val acceptReq = event.getClearContent().toModel()!!
if (!acceptReq.isValid()) {
- //ignore
+ // ignore
Timber.e("## Received invalid accept request")
return
}
@@ -272,22 +270,20 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
if (existing == null) {
Timber.e("## Received invalid accept request")
return
-
}
if (existing is SASVerificationTransaction) {
existing.acceptToDeviceEvent(otherUserId, acceptReq)
} else {
- //not other types now
+ // not other types now
}
}
-
private suspend fun onKeyReceived(event: Event) {
val keyReq = event.getClearContent().toModel()!!
if (!keyReq.isValid()) {
- //ignore
+ // ignore
Timber.e("## Received invalid key request")
return
}
@@ -300,7 +296,7 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
if (existing is SASVerificationTransaction) {
existing.acceptToDeviceEvent(otherUserId, keyReq)
} else {
- //not other types now
+ // not other types now
}
}
@@ -308,7 +304,7 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
val macReq = event.getClearContent().toModel()!!
if (!macReq.isValid()) {
- //ignore
+ // ignore
Timber.e("## Received invalid key request")
return
}
@@ -321,7 +317,7 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
if (existing is SASVerificationTransaction) {
existing.acceptToDeviceEvent(otherUserId, macReq)
} else {
- //not other types known for now
+ // not other types known for now
}
}
@@ -362,7 +358,7 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
override fun beginKeyVerification(method: String, userId: String, deviceID: String): String? {
val txID = createUniqueIDForTransaction(userId, deviceID)
- //should check if already one (and cancel it)
+ // should check if already one (and cancel it)
if (KeyVerificationStart.VERIF_METHOD_SAS == method) {
val tx = OutgoingSASVerificationRequest(
this,
@@ -397,7 +393,6 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
}
}
-
override fun transactionUpdated(tx: VerificationTransaction) {
dispatchTxUpdated(tx)
if (tx is SASVerificationTransaction
@@ -405,7 +400,7 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
|| tx.state == SasVerificationTxState.OnCancelled
|| tx.state == SasVerificationTxState.Verified)
) {
- //remove
+ // remove
this.removeTransaction(tx.otherUserId, tx.transactionId)
}
}
@@ -429,4 +424,4 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
}
.executeBy(taskExecutor)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/IncomingSASVerificationTransaction.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/IncomingSASVerificationTransaction.kt
index 641062d7f2..6ed5be4881 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/IncomingSASVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/IncomingSASVerificationTransaction.kt
@@ -82,16 +82,14 @@ internal class IncomingSASVerificationTransaction(
Timber.v("## SAS received verification request from state $state")
if (state != SasVerificationTxState.None) {
Timber.e("## received verification request from invalid state")
- //should I cancel??
+ // should I cancel??
throw IllegalStateException("Interactive Key verification already started")
}
this.startReq = startReq
state = SasVerificationTxState.OnStarted
this.otherDeviceId = startReq.fromDevice
-
}
-
override fun performAccept() {
if (state != SasVerificationTxState.OnStarted) {
Timber.e("## Cannot perform accept from state $state")
@@ -105,29 +103,29 @@ internal class IncomingSASVerificationTransaction(
val agreedMac = startReq!!.messageAuthenticationCodes?.firstOrNull { KNOWN_MACS.contains(it) }
val agreedShortCode = startReq!!.shortAuthenticationStrings?.filter { KNOWN_SHORT_CODES.contains(it) }
- //No common key sharing/hashing/hmac/SAS methods.
- //If a device is unable to complete the verification because the devices are unable to find a common key sharing,
+ // No common key sharing/hashing/hmac/SAS methods.
+ // If a device is unable to complete the verification because the devices are unable to find a common key sharing,
// hashing, hmac, or SAS method, then it should send a m.key.verification.cancel message
if (listOf(agreedProtocol, agreedHash, agreedMac).any { it.isNullOrBlank() }
|| agreedShortCode.isNullOrEmpty()) {
- //Failed to find agreement
+ // Failed to find agreement
Timber.e("## Failed to find agreement ")
cancel(CancelCode.UnknownMethod)
return
}
- //Bob’s device ensures that it has a copy of Alice’s device key.
+ // Bob’s device ensures that it has a copy of Alice’s device key.
val mxDeviceInfo = cryptoStore.getUserDevice(deviceId = otherDeviceId!!, userId = otherUserId)
if (mxDeviceInfo?.fingerprint() == null) {
Timber.e("## Failed to find device key ")
- //TODO force download keys!!
- //would be probably better to download the keys
- //for now I cancel
+ // TODO force download keys!!
+ // would be probably better to download the keys
+ // for now I cancel
cancel(CancelCode.User)
} else {
// val otherKey = info.identityKey()
- //need to jump back to correct thread
+ // need to jump back to correct thread
val accept = KeyVerificationAccept.create(
tid = transactionId,
keyAgreementProtocol = agreedProtocol!!,
@@ -140,26 +138,24 @@ internal class IncomingSASVerificationTransaction(
}
}
-
private fun doAccept(accept: KeyVerificationAccept) {
this.accepted = accept
Timber.v("## SAS accept request id:$transactionId")
- //The hash commitment is the hash (using the selected hash algorithm) of the unpadded base64 representation of QB,
+ // The hash commitment is the hash (using the selected hash algorithm) of the unpadded base64 representation of QB,
// concatenated with the canonical JSON representation of the content of the m.key.verification.start message
val concat = getSAS().publicKey + JsonCanonicalizer.getCanonicalJson(KeyVerificationStart::class.java, startReq!!)
accept.commitment = hashUsingAgreedHashMethod(concat) ?: ""
- //we need to send this to other device now
+ // we need to send this to other device now
state = SasVerificationTxState.SendingAccept
sendToOther(EventType.KEY_VERIFICATION_ACCEPT, accept, SasVerificationTxState.Accepted, CancelCode.User) {
if (state == SasVerificationTxState.SendingAccept) {
- //It is possible that we receive the next event before this one :/, in this case we should keep state
+ // It is possible that we receive the next event before this one :/, in this case we should keep state
state = SasVerificationTxState.Accepted
}
}
}
-
override fun onVerificationAccept(accept: KeyVerificationAccept) {
Timber.v("## SAS invalid message for incoming request id:$transactionId")
cancel(CancelCode.UnexpectedMessage)
@@ -180,11 +176,11 @@ internal class IncomingSASVerificationTransaction(
val pubKey = getSAS().publicKey
val keyToDevice = KeyVerificationKey.create(transactionId, pubKey)
- //we need to send this to other device now
+ // we need to send this to other device now
state = SasVerificationTxState.SendingKey
this.sendToOther(EventType.KEY_VERIFICATION_KEY, keyToDevice, SasVerificationTxState.KeySent, CancelCode.User) {
if (state == SasVerificationTxState.SendingKey) {
- //It is possible that we receive the next event before this one :/, in this case we should keep state
+ // It is possible that we receive the next event before this one :/, in this case we should keep state
state = SasVerificationTxState.KeySent
}
}
@@ -194,7 +190,7 @@ internal class IncomingSASVerificationTransaction(
// using the result as the shared secret.
getSAS().setTheirPublicKey(otherKey)
- //(Note: In all of the following HKDF is as defined in RFC 5869, and uses the previously agreed-on hash function as the hash function,
+ // (Note: In all of the following HKDF is as defined in RFC 5869, and uses the previously agreed-on hash function as the hash function,
// the shared secret as the input keying material, no salt, and with the input parameter set to the concatenation of:
// - the string “MATRIX_KEY_VERIFICATION_SAS”,
// - the Matrix ID of the user who sent the m.key.verification.start message,
@@ -206,8 +202,8 @@ internal class IncomingSASVerificationTransaction(
"$otherUserId$otherDeviceId" +
"${credentials.userId}${credentials.deviceId}" +
transactionId
- //decimal: generate five bytes by using HKDF.
- //emoji: generate six bytes by using HKDF.
+ // decimal: generate five bytes by using HKDF.
+ // emoji: generate six bytes by using HKDF.
shortCodeBytes = getSAS().generateShortCode(sasInfo, 6)
Timber.e("************ BOB CODE ${getDecimalCodeRepresentation(shortCodeBytes!!)}")
@@ -218,7 +214,7 @@ internal class IncomingSASVerificationTransaction(
override fun onKeyVerificationMac(vKey: KeyVerificationMac) {
Timber.v("## SAS received mac for request id:$transactionId")
- //Check for state?
+ // Check for state?
if (state != SasVerificationTxState.SendingKey
&& state != SasVerificationTxState.KeySent
&& state != SasVerificationTxState.ShortCodeReady
@@ -231,11 +227,11 @@ internal class IncomingSASVerificationTransaction(
}
theirMac = vKey
- //Do I have my Mac?
+ // Do I have my Mac?
if (myMac != null) {
- //I can check
+ // I can check
verifyMacs()
}
- //Wait for ShortCode Accepted
+ // Wait for ShortCode Accepted
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/OutgoingSASVerificationRequest.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/OutgoingSASVerificationRequest.kt
index 0500be5426..cade637cce 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/OutgoingSASVerificationRequest.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/OutgoingSASVerificationRequest.kt
@@ -56,7 +56,6 @@ internal class OutgoingSASVerificationRequest(
isIncoming = false),
OutgoingSasVerificationRequest {
-
override val uxState: OutgoingSasVerificationRequest.UxState
get() {
return when (state) {
@@ -87,7 +86,7 @@ internal class OutgoingSASVerificationRequest(
fun start() {
if (state != SasVerificationTxState.None) {
Timber.e("## start verification from invalid state")
- //should I cancel??
+ // should I cancel??
throw IllegalStateException("Interactive Key verification already started")
}
@@ -119,7 +118,7 @@ internal class OutgoingSASVerificationRequest(
cancel(CancelCode.UnexpectedMessage)
return
}
- //Check that the agreement is correct
+ // Check that the agreement is correct
if (!KNOWN_AGREEMENT_PROTOCOLS.contains(accept.keyAgreementProtocol)
|| !KNOWN_HASHES.contains(accept.hash)
|| !KNOWN_MACS.contains(accept.messageAuthenticationCode)
@@ -129,7 +128,7 @@ internal class OutgoingSASVerificationRequest(
return
}
- //Upon receipt of the m.key.verification.accept message from Bob’s device,
+ // Upon receipt of the m.key.verification.accept message from Bob’s device,
// Alice’s device stores the commitment value for later use.
accepted = accept
state = SasVerificationTxState.OnAccepted
@@ -139,10 +138,10 @@ internal class OutgoingSASVerificationRequest(
val pubKey = getSAS().publicKey
val keyToDevice = KeyVerificationKey.create(transactionId, pubKey)
- //we need to send this to other device now
+ // we need to send this to other device now
state = SasVerificationTxState.SendingKey
sendToOther(EventType.KEY_VERIFICATION_KEY, keyToDevice, SasVerificationTxState.KeySent, CancelCode.User) {
- //It is possible that we receive the next event before this one :/, in this case we should keep state
+ // It is possible that we receive the next event before this one :/, in this case we should keep state
if (state == SasVerificationTxState.SendingKey) {
state = SasVerificationTxState.KeySent
}
@@ -163,13 +162,13 @@ internal class OutgoingSASVerificationRequest(
// message is the same as the expected value based on the value of the key property received
// in Bob’s m.key.verification.key and the content of Alice’s m.key.verification.start message.
- //check commitment
+ // check commitment
val concat = vKey.key + JsonCanonicalizer.getCanonicalJson(KeyVerificationStart::class.java, startReq!!)
val otherCommitment = hashUsingAgreedHashMethod(concat) ?: ""
if (accepted!!.commitment.equals(otherCommitment)) {
getSAS().setTheirPublicKey(otherKey)
- //(Note: In all of the following HKDF is as defined in RFC 5869, and uses the previously agreed-on hash function as the hash function,
+ // (Note: In all of the following HKDF is as defined in RFC 5869, and uses the previously agreed-on hash function as the hash function,
// the shared secret as the input keying material, no salt, and with the input parameter set to the concatenation of:
// - the string “MATRIX_KEY_VERIFICATION_SAS”,
// - the Matrix ID of the user who sent the m.key.verification.start message,
@@ -181,12 +180,12 @@ internal class OutgoingSASVerificationRequest(
"${credentials.userId}${credentials.deviceId}" +
"$otherUserId$otherDeviceId" +
transactionId
- //decimal: generate five bytes by using HKDF.
- //emoji: generate six bytes by using HKDF.
+ // decimal: generate five bytes by using HKDF.
+ // emoji: generate six bytes by using HKDF.
shortCodeBytes = getSAS().generateShortCode(sasInfo, 6)
state = SasVerificationTxState.ShortCodeReady
} else {
- //bad commitement
+ // bad commitement
cancel(CancelCode.MismatchedCommitment)
}
}
@@ -205,11 +204,11 @@ internal class OutgoingSASVerificationRequest(
theirMac = vKey
- //Do I have my Mac?
+ // Do I have my Mac?
if (myMac != null) {
- //I can check
+ // I can check
verifyMacs()
}
- //Wait for ShortCode Accepted
+ // Wait for ShortCode Accepted
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SASVerificationTransaction.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SASVerificationTransaction.kt
index de4b997410..589103d38a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SASVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SASVerificationTransaction.kt
@@ -59,20 +59,20 @@ internal abstract class SASVerificationTransaction(
const val SAS_MAC_SHA256_LONGKDF = "hmac-sha256"
const val SAS_MAC_SHA256 = "hkdf-hmac-sha256"
- //ordered by preferred order
+ // ordered by preferred order
val KNOWN_AGREEMENT_PROTOCOLS = listOf(MXKey.KEY_CURVE_25519_TYPE)
- //ordered by preferred order
+ // ordered by preferred order
val KNOWN_HASHES = listOf("sha256")
- //ordered by preferred order
+ // ordered by preferred order
val KNOWN_MACS = listOf(SAS_MAC_SHA256, SAS_MAC_SHA256_LONGKDF)
- //older devices have limited support of emoji, so reply with decimal
+ // older devices have limited support of emoji, so reply with decimal
val KNOWN_SHORT_CODES =
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
listOf(SasMode.EMOJI, SasMode.DECIMAL)
- else
+ } else {
listOf(SasMode.DECIMAL)
-
+ }
}
override var state by Delegates.observable(SasVerificationTxState.None) { _, _, new ->
@@ -108,7 +108,7 @@ internal abstract class SASVerificationTransaction(
return olmSas!!
}
- //To override finalize(), all you need to do is simply declare it, without using the override keyword:
+ // To override finalize(), all you need to do is simply declare it, without using the override keyword:
protected fun finalize() {
releaseSAS()
}
@@ -119,7 +119,6 @@ internal abstract class SASVerificationTransaction(
olmSas = null
}
-
/**
* To be called by the client when the user has verified that
* both short codes do match
@@ -127,16 +126,16 @@ internal abstract class SASVerificationTransaction(
override fun userHasVerifiedShortCode() {
Timber.v("## SAS short code verified by user for id:$transactionId")
if (state != SasVerificationTxState.ShortCodeReady) {
- //ignore and cancel?
+ // ignore and cancel?
Timber.e("## Accepted short code from invalid state $state")
cancel(CancelCode.UnexpectedMessage)
return
}
state = SasVerificationTxState.ShortCodeAccepted
- //Alice and Bob’ devices calculate the HMAC of their own device keys and a comma-separated,
+ // Alice and Bob’ devices calculate the HMAC of their own device keys and a comma-separated,
// sorted list of the key IDs that they wish the other user to verify,
- //the shared secret as the input keying material, no salt, and with the input parameter set to the concatenation of:
+ // the shared secret as the input keying material, no salt, and with the input parameter set to the concatenation of:
// - the string “MATRIX_KEY_VERIFICATION_MAC”,
// - the Matrix ID of the user whose key is being MAC-ed,
// - the device ID of the device sending the MAC,
@@ -155,7 +154,7 @@ internal abstract class SASVerificationTransaction(
val keyStrings = macUsingAgreedMethod(keyId, baseInfo + "KEY_IDS")
if (macString.isNullOrBlank() || keyStrings.isNullOrBlank()) {
- //Should not happen
+ // Should not happen
Timber.e("## SAS verification [$transactionId] failed to send KeyMac, empty key hashes.")
cancel(CancelCode.UnexpectedMessage)
return
@@ -166,16 +165,15 @@ internal abstract class SASVerificationTransaction(
state = SasVerificationTxState.SendingMac
sendToOther(EventType.KEY_VERIFICATION_MAC, macMsg, SasVerificationTxState.MacSent, CancelCode.User) {
if (state == SasVerificationTxState.SendingMac) {
- //It is possible that we receive the next event before this one :/, in this case we should keep state
+ // It is possible that we receive the next event before this one :/, in this case we should keep state
state = SasVerificationTxState.MacSent
}
}
- //Do I already have their Mac?
+ // Do I already have their Mac?
if (theirMac != null) {
verifyMacs()
- } //if not wait for it
-
+ } // if not wait for it
}
override fun acceptToDeviceEvent(senderId: String, event: SendToDeviceObject) {
@@ -185,7 +183,7 @@ internal abstract class SASVerificationTransaction(
is KeyVerificationKey -> onKeyVerificationKey(senderId, event)
is KeyVerificationMac -> onKeyVerificationMac(event)
else -> {
- //nop
+ // nop
}
}
}
@@ -202,7 +200,7 @@ internal abstract class SASVerificationTransaction(
Timber.v("## SAS verifying macs for id:$transactionId")
state = SasVerificationTxState.Verifying
- //Keys have been downloaded earlier in process
+ // Keys have been downloaded earlier in process
val otherUserKnownDevices = cryptoStore.getUserDevices(otherUserId)
// Bob’s device calculates the HMAC (as above) of its copies of Alice’s keys given in the message (as identified by their key ID),
@@ -219,25 +217,25 @@ internal abstract class SASVerificationTransaction(
val keyStrings = macUsingAgreedMethod(commaSeparatedListOfKeyIds, baseInfo + "KEY_IDS")
if (theirMac!!.keys != keyStrings) {
- //WRONG!
+ // WRONG!
cancel(CancelCode.MismatchedKeys)
return
}
val verifiedDevices = ArrayList()
- //cannot be empty because it has been validated
+ // cannot be empty because it has been validated
theirMac!!.mac!!.keys.forEach {
val keyIDNoPrefix = if (it.startsWith("ed25519:")) it.substring("ed25519:".length) else it
val otherDeviceKey = otherUserKnownDevices?.get(keyIDNoPrefix)?.fingerprint()
if (otherDeviceKey == null) {
Timber.e("Verification: Could not find device $keyIDNoPrefix to verify")
- //just ignore and continue
+ // just ignore and continue
return@forEach
}
val mac = macUsingAgreedMethod(otherDeviceKey, baseInfo + it)
if (mac != theirMac?.mac?.get(it)) {
- //WRONG!
+ // WRONG!
cancel(CancelCode.MismatchedKeys)
return
}
@@ -252,7 +250,7 @@ internal abstract class SASVerificationTransaction(
return
}
- //TODO what if the otherDevice is not in this list? and should we
+ // TODO what if the otherDevice is not in this list? and should we
verifiedDevices.forEach {
setDeviceVerified(it, otherUserId)
}
@@ -370,16 +368,16 @@ internal abstract class SASVerificationTransaction(
* or with the three numbers on separate lines.
*/
fun getDecimalCodeRepresentation(byteArray: ByteArray): String {
- val b0 = byteArray[0].toUnsignedInt() //need unsigned byte
- val b1 = byteArray[1].toUnsignedInt() //need unsigned byte
- val b2 = byteArray[2].toUnsignedInt() //need unsigned byte
- val b3 = byteArray[3].toUnsignedInt() //need unsigned byte
- val b4 = byteArray[4].toUnsignedInt() //need unsigned byte
- //(B0 << 5 | B1 >> 3) + 1000
+ val b0 = byteArray[0].toUnsignedInt() // need unsigned byte
+ val b1 = byteArray[1].toUnsignedInt() // need unsigned byte
+ val b2 = byteArray[2].toUnsignedInt() // need unsigned byte
+ val b3 = byteArray[3].toUnsignedInt() // need unsigned byte
+ val b4 = byteArray[4].toUnsignedInt() // need unsigned byte
+ // (B0 << 5 | B1 >> 3) + 1000
val first = (b0.shl(5) or b1.shr(3)) + 1000
- //((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000
+ // ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000
val second = ((b1 and 0x7).shl(10) or b2.shl(2) or b3.shr(6)) + 1000
- //((B3 & 0x3f) << 7 | B4 >> 1) + 1000
+ // ((B3 & 0x3f) << 7 | B4 >> 1) + 1000
val third = ((b3 and 0x3f).shl(7) or b4.shr(1)) + 1000
return "$first $second $third"
}
@@ -411,5 +409,4 @@ internal abstract class SASVerificationTransaction(
getEmojiForCode((b4 and 0xF).shl(2) or (b5 and 0xC0).shr(6))
)
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/AsyncTransaction.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/AsyncTransaction.kt
index e1beefc2e5..36e68e5cf3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/AsyncTransaction.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/AsyncTransaction.kt
@@ -21,7 +21,6 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.isActive
import kotlinx.coroutines.withContext
-
suspend fun awaitTransaction(config: RealmConfiguration, transaction: suspend (realm: Realm) -> Unit) = withContext(Dispatchers.IO) {
Realm.getInstance(config).use { bgRealm ->
bgRealm.beginTransaction()
@@ -36,4 +35,4 @@ suspend fun awaitTransaction(config: RealmConfiguration, transaction: suspend (r
}
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DBConstants.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DBConstants.kt
index 0f420f3bbf..3dff2f2273 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DBConstants.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DBConstants.kt
@@ -19,5 +19,4 @@ package im.vector.matrix.android.internal.database
internal object DBConstants {
const val STATE_EVENTS_CHUNK_TOKEN = "STATE_EVENTS_CHUNK_TOKEN"
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmKeysUtils.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmKeysUtils.kt
index d2ab764087..55ced343d4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmKeysUtils.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmKeysUtils.kt
@@ -117,4 +117,4 @@ internal class RealmKeysUtils @Inject constructor(context: Context,
companion object {
private const val ENCRYPTED_KEY_PREFIX = "REALM_ENCRYPTED_KEY"
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveData.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveData.kt
deleted file mode 100644
index 46a431a412..0000000000
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveData.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * 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 im.vector.matrix.android.internal.database
-
-import androidx.lifecycle.LiveData
-import io.realm.*
-
-class RealmLiveData(private val realmConfiguration: RealmConfiguration,
- private val query: (Realm) -> RealmQuery) : LiveData>() {
-
- private val listener = RealmChangeListener> { results ->
- value = results
- }
-
- private var realm: Realm? = null
- private var results: RealmResults? = null
-
- override fun onActive() {
- val realm = Realm.getInstance(realmConfiguration)
- val results = query.invoke(realm).findAllAsync()
- results.addChangeListener(listener)
- this.realm = realm
- this.results = results
- }
-
- override fun onInactive() {
- results?.removeChangeListener(listener)
- results = null
- realm?.close()
- realm = null
- }
-}
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveEntityObserver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveEntityObserver.kt
index e78078f93e..9c7a788b44 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveEntityObserver.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveEntityObserver.kt
@@ -66,5 +66,4 @@ internal abstract class RealmLiveEntityObserver(protected val r
override fun isStarted(): Boolean {
return isStarted.get()
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt
index 3e3ffad45c..2d386eac15 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt
@@ -22,7 +22,6 @@ import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicReference
-
class RealmQueryLatch(private val realmConfiguration: RealmConfiguration,
private val realmQueryBuilder: (Realm) -> RealmQuery) {
@@ -57,6 +56,4 @@ class RealmQueryLatch(private val realmConfiguration: RealmConf
}
}
}
-
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/SessionRealmConfigurationFactory.kt
new file mode 100644
index 0000000000..881d7ce2c5
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/SessionRealmConfigurationFactory.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.internal.database
+
+import android.content.Context
+import im.vector.matrix.android.internal.database.model.SessionRealmModule
+import im.vector.matrix.android.internal.di.UserCacheDirectory
+import im.vector.matrix.android.internal.di.UserMd5
+import im.vector.matrix.android.internal.session.SessionModule
+import io.realm.Realm
+import io.realm.RealmConfiguration
+import timber.log.Timber
+import java.io.File
+import javax.inject.Inject
+
+private const val REALM_SHOULD_CLEAR_FLAG_ = "REALM_SHOULD_CLEAR_FLAG_"
+private const val REALM_NAME = "disk_store.realm"
+
+/**
+ * This class is handling creation of RealmConfiguration for a session.
+ * It will handle corrupted realm by clearing the db file. It allows to just clear cache without losing your crypto keys.
+ * It's clearly not perfect but there is no way to catch the native crash.
+ */
+internal class SessionRealmConfigurationFactory @Inject constructor(private val realmKeysUtils: RealmKeysUtils,
+ @UserCacheDirectory val directory: File,
+ @UserMd5 val userMd5: String,
+ context: Context) {
+
+ private val sharedPreferences = context.getSharedPreferences("im.vector.matrix.android.realm", Context.MODE_PRIVATE)
+
+ fun create(): RealmConfiguration {
+ val shouldClearRealm = sharedPreferences.getBoolean("$REALM_SHOULD_CLEAR_FLAG_$userMd5", false)
+ if (shouldClearRealm) {
+ Timber.v("************************************************************")
+ Timber.v("The realm file session was corrupted and couldn't be loaded.")
+ Timber.v("The file has been deleted to recover.")
+ Timber.v("************************************************************")
+ deleteRealmFiles()
+ }
+ sharedPreferences
+ .edit()
+ .putBoolean("$REALM_SHOULD_CLEAR_FLAG_$userMd5", true)
+ .apply()
+
+ val realmConfiguration = RealmConfiguration.Builder()
+ .directory(directory)
+ .name(REALM_NAME)
+ .apply {
+ realmKeysUtils.configureEncryption(this, "${SessionModule.DB_ALIAS_PREFIX}$userMd5")
+ }
+ .modules(SessionRealmModule())
+ .deleteRealmIfMigrationNeeded()
+ .build()
+
+ // Try creating a realm instance and if it succeeds we can clear the flag
+ Realm.getInstance(realmConfiguration).use {
+ Timber.v("Successfully create realm instance")
+ sharedPreferences
+ .edit()
+ .putBoolean("$REALM_SHOULD_CLEAR_FLAG_$userMd5", false)
+ .apply()
+ }
+ return realmConfiguration
+ }
+
+ // Delete all the realm files of the session
+ private fun deleteRealmFiles() {
+ listOf(REALM_NAME, "$REALM_NAME.lock", "$REALM_NAME.note", "$REALM_NAME.management").forEach { file ->
+ try {
+ File(directory, file).deleteRecursively()
+ } catch (e: Exception) {
+ Timber.e(e, "Unable to move files")
+ }
+ }
+ }
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt
index 69065f5171..e9ffa140c9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt
@@ -23,6 +23,7 @@ import im.vector.matrix.android.internal.database.mapper.asDomain
import im.vector.matrix.android.internal.database.mapper.toEntity
import im.vector.matrix.android.internal.database.model.ChunkEntity
import im.vector.matrix.android.internal.database.model.EventAnnotationsSummaryEntity
+import im.vector.matrix.android.internal.database.model.ReadMarkerEntity
import im.vector.matrix.android.internal.database.model.ReadReceiptEntity
import im.vector.matrix.android.internal.database.model.ReadReceiptsSummaryEntity
import im.vector.matrix.android.internal.database.model.TimelineEventEntity
@@ -110,7 +111,6 @@ internal fun ChunkEntity.add(roomId: String,
direction: PaginationDirection,
stateIndexOffset: Int = 0,
isUnlinked: Boolean = false) {
-
assertIsManaged()
if (event.eventId != null && timelineEvents.find(event.eventId) != null) {
return
@@ -124,7 +124,7 @@ internal fun ChunkEntity.add(roomId: String,
backwardsDisplayIndex = currentDisplayIndex
}
var currentStateIndex = lastStateIndex(direction, defaultValue = stateIndexOffset)
- if (direction == PaginationDirection.FORWARDS && EventType.isStateEvent(event.getClearType())) {
+ if (direction == PaginationDirection.FORWARDS && EventType.isStateEvent(event.type)) {
currentStateIndex += 1
forwardsStateIndex = currentStateIndex
} else if (direction == PaginationDirection.BACKWARDS && timelineEvents.isNotEmpty()) {
@@ -157,7 +157,6 @@ internal fun ChunkEntity.add(roomId: String,
}
}
-
val eventEntity = TimelineEventEntity(localId).also {
it.root = event.toEntity(roomId).apply {
this.stateIndex = currentStateIndex
@@ -169,6 +168,7 @@ internal fun ChunkEntity.add(roomId: String,
it.roomId = roomId
it.annotations = EventAnnotationsSummaryEntity.where(realm, eventId).findFirst()
it.readReceipts = readReceiptsSummaryEntity
+ it.readMarker = ReadMarkerEntity.where(realm, roomId = roomId, eventId = eventId).findFirst()
}
val position = if (direction == PaginationDirection.FORWARDS) 0 else this.timelineEvents.size
timelineEvents.add(position, eventEntity)
@@ -186,4 +186,4 @@ internal fun ChunkEntity.lastStateIndex(direction: PaginationDirection, defaultV
PaginationDirection.FORWARDS -> forwardsStateIndex
PaginationDirection.BACKWARDS -> backwardsStateIndex
} ?: defaultValue
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/TimelineEventEntityHelper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/TimelineEventEntityHelper.kt
index f6bf258baa..24765c120d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/TimelineEventEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/TimelineEventEntityHelper.kt
@@ -30,7 +30,6 @@ import io.realm.Realm
import io.realm.RealmList
import io.realm.RealmQuery
-
internal fun TimelineEventEntity.updateSenderData() {
assertIsManaged()
val roomEntity = RoomEntity.where(realm, roomId = roomId).findFirst() ?: return
@@ -67,7 +66,7 @@ internal fun TimelineEventEntity.updateSenderData() {
this.senderMembershipEvent = senderMembershipEvent
}
-internal fun TimelineEventEntity.Companion.nextId(realm: Realm): Long{
+internal fun TimelineEventEntity.Companion.nextId(realm: Realm): Long {
val currentIdNum = realm.where(TimelineEventEntity::class.java).max(TimelineEventEntityFields.LOCAL_ID)
return if (currentIdNum == null) {
1
@@ -82,4 +81,3 @@ private fun RealmList.buildQuery(sender: String, isUnlinked
.equalTo(TimelineEventEntityFields.ROOT.TYPE, EventType.STATE_ROOM_MEMBER)
.equalTo(TimelineEventEntityFields.ROOT.IS_UNLINKED, isUnlinked)
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ContentMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ContentMapper.kt
index 801fdf3920..2406027f24 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ContentMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ContentMapper.kt
@@ -36,5 +36,4 @@ internal object ContentMapper {
adapter.toJson(it)
}
}
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/DraftMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/DraftMapper.kt
index 6b87951e0a..3bd6cf14e4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/DraftMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/DraftMapper.kt
@@ -42,4 +42,4 @@ internal object DraftMapper {
is UserDraft.REPLY -> DraftEntity(content = domain.text, draftMode = DraftEntity.MODE_REPLY, linkedEventId = domain.linkedEventId)
}
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventAnnotationsSummaryMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventAnnotationsSummaryMapper.kt
index 1b7b7f6407..701d35926a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventAnnotationsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventAnnotationsSummaryMapper.kt
@@ -61,7 +61,7 @@ internal object EventAnnotationsSummaryMapper {
it.lastEditTs
)
}
- eventAnnotationsSummaryEntity.reactionsSummary = annotationsSummary.reactionsSummary?.let {
+ eventAnnotationsSummaryEntity.reactionsSummary = annotationsSummary.reactionsSummary.let {
RealmList().apply {
addAll(it.map {
ReactionAggregatedSummaryEntity(
@@ -81,4 +81,4 @@ internal object EventAnnotationsSummaryMapper {
internal fun EventAnnotationsSummaryEntity.asDomain(): EventAnnotationsSummary {
return EventAnnotationsSummaryMapper.map(this)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt
index 4375a19d17..ed5f04ef75 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt
@@ -27,7 +27,6 @@ import timber.log.Timber
internal object EventMapper {
-
fun map(event: Event, roomId: String): EventEntity {
val uds = if (event.unsignedData == null) null
else MoshiProvider.providesMoshi().adapter(UnsignedData::class.java).toJson(event.unsignedData)
@@ -38,7 +37,7 @@ internal object EventMapper {
val resolvedPrevContent = event.prevContent ?: event.unsignedData?.prevContent
eventEntity.prevContent = ContentMapper.map(resolvedPrevContent)
eventEntity.stateKey = event.stateKey
- eventEntity.type = event.getClearType()
+ eventEntity.type = event.type
eventEntity.sender = event.senderId
eventEntity.originServerTs = event.originServerTs
eventEntity.redacts = event.redacts
@@ -48,16 +47,17 @@ internal object EventMapper {
}
fun map(eventEntity: EventEntity): Event {
- val ud = if (eventEntity.unsignedData.isNullOrBlank()) {
- null
- } else {
- try {
- MoshiProvider.providesMoshi().adapter(UnsignedData::class.java).fromJson(eventEntity.unsignedData)
- } catch (t: JsonDataException) {
- null
- }
+ val ud = eventEntity.unsignedData
+ ?.takeIf { it.isNotBlank() }
+ ?.let {
+ try {
+ MoshiProvider.providesMoshi().adapter(UnsignedData::class.java).fromJson(it)
+ } catch (t: JsonDataException) {
+ Timber.e(t, "Failed to parse UnsignedData")
+ null
+ }
+ }
- }
return Event(
type = eventEntity.type,
eventId = eventEntity.eventId,
@@ -78,11 +78,12 @@ internal object EventMapper {
Timber.e(t, "Failed to parse decryption result")
}
}
- //TODO get the full crypto error object
- it.mCryptoError = eventEntity.decryptionErrorCode?.let { MXCryptoError.ErrorType.valueOf(it) }
+ // TODO get the full crypto error object
+ it.mCryptoError = eventEntity.decryptionErrorCode?.let { errorCode ->
+ MXCryptoError.ErrorType.valueOf(errorCode)
+ }
}
}
-
}
internal fun EventEntity.asDomain(): Event {
@@ -92,4 +93,3 @@ internal fun EventEntity.asDomain(): Event {
internal fun Event.toEntity(roomId: String): EventEntity {
return EventMapper.map(this, roomId)
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupMapper.kt
index fdd65be6b9..89ed5844c2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupMapper.kt
@@ -20,7 +20,6 @@ import im.vector.matrix.android.api.session.group.Group
import im.vector.matrix.android.internal.database.model.GroupEntity
import im.vector.matrix.android.internal.session.group.DefaultGroup
-
internal object GroupMapper {
fun map(groupEntity: GroupEntity): Group {
@@ -32,4 +31,4 @@ internal object GroupMapper {
internal fun GroupEntity.asDomain(): Group {
return GroupMapper.map(this)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupSummaryMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupSummaryMapper.kt
index 44cbf2998d..52e4d61d40 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupSummaryMapper.kt
@@ -19,7 +19,6 @@ package im.vector.matrix.android.internal.database.mapper
import im.vector.matrix.android.api.session.group.model.GroupSummary
import im.vector.matrix.android.internal.database.model.GroupSummaryEntity
-
internal object GroupSummaryMapper {
fun map(groupSummaryEntity: GroupSummaryEntity): GroupSummary {
@@ -37,4 +36,4 @@ internal object GroupSummaryMapper {
internal fun GroupSummaryEntity.asDomain(): GroupSummary {
return GroupSummaryMapper.map(this)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/HomeServerCapabilitiesMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/HomeServerCapabilitiesMapper.kt
new file mode 100644
index 0000000000..66b0f1b379
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/HomeServerCapabilitiesMapper.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.internal.database.mapper
+
+import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilities
+import im.vector.matrix.android.internal.database.model.HomeServerCapabilitiesEntity
+
+/**
+ * HomeServerCapabilitiesEntity <-> HomeSeverCapabilities
+ */
+internal object HomeServerCapabilitiesMapper {
+
+ fun map(entity: HomeServerCapabilitiesEntity): HomeServerCapabilities {
+ return HomeServerCapabilities(
+ maxUploadFileSize = entity.maxUploadFileSize
+ )
+ }
+
+ fun map(domain: HomeServerCapabilities): HomeServerCapabilitiesEntity {
+ return HomeServerCapabilitiesEntity(
+ maxUploadFileSize = domain.maxUploadFileSize
+ )
+ }
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushConditionMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushConditionMapper.kt
index 4aabc9a8f1..3bc532fd93 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushConditionMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushConditionMapper.kt
@@ -19,7 +19,6 @@ package im.vector.matrix.android.internal.database.mapper
import im.vector.matrix.android.api.pushrules.rest.PushCondition
import im.vector.matrix.android.internal.database.model.PushConditionEntity
-
internal object PushConditionMapper {
fun map(entity: PushConditionEntity): PushCondition {
@@ -39,4 +38,4 @@ internal object PushConditionMapper {
pattern = domain.pattern
)
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushRulesMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushRulesMapper.kt
index 1ed2151e68..8912928a88 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushRulesMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushRulesMapper.kt
@@ -24,7 +24,6 @@ import im.vector.matrix.android.internal.di.MoshiProvider
import io.realm.RealmList
import timber.log.Timber
-
internal object PushRulesMapper {
private val moshiActionsAdapter = MoshiProvider.providesMoshi().adapter>(Types.newParameterizedType(List::class.java, Any::class.java))
@@ -53,7 +52,6 @@ internal object PushRulesMapper {
}
}
-
fun mapRoomRule(pushrule: PushRuleEntity): PushRule {
return PushRule(
actions = fromActionStr(pushrule.actionsStr),
@@ -78,7 +76,6 @@ internal object PushRulesMapper {
)
}
-
fun map(pushrule: PushRuleEntity): PushRule {
return PushRule(
actions = fromActionStr(pushrule.actionsStr),
@@ -101,5 +98,4 @@ internal object PushRulesMapper {
} ?: RealmList()
)
}
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushersMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushersMapper.kt
index d11532c588..315c8a766c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushersMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/PushersMapper.kt
@@ -24,7 +24,6 @@ import im.vector.matrix.android.internal.session.pushers.JsonPusher
internal object PushersMapper {
fun map(pushEntity: PusherEntity): Pusher {
-
return Pusher(
pushKey = pushEntity.pushKey,
kind = pushEntity.kind ?: "",
@@ -58,4 +57,4 @@ internal fun PusherEntity.asDomain(): Pusher {
internal fun JsonPusher.toEntity(): PusherEntity {
return PushersMapper.map(this)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ReadReceiptsSummaryMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ReadReceiptsSummaryMapper.kt
index 9fa9fc011d..952dfb9728 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ReadReceiptsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/ReadReceiptsSummaryMapper.kt
@@ -41,5 +41,4 @@ internal class ReadReceiptsSummaryMapper @Inject constructor(@SessionDatabase pr
}
}
}
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt
index 4fbe7fe04c..5db062b000 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt
@@ -39,8 +39,8 @@ internal class RoomSummaryMapper @Inject constructor(
timelineEventMapper.map(it)
}
if (latestEvent?.root?.isEncrypted() == true && latestEvent.root.mxDecryptionResult == null) {
- //TODO use a global event decryptor? attache to session and that listen to new sessionId?
- //for now decrypt sync
+ // TODO use a global event decryptor? attache to session and that listen to new sessionId?
+ // for now decrypt sync
try {
val result = cryptoService.decryptEvent(latestEvent.root, latestEvent.root.roomId + UUID.randomUUID().toString())
latestEvent.root.mxDecryptionResult = OlmDecryptionResult(
@@ -50,7 +50,6 @@ internal class RoomSummaryMapper @Inject constructor(
forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
)
} catch (e: MXCryptoError) {
-
}
}
@@ -68,6 +67,7 @@ internal class RoomSummaryMapper @Inject constructor(
tags = tags,
membership = roomSummaryEntity.membership,
versioningState = roomSummaryEntity.versioningState,
+ readMarkerId = roomSummaryEntity.readMarkerId,
userDrafts = roomSummaryEntity.userDrafts?.userDrafts?.map { DraftMapper.map(it) } ?: emptyList()
)
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/TimelineEventMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/TimelineEventMapper.kt
index fe98ebfb5b..8046ecbff0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/TimelineEventMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/TimelineEventMapper.kt
@@ -45,10 +45,8 @@ internal class TimelineEventMapper @Inject constructor(private val readReceiptsS
senderAvatar = timelineEventEntity.senderAvatar,
readReceipts = readReceipts?.sortedByDescending {
it.originServerTs
- } ?: emptyList()
+ } ?: emptyList(),
+ hasReadMarker = timelineEventEntity.readMarker?.eventId?.isNotEmpty() == true
)
}
-
}
-
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/UserMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/UserMapper.kt
index 2389427c90..bfbe40df03 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/UserMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/UserMapper.kt
@@ -32,4 +32,4 @@ internal object UserMapper {
internal fun UserEntity.asDomain(): User {
return UserMapper.map(this)
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ChunkEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ChunkEntity.kt
index d8661984d7..577c391b3a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ChunkEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ChunkEntity.kt
@@ -33,10 +33,10 @@ internal open class ChunkEntity(@Index var prevToken: String? = null,
var forwardsStateIndex: Int? = null
) : RealmObject() {
- fun identifier() = "${prevToken}_${nextToken}"
+ fun identifier() = "${prevToken}_$nextToken"
@LinkingObjects("chunks")
val room: RealmResults? = null
companion object
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/DraftEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/DraftEntity.kt
index 9666ebd9a1..3b5aae8b13 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/DraftEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/DraftEntity.kt
@@ -31,4 +31,3 @@ internal open class DraftEntity(var content: String = "",
const val MODE_QUOTE = "QUOTE"
}
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EditAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EditAggregatedSummaryEntity.kt
index f2690c96de..3a179eb1f0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EditAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EditAggregatedSummaryEntity.kt
@@ -30,5 +30,4 @@ internal open class EditAggregatedSummaryEntity(
) : RealmObject() {
companion object
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventAnnotationsSummaryEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventAnnotationsSummaryEntity.kt
index 4c6b26f0e5..523d94b770 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventAnnotationsSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventAnnotationsSummaryEntity.kt
@@ -19,7 +19,6 @@ import io.realm.RealmList
import io.realm.RealmObject
import io.realm.annotations.PrimaryKey
-
internal open class EventAnnotationsSummaryEntity(
@PrimaryKey
var eventId: String = "",
@@ -29,5 +28,4 @@ internal open class EventAnnotationsSummaryEntity(
) : RealmObject() {
companion object
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt
index 4401d394bb..4def7aec5d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt
@@ -59,7 +59,6 @@ internal open class EventEntity(@Index var eventId: String = "",
sendStateStr = value.name
}
-
companion object
@LinkingObjects("untimelinedStateEvents")
@@ -68,7 +67,6 @@ internal open class EventEntity(@Index var eventId: String = "",
@LinkingObjects("root")
val timelineEventEntity: RealmResults? = null
-
fun setDecryptionResult(result: MXEventDecryptionResult) {
val decryptionResult = OlmDecryptionResult(
payload = result.clearEvent,
@@ -81,4 +79,4 @@ internal open class EventEntity(@Index var eventId: String = "",
decryptionErrorCode = null
timelineEventEntity?.firstOrNull()?.root = this
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/FilterEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/FilterEntity.kt
index 13209cb96e..eabcdce34d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/FilterEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/FilterEntity.kt
@@ -33,4 +33,4 @@ internal open class FilterEntity(
) : RealmObject() {
companion object
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupEntity.kt
index 433f209501..eb346a74ca 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupEntity.kt
@@ -38,5 +38,4 @@ internal open class GroupEntity(@PrimaryKey var groupId: String = "")
}
companion object
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupSummaryEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupSummaryEntity.kt
index 7ab67b6ab0..f3700b1dd7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupSummaryEntity.kt
@@ -39,5 +39,4 @@ internal open class GroupSummaryEntity(@PrimaryKey var groupId: String = "",
}
companion object
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/HomeServerCapabilitiesEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/HomeServerCapabilitiesEntity.kt
new file mode 100644
index 0000000000..0d067286e1
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/HomeServerCapabilitiesEntity.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.internal.database.model
+
+import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilities
+import io.realm.RealmObject
+
+internal open class HomeServerCapabilitiesEntity(
+ var maxUploadFileSize: Long = HomeServerCapabilities.MAX_UPLOAD_FILE_SIZE_UNKNOWN,
+ var lastUpdatedTimestamp: Long = 0L
+) : RealmObject() {
+
+ companion object
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushConditionEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushConditionEntity.kt
index e6c3d406c8..7922db5c0a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushConditionEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushConditionEntity.kt
@@ -25,5 +25,4 @@ internal open class PushConditionEntity(
) : RealmObject() {
companion object
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRuleEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRuleEntity.kt
index dd6cc79022..4744c8d053 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRuleEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRuleEntity.kt
@@ -19,21 +19,19 @@ import io.realm.RealmList
import io.realm.RealmObject
internal open class PushRuleEntity(
- //Required. The actions to perform when this rule is matched.
+ // Required. The actions to perform when this rule is matched.
var actionsStr: String? = null,
- //Required. Whether this is a default rule, or has been set explicitly.
+ // Required. Whether this is a default rule, or has been set explicitly.
var default: Boolean = false,
- //Required. Whether the push rule is enabled or not.
+ // Required. Whether the push rule is enabled or not.
var enabled: Boolean = true,
- //Required. The ID of this rule.
+ // Required. The ID of this rule.
var ruleId: String = "",
- //The conditions that must hold true for an event in order for a rule to be applied to an event
+ // The conditions that must hold true for an event in order for a rule to be applied to an event
var conditions: RealmList? = RealmList(),
- //The glob-style pattern to match against. Only applicable to content rules.
+ // The glob-style pattern to match against. Only applicable to content rules.
var pattern: String? = null
) : RealmObject() {
companion object
-
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRulesEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRulesEntity.kt
index e0acfa49ae..9527dafba4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRulesEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PushRulesEntity.kt
@@ -19,7 +19,6 @@ import im.vector.matrix.android.api.pushrules.RuleKind
import io.realm.RealmList
import io.realm.RealmObject
-
internal open class PushRulesEntity(
var scope: String = "",
var pushRules: RealmList = RealmList()
@@ -35,4 +34,4 @@ internal open class PushRulesEntity(
}
companion object
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherDataEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherDataEntity.kt
index 87694fb723..acc4f43bf9 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherDataEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherDataEntity.kt
@@ -22,4 +22,4 @@ internal open class PusherDataEntity(
var format: String? = null
) : RealmObject() {
companion object
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherEntity.kt
index 6ec9d4b0de..9c4dcce3cd 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/PusherEntity.kt
@@ -18,7 +18,7 @@ package im.vector.matrix.android.internal.database.model
import im.vector.matrix.android.api.session.pushers.PusherState
import io.realm.RealmObject
-//TODO
+// TODO
// at java.lang.Thread.run(Thread.java:764)
// Caused by: java.lang.IllegalArgumentException: 'value' is not a valid managed object.
// at io.realm.ProxyState.checkValidObject(ProxyState.java:213)
@@ -44,14 +44,13 @@ internal open class PusherEntity(
try {
return PusherState.valueOf(stateStr)
} catch (e: Exception) {
- //can this happen?
+ // can this happen?
return PusherState.UNREGISTERED
}
-
}
set(value) {
stateStr = value.name
}
companion object
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReactionAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReactionAggregatedSummaryEntity.kt
index 70938e5b89..58da4faf6b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReactionAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReactionAggregatedSummaryEntity.kt
@@ -38,5 +38,4 @@ internal open class ReactionAggregatedSummaryEntity(
) : RealmObject() {
companion object
-
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadMarkerEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadMarkerEntity.kt
new file mode 100644
index 0000000000..9e78c94f88
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadMarkerEntity.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.internal.database.model
+
+import io.realm.RealmObject
+import io.realm.RealmResults
+import io.realm.annotations.LinkingObjects
+import io.realm.annotations.PrimaryKey
+
+internal open class ReadMarkerEntity(
+ @PrimaryKey
+ var roomId: String = "",
+ var eventId: String = ""
+) : RealmObject() {
+
+ @LinkingObjects("readMarker")
+ val timelineEvent: RealmResults? = null
+
+ companion object
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptsSummaryEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptsSummaryEntity.kt
index 56e8938caa..b08ed0f728 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptsSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptsSummaryEntity.kt
@@ -33,5 +33,4 @@ internal open class ReadReceiptsSummaryEntity(
val timelineEvent: RealmResults? = null
companion object
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomEntity.kt
index a9f91390be..7de9451c32 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomEntity.kt
@@ -39,4 +39,3 @@ internal open class RoomEntity(@PrimaryKey var roomId: String = "",
companion object
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt
index 1c159b23d2..f414325aed 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt
@@ -35,6 +35,7 @@ internal open class RoomSummaryEntity(@PrimaryKey var roomId: String = "",
var otherMemberIds: RealmList = RealmList(),
var notificationCount: Int = 0,
var highlightCount: Int = 0,
+ var readMarkerId: String? = null,
var hasUnreadMessages: Boolean = false,
var tags: RealmList = RealmList(),
var userDrafts: UserDraftsEntity? = null
@@ -59,5 +60,4 @@ internal open class RoomSummaryEntity(@PrimaryKey var roomId: String = "",
}
companion object
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomTagEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomTagEntity.kt
index 12ca29b179..c78aa6ae84 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomTagEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomTagEntity.kt
@@ -24,5 +24,4 @@ internal open class RoomTagEntity(
) : RealmObject() {
companion object
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SessionRealmModule.kt
index 680e2eac7d..21b2fdce5a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SessionRealmModule.kt
@@ -44,7 +44,9 @@ import io.realm.annotations.RealmModule
PusherEntity::class,
PusherDataEntity::class,
ReadReceiptsSummaryEntity::class,
+ ReadMarkerEntity::class,
UserDraftsEntity::class,
- DraftEntity::class
+ DraftEntity::class,
+ HomeServerCapabilitiesEntity::class
])
internal class SessionRealmModule
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SyncEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SyncEntity.kt
index a7d3db1a7b..2eb39be325 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SyncEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SyncEntity.kt
@@ -21,4 +21,4 @@ import io.realm.annotations.PrimaryKey
internal open class SyncEntity(var nextBatch: String? = null,
@PrimaryKey var id: Long = 0
-) : RealmObject()
\ No newline at end of file
+) : RealmObject()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/TimelineEventEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/TimelineEventEntity.kt
index 429b2291f6..fd3a427781 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/TimelineEventEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/TimelineEventEntity.kt
@@ -21,7 +21,6 @@ import io.realm.RealmResults
import io.realm.annotations.Index
import io.realm.annotations.LinkingObjects
-
internal open class TimelineEventEntity(var localId: Long = 0,
@Index var eventId: String = "",
@Index var roomId: String = "",
@@ -31,12 +30,12 @@ internal open class TimelineEventEntity(var localId: Long = 0,
var isUniqueDisplayName: Boolean = false,
var senderAvatar: String? = null,
var senderMembershipEvent: EventEntity? = null,
- var readReceipts: ReadReceiptsSummaryEntity? = null
+ var readReceipts: ReadReceiptsSummaryEntity? = null,
+ var readMarker: ReadMarkerEntity? = null
) : RealmObject() {
@LinkingObjects("timelineEvents")
val chunk: RealmResults? = null
companion object
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserDraftsEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserDraftsEntity.kt
index b713fe1c3f..432b3367ad 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserDraftsEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserDraftsEntity.kt
@@ -32,5 +32,4 @@ internal open class UserDraftsEntity(var userDrafts: RealmList = Re
val roomSummaryEntity: RealmResults? = null
companion object
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserEntity.kt
index b4bfd9f22b..baf7629fdc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/UserEntity.kt
@@ -26,4 +26,3 @@ internal open class UserEntity(@PrimaryKey var userId: String = "",
companion object
}
-
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ChunkEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ChunkEntityQueries.kt
index 2f7145629a..69402ac1de 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ChunkEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ChunkEntityQueries.kt
@@ -62,4 +62,4 @@ internal fun ChunkEntity.Companion.create(realm: Realm, prevToken: String?, next
this.prevToken = prevToken
this.nextToken = nextToken
}
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventAnnotationsSummaryEntityQuery.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
index f1179ebeb4..1e7a5758ad 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
@@ -37,12 +37,13 @@ internal fun EventAnnotationsSummaryEntity.Companion.whereInRoom(realm: Realm, r
return query
}
-
-internal fun EventAnnotationsSummaryEntity.Companion.create(realm: Realm, eventId: String): EventAnnotationsSummaryEntity {
- val obj = realm.createObject(EventAnnotationsSummaryEntity::class.java, eventId)
- //Denormalization
- TimelineEventEntity.where(realm, eventId = eventId).findFirst()?.let {
+internal fun EventAnnotationsSummaryEntity.Companion.create(realm: Realm, roomId: String, eventId: String): EventAnnotationsSummaryEntity {
+ val obj = realm.createObject(EventAnnotationsSummaryEntity::class.java, eventId).apply {
+ this.roomId = roomId
+ }
+ // Denormalization
+ TimelineEventEntity.where(realm, roomId = roomId, eventId = eventId).findFirst()?.let {
it.annotations = obj
}
return obj
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt
index 6610edb884..62f53c3d7b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt
@@ -53,7 +53,6 @@ internal fun EventEntity.Companion.where(realm: Realm,
}
}
-
internal fun EventEntity.Companion.types(realm: Realm,
typeList: List = emptyList()): RealmQuery {
val query = realm.where()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/FilterContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/FilterContent.kt
index 92608a1f42..be7075ddd0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/FilterContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/FilterContent.kt
@@ -19,5 +19,4 @@ package im.vector.matrix.android.internal.database.query
internal object FilterContent {
internal const val EDIT_TYPE = """{*"m.relates_to"*"rel_type":*"m.replace"*}"""
-
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/HomeServerCapabilitiesQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/HomeServerCapabilitiesQueries.kt
new file mode 100644
index 0000000000..e7002a9005
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/HomeServerCapabilitiesQueries.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.internal.database.query
+
+import im.vector.matrix.android.internal.database.model.HomeServerCapabilitiesEntity
+import io.realm.Realm
+import io.realm.kotlin.createObject
+import io.realm.kotlin.where
+
+/**
+ * Get the current HomeServerCapabilitiesEntity, return null if it does not exist
+ */
+internal fun HomeServerCapabilitiesEntity.Companion.get(realm: Realm): HomeServerCapabilitiesEntity? {
+ return realm.where().findFirst()
+}
+
+/**
+ * Get the current HomeServerCapabilitiesEntity, create one if it does not exist
+ */
+internal fun HomeServerCapabilitiesEntity.Companion.getOrCreate(realm: Realm): HomeServerCapabilitiesEntity {
+ return get(realm) ?: realm.createObject()
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadMarkerEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadMarkerEntityQueries.kt
new file mode 100644
index 0000000000..061634a9da
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadMarkerEntityQueries.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.internal.database.query
+
+import im.vector.matrix.android.internal.database.model.ReadMarkerEntity
+import im.vector.matrix.android.internal.database.model.ReadMarkerEntityFields
+import io.realm.Realm
+import io.realm.RealmQuery
+import io.realm.kotlin.where
+
+internal fun ReadMarkerEntity.Companion.where(realm: Realm, roomId: String, eventId: String? = null): RealmQuery {
+ val query = realm.where()
+ .equalTo(ReadMarkerEntityFields.ROOM_ID, roomId)
+ if (eventId != null) {
+ query.equalTo(ReadMarkerEntityFields.EVENT_ID, eventId)
+ }
+ return query
+}
+
+internal fun ReadMarkerEntity.Companion.getOrCreate(realm: Realm, roomId: String): ReadMarkerEntity {
+ return where(realm, roomId).findFirst()
+ ?: realm.createObject(ReadMarkerEntity::class.java, roomId)
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadQueries.kt
index bd7e3a7a5e..0a925ac1ab 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadQueries.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadQueries.kt
@@ -16,6 +16,7 @@
package im.vector.matrix.android.internal.database.query
import com.zhuinden.monarchy.Monarchy
+import im.vector.matrix.android.api.session.events.model.LocalEcho
import im.vector.matrix.android.internal.database.model.ChunkEntity
import im.vector.matrix.android.internal.database.model.ReadReceiptEntity
@@ -26,7 +27,9 @@ internal fun isEventRead(monarchy: Monarchy,
if (userId.isNullOrBlank() || roomId.isNullOrBlank() || eventId.isNullOrBlank()) {
return false
}
-
+ if (LocalEcho.isLocalEchoId(eventId)) {
+ return true
+ }
var isEventRead = false
monarchy.doWithRealm { realm ->
@@ -45,4 +48,4 @@ internal fun isEventRead(monarchy: Monarchy,
}
return isEventRead
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptEntityQueries.kt
index acac419946..e0a507f939 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptEntityQueries.kt
@@ -28,6 +28,11 @@ internal fun ReadReceiptEntity.Companion.where(realm: Realm, roomId: String, use
.equalTo(ReadReceiptEntityFields.USER_ID, userId)
}
+internal fun ReadReceiptEntity.Companion.whereUserId(realm: Realm, userId: String): RealmQuery {
+ return realm.where()
+ .equalTo(ReadReceiptEntityFields.USER_ID, userId)
+}
+
internal fun ReadReceiptEntity.Companion.createUnmanaged(roomId: String, eventId: String, userId: String, originServerTs: Double): ReadReceiptEntity {
return ReadReceiptEntity().apply {
this.primaryKey = "${roomId}_$userId"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptsSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptsSummaryEntityQueries.kt
index 0c3d7d8eb1..1773297727 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptsSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptsSummaryEntityQueries.kt
@@ -27,10 +27,7 @@ internal fun ReadReceiptsSummaryEntity.Companion.where(realm: Realm, eventId: St
.equalTo(ReadReceiptsSummaryEntityFields.EVENT_ID, eventId)
}
-internal fun ReadReceiptsSummaryEntity.Companion.whereInRoom(realm: Realm, roomId: String?): RealmQuery {
- val query = realm.where