Merge branch 'release/0.13.0'

element-hq · Jan 17, 2020 · f471d9c · f471d9c
2 parents 24a7ce7 + 7604748
commit f471d9c
Show file tree

Hide file tree

Showing 206 changed files with 4,930 additions and 845 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,4 +7,4 @@
 - [ ] Pull request is based on the develop branch
 - [ ] Pull request updates [CHANGES.md](https://github.com/vector-im/riotX-android/blob/develop/CHANGES.md)
 - [ ] Pull request includes screenshots or videos if containing UI changes
-- [ ] Pull request includes a [sign off](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst#sign-off)
+- [ ] Pull request includes a [sign off](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md#sign-off)
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@
 /local.properties
 # idea files: exclude everything except dictionnaries
 .idea/caches
-.idea/codeStyles
 .idea/libraries
 .idea/*.xml
 .DS_Store

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,21 @@
+Changes in RiotX 0.13.0 (2020-01-17)
+===================================================
+
+Features ✨:
+ - Send and render typing events (#564)
+ - Create Room Profile screen (#54)
+ - Create Room Member Profile screen (#59)
+
+Improvements 🙌:
+ - Render events m.room.encryption and m.room.guest_access in the timeline
+
+Bugfix 🐛:
+ - Fix broken background sync in F-Droid version
+ - Fix issue with downloaded file on encrypted rooms. The file was not properly decrypted
+
+Build 🧱:
+ - Change the way versionCode is computed (#827)
+
 Changes in RiotX 0.12.0 (2020-01-09)
 ===================================================
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing code to Matrix
 
-Please read https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst
+Please read https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md
 
 Android support can be found in this [![Riot Android Matrix room #riot-android:matrix.org](https://img.shields.io/matrix/riot-android:matrix.org.svg?label=%23riot-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#riot-android:matrix.org) room.
 
@@ -11,6 +11,7 @@ Dedicated room for RiotX: [![RiotX Android Matrix room #riot-android:matrix.org]
 ## Android Studio settings
 
 Please set the "hard wrap" setting of Android Studio to 160 chars, this is the setting we use internally to format the source code (Menu `Settings/Editor/Code Style` then `Hard wrap at`).
+Please ensure that your using the project formatting rules (which are in the project at .idea/codeStyles/), and format the file before committing them.
 
 ## Compilation
 

diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/OptionalRx.kt b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/OptionalRx.kt
@@ -22,3 +22,9 @@ import io.reactivex.Observable
 fun <T : Any> Observable<Optional<T>>.unwrap(): Observable<T> {
     return filter { it.hasValue() }.map { it.get() }
 }
+
+fun <T : Any, U : Any> Observable<Optional<T>>.mapOptional(fn: (T) -> U?): Observable<Optional<U>> {
+    return map {
+        it.map(fn)
+    }
+}
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
@@ -16,11 +16,12 @@
 
 package im.vector.matrix.rx
 
+import im.vector.matrix.android.api.session.events.model.Event
 import im.vector.matrix.android.api.session.room.Room
 import im.vector.matrix.android.api.session.room.members.RoomMemberQueryParams
 import im.vector.matrix.android.api.session.room.model.EventAnnotationsSummary
 import im.vector.matrix.android.api.session.room.model.ReadReceipt
-import im.vector.matrix.android.api.session.room.model.RoomMember
+import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
 import im.vector.matrix.android.api.session.room.send.UserDraft
@@ -37,7 +38,7 @@ class RxRoom(private val room: Room) {
                 .startWith(room.roomSummary().toOptional())
     }
 
-    fun liveRoomMembers(queryParams: RoomMemberQueryParams): Observable<List<RoomMember>> {
+    fun liveRoomMembers(queryParams: RoomMemberQueryParams): Observable<List<RoomMemberSummary>> {
         return room.getRoomMembersLive(queryParams).asObservable()
                 .startWith(room.getRoomMembers(queryParams))
     }
@@ -52,6 +53,11 @@ class RxRoom(private val room: Room) {
                 .startWith(room.getTimeLineEvent(eventId).toOptional())
     }
 
+    fun liveStateEvent(eventType: String): Observable<Optional<Event>> {
+        return room.getStateEventLive(eventType).asObservable()
+                .startWith(room.getStateEvent(eventType).toOptional())
+    }
+
     fun liveReadMarker(): Observable<Optional<String>> {
         return room.getReadMarkerLive().asObservable()
     }

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
@@ -26,7 +26,9 @@ 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.JsonDict
 import im.vector.matrix.android.api.util.Optional
+import im.vector.matrix.android.api.util.toOptional
 import io.reactivex.Observable
 import io.reactivex.Single
 
@@ -56,7 +58,8 @@ class RxSession(private val session: Session) {
     }
 
     fun liveUser(userId: String): Observable<Optional<User>> {
-        return session.getUserLive(userId).asObservable().distinctUntilChanged()
+        return session.getUserLive(userId).asObservable()
+                .startWith(session.getUser(userId).toOptional())
     }
 
     fun liveUsers(): Observable<List<User>> {
@@ -91,6 +94,10 @@ class RxSession(private val session: Session) {
                          searchOnServer: Boolean): Single<Optional<String>> = singleBuilder {
         session.getRoomIdByAlias(roomAlias, searchOnServer, it)
     }
+
+    fun getProfileInfo(userId: String): Single<JsonDict> = singleBuilder {
+        session.getProfile(userId, it)
+    }
 }
 
 fun Session.rx(): RxSession {

diff --git a/...src/androidTest/java/im/vector/matrix/android/internal/crypto/AttachmentEncryptionTest.kt b/...src/androidTest/java/im/vector/matrix/android/internal/crypto/AttachmentEncryptionTest.kt
@@ -55,8 +55,6 @@ class AttachmentEncryptionTest {
 
         assertNotNull(decryptedStream)
 
-        inputStream.close()
-
         val buffer = ByteArray(100)
 
         val len = decryptedStream!!.read(buffer)

diff --git a/...oid/src/androidTest/java/im/vector/matrix/android/session/room/timeline/RoomDataHelper.kt b/...oid/src/androidTest/java/im/vector/matrix/android/session/room/timeline/RoomDataHelper.kt
@@ -21,7 +21,7 @@ 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.toContent
 import im.vector.matrix.android.api.session.room.model.Membership
-import im.vector.matrix.android.api.session.room.model.RoomMember
+import im.vector.matrix.android.api.session.room.model.RoomMemberSummary
 import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
 import im.vector.matrix.android.api.session.room.model.message.MessageType
 import kotlin.random.Random
@@ -63,7 +63,7 @@ object RoomDataHelper {
     }
 
     fun createFakeRoomMemberEvent(): Event {
-        val roomMember = RoomMember(Membership.JOIN, "Fake name #${Random.nextLong()}").toContent()
+        val roomMember = RoomMemberSummary(Membership.JOIN, "Fake name #${Random.nextLong()}").toContent()
         return createFakeEvent(EventType.STATE_ROOM_MEMBER, roomMember)
     }
 }
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
@@ -24,10 +24,13 @@ import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.BuildConfig
 import im.vector.matrix.android.api.auth.AuthenticationService
 import im.vector.matrix.android.internal.SessionManager
+import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
+import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments
 import im.vector.matrix.android.internal.di.DaggerMatrixComponent
 import im.vector.matrix.android.internal.network.UserAgentHolder
 import im.vector.matrix.android.internal.util.BackgroundDetectionObserver
 import org.matrix.olm.OlmManager
+import java.io.InputStream
 import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 
@@ -96,5 +99,9 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         fun getSdkVersion(): String {
             return BuildConfig.VERSION_NAME + " (" + BuildConfig.GIT_SDK_REVISION + ")"
         }
+
+        fun decryptStream(inputStream: InputStream?, elementToDecrypt: ElementToDecrypt): InputStream? {
+            return MXEncryptedAttachments.decryptAttachment(inputStream, elementToDecrypt)
+        }
     }
 }
diff --git a/...main/java/im/vector/matrix/android/api/pushrules/SenderNotificationPermissionCondition.kt b/...main/java/im/vector/matrix/android/api/pushrules/SenderNotificationPermissionCondition.kt
@@ -16,7 +16,8 @@
 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
+import im.vector.matrix.android.api.session.room.model.PowerLevelsContent
+import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper
 
 class SenderNotificationPermissionCondition(val key: String) : Condition(Kind.sender_notification_permission) {
 
@@ -28,7 +29,8 @@ 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)
+    fun isSatisfied(event: Event, powerLevels: PowerLevelsContent): Boolean {
+        val powerLevelsHelper = PowerLevelsHelper(powerLevels)
+        return event.senderId != null && powerLevelsHelper.getUserPowerLevel(event.senderId) >= powerLevelsHelper.notificationLevel(key)
     }
 }
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
@@ -28,6 +28,7 @@ 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.profile.ProfileService
 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
@@ -51,6 +52,7 @@ interface Session :
         SignOutService,
         FilterService,
         FileService,
+        ProfileService,
         PushRuleService,
         PushersService,
         InitialSyncProgressService,

diff --git a/...-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/EventType.kt b/...-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/EventType.kt
@@ -91,7 +91,8 @@ object EventType {
             STATE_ROOM_CANONICAL_ALIAS,
             STATE_ROOM_HISTORY_VISIBILITY,
             STATE_ROOM_RELATED_GROUPS,
-            STATE_ROOM_PINNED_EVENT
+            STATE_ROOM_PINNED_EVENT,
+            STATE_ROOM_ENCRYPTION
     )
 
     fun isStateEvent(type: String): Boolean {