Merge branch 'release/0.7.0'

Fix 2 issues with share Activity: filter and room lists

.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"

.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

.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

.idea/dictionaries/bmarty.xml

@@ -0,0 +1,19 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="bmarty">
+    <words>
+      <w>backstack</w>
+      <w>bytearray</w>
+      <w>ciphertext</w>
+      <w>decryptor</w>
+      <w>emoji</w>
+      <w>emojis</w>
+      <w>hmac</w>
+      <w>ktlint</w>
+      <w>linkified</w>
+      <w>linkify</w>
+      <w>megolm</w>
+      <w>pbkdf</w>
+      <w>pkcs</w>
+    </words>
+  </dictionary>
+</component>

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 🧱:
  -
 

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
+<pre>
+./tools/check/check_code_quality.sh
+</pre>
+
+#### ktlint
+
+<pre>
+curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.34.2/ktlint && chmod a+x ktlint
+./ktlint --android --experimental -v
+</pre>
+
+Note that you can run
+
+<pre>
+./ktlint --android --experimental -v -F
+</pre>
+
+For ktlint to fix some detected errors for you (you still have to check and commit the fix of course)
+
+#### lint
+
+<pre>
+./gradlew lintGplayRelease
+./gradlew lintFdroidRelease
+</pre>
 
 ### Unit tests
 
 Make sure the following commands execute without any error:
 
-> ./gradlew testGplayReleaseUnitTest
+<pre>
+./gradlew testGplayReleaseUnitTest
+</pre>
 
 ### 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

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")

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

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

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<T>(
@@ -60,4 +59,4 @@ private class LiveDataObservable<T>(
 
 fun <T> LiveData<T>.asObservable(): Observable<T> {
     return LiveDataObservable(this).observeOn(Schedulers.computation())
-}
+}

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<T>(private val completableEmitter: CompletableEmitter) : MatrixCallback<T> {
 
@@ -36,4 +35,4 @@ fun Cancelable.toCompletable(completableEmitter: CompletableEmitter) {
     completableEmitter.setCancellable {
         this.cancel()
     }
-}
+}

matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/MatrixCallbackSingle.kt

@@ -35,4 +35,4 @@ fun <T> Cancelable.toSingle(singleEmitter: SingleEmitter<T>) {
     singleEmitter.setCancellable {
         this.cancel()
     }
-}
+}

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<DialogListItem>) : DialogAdapter(context) {
-
-    init {
-        addAll(items)
-    }
+fun <T : Any> Observable<Optional<T>>.unwrap(): Observable<T> {
+    return filter { it.hasValue() }.map { it.get() }
 }

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<RoomSummary> {
-        return room.liveRoomSummary().asObservable()
+    fun liveRoomSummary(): Observable<Optional<RoomSummary>> {
+        return room.getRoomSummaryLive().asObservable()
     }
 
     fun liveRoomMemberIds(): Observable<List<String>> {
         return room.getRoomMemberIdsLive().asObservable()
     }
 
-    fun liveAnnotationSummary(eventId: String): Observable<EventAnnotationsSummary> {
+    fun liveAnnotationSummary(eventId: String): Observable<Optional<EventAnnotationsSummary>> {
         return room.getEventSummaryLive(eventId).asObservable()
     }
 
-    fun liveTimelineEvent(eventId: String): Observable<TimelineEvent> {
-        return room.liveTimeLineEvent(eventId).asObservable()
+    fun liveTimelineEvent(eventId: String): Observable<Optional<TimelineEvent>> {
+        return room.getTimeLineEventLive(eventId).asObservable()
+    }
+
+    fun liveReadMarker(): Observable<Optional<String>> {
+        return room.getReadMarkerLive().asObservable()
+    }
+
+    fun liveReadReceipt(): Observable<Optional<String>> {
+        return room.getMyReadReceiptLive().asObservable()
     }
 
     fun loadRoomMembersIfNeeded(): Single<Unit> = Single.create {
@@ -58,9 +67,8 @@ class RxRoom(private val room: Room) {
     fun liveDrafts(): Observable<List<UserDraft>> {
         return room.getDraftsLive().asObservable()
     }
-
 }
 
 fun Room.rx(): RxRoom {
     return RxRoom(this)
-}
+}

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<Optional<User>> {
+        return session.liveUser(userId).asObservable().distinctUntilChanged()
+    }
+
     fun liveUsers(): Observable<List<User>> {
         return session.liveUsers().asObservable()
     }
@@ -66,9 +71,8 @@ class RxSession(private val session: Session) {
     fun joinRoom(roomId: String, viaServers: List<String> = emptyList()): Single<Unit> = Single.create {
         session.joinRoom(roomId, viaServers, MatrixCallbackSingle(it)).toSingle(it)
     }
-
 }
 
 fun Session.rx(): RxSession {
     return RxSession(this)
-}
+}

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"
 

matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/InstrumentedTest.kt

@@ -28,4 +28,4 @@ interface InstrumentedTest {
     fun cacheDir(): File {
         return context().cacheDir
     }
-}
+}

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))
     }
-}
+}

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)
+internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(Main, Main, Main, Main, Main)

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)
     }
-
-
-}
+}

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"
     )
-}
+}

matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt

@@ -114,4 +114,4 @@ class CryptoStoreTest {
         olmAccount1.releaseAccount()
         olmAccount2.releaseAccount()
     }
-}
+}

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
 }"""))
     }
-}
+}

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
         }
     }
-
-}
+}

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)
     }
-
-
-}
+}

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)
     }
-
 }
-

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<Event> = emptyList(),
                                         override val stateEvents: List<Event> = emptyList()
-) : TokenChunkEvent
+) : TokenChunkEvent

matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/RoomDataHelper.kt

@@ -88,6 +88,4 @@ object RoomDataHelper {
             roomEntity.addOrUpdate(chunkEntity)
         }
     }
-
-
-}
+}

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()
 //    }
-
-
-}
+}

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)

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)
         }
     }
-}
+}

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 + ")"
         }
     }
-
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/MatrixCallback.kt

@@ -27,7 +27,7 @@ interface MatrixCallback<in T> {
      * @param data the data successfully returned from the async function
      */
     fun onSuccess(data: T) {
-        //no-op
+        // no-op
     }
 
     /**
@@ -35,7 +35,6 @@ interface MatrixCallback<in T> {
      * @param failure the failure data returned from the async function
      */
     fun onFailure(failure: Throwable) {
-        //no-op
+        // no-op
     }
-
-}
+}

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)
-
     }
 }

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
-}
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/HomeServerConnectionConfig.kt

@@ -253,13 +253,5 @@ data class HomeServerConnectionConfig(
                     forceUsageTlsVersions
             )
         }
-
     }
-
-
 }
-
-
-
-
-

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()
         }
     }
-}
+}

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<DeviceInfo>.sortByLastSeen() {
-    Collections.sort(this, DatedObjectComparators.descComparator)
-}
+fun MutableList<DeviceInfo>.sortByLastSeen() {
+    sortWith(DatedObjectComparators.descComparator)
+}

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
-)
+)

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()
-
-}
+}

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"
     }
-}
+}

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)
-}
+}

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)
-}
+}

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
     }
-
-}
+}

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)
     }
-
-
-}
+}

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()
-
 }

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")
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/PermalinkParser.kt

@@ -72,5 +72,4 @@ object PermalinkParser {
             else                                 -> PermalinkData.FallbackLink(uri)
         }
     }
-
-}
+}

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<Action> {
                         }
                         // 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<Action> {
         }
     }
 
-
     return result
 }
-

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"
     }
-}
+}

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
-}
+}

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<MessageContent>()
             }
-            //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<MessageContent>()
@@ -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
         }
     }
-}
+}

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
         }
     }
-}
+}

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<PushRule>
 
-    //TODO update rule
+    // TODO update rule
 
     fun updatePushRuleEnableStatus(kind: RuleKind, pushRule: PushRule, enabled: Boolean, callback: MatrixCallback<Unit>): Cancelable
 
@@ -42,8 +42,9 @@ interface PushRuleService {
 
     interface PushRuleListener {
         fun onMatchRule(event: Event, actions: List<Action>)
+        fun onRoomJoined(roomId: String)
         fun onRoomLeft(roomId: String)
         fun onEventRedacted(redactedEventId: String)
         fun batchFinish()
     }
-}
+}

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
-
     }
-}
+}

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)
     }
-}
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/PushCondition.kt

@@ -76,4 +76,4 @@ data class PushCondition(
             }
         }
     }
-}
+}

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
 )
-

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<PushRule>? = null,
         val sender: List<PushRule>? = null,
         val underride: List<PushRule>? = null
-)
+)

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
     )
-}
+}

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)
     }
-
-}
+}

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<Unit>)
-
-}
+}

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
     }
-
-}
+}

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()
     }
-}
+}

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?
-}
+}

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)
-
-}
+}

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."
     }
-}
+}

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
-
-}
+}

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
-}
+}

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)
-}
+}

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
-}
+}

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)
+                               @StringRes val nameResId: Int)

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
     }
-}
+}

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
     }
-}
+}

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"
-}
+}

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)
     }
-}
+}

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()
-}
+}

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
 }

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<RelationChunkInfo>? = null
 
-) : UnsignedRelationInfo
+) : UnsignedRelationInfo

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
-)
+)

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<Map<String, Any>>? = null
 
-) : UnsignedRelationInfo
+) : UnsignedRelationInfo

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 <reified T> 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 <reified T> 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 <reified T> 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 <reified T> 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<MessageContent>()?.type) {
@@ -214,4 +206,4 @@ fun Event.isImageMessage(): Boolean {
         MessageType.MSGTYPE_IMAGE -> true
         else                      -> false
     }
-}
+}

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)
     }

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()}"
+}

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"
-
-}
+}

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<String, Any>? = null,
         @Json(name = "m.relations") val relations: AggregatedRelations? = null
-)
+)

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?
-}
+}

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<File>)
-}
+}

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
-}
+}

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<List<GroupSummary>>
-}
+}

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<String> = emptyList(),
         val userIds: List<String> = emptyList()
-)
+)

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
+    }
+}

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
+}

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
-)
+)

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<Unit>)
 
     companion object {
@@ -63,4 +61,4 @@ interface PushersService {
     fun livePushers(): LiveData<List<Pusher>>
 
     fun pushers() : List<Pusher>
-}
+}

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<RoomSummary>
+    fun getRoomSummaryLive(): LiveData<Optional<RoomSummary>>
 
     fun roomSummary(): RoomSummary?
-
-}
+}

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<Map<String, ThirdPartyProtocol>>): Cancelable
-
-}
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt

@@ -54,4 +54,8 @@ interface RoomService {
      */
     fun liveRoomSummaries(): LiveData<List<RoomSummary>>
 
-}
+    /**
+     * Mark all rooms as read
+     */
+    fun markAllAsRead(roomIds: List<String>, callback: MatrixCallback<Unit>): Cancelable
+}

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
-}
+}

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()
-
-}
+}