Skip to content

Commit 46225a6

Browse files
committed
Merge branch 'release/1.5.18' into main
2 parents 133fff1 + 547940c commit 46225a6

File tree

7 files changed

+34
-17
lines changed

7 files changed

+34
-17
lines changed

CHANGES.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
Changes in Element v.5.16 (2022-12-29)
1+
Changes in Element v1.5.18 (2023-01-02)
2+
=======================================
3+
4+
This release fixes a bunch of recent regressions. Most of them were not pushed to production hopefully. Current production version is 1.5.11.
5+
Threads are now enabled by default, and this may let the application perform an initial sync.
6+
Testers on the PlayStore may have experimented some issues like empty room list, or incomplete room state (room name missing, etc.), or even crashing due to initial sync not using lazy loading of room members. All those issues have been fixed, but to fix your current state, please clear cache once you get the release 1.5.18.
7+
8+
Bugfixes 🐛
9+
----------
10+
- Start DM will create a deadlock if user profile was never loaded ([#7870](https://github.com/vector-im/element-android/issues/7870))
11+
12+
13+
Changes in Element v1.5.16 (2022-12-29)
214
======================================
315

416
Features ✨
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Main changes in this version: Thread are now enabled by default.
2+
Full changelog: https://github.com/vector-im/element-android/releases

matrix-sdk-android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ android {
6262
// that the app's state is completely cleared between tests.
6363
testInstrumentationRunnerArguments clearPackageData: 'true'
6464

65-
buildConfigField "String", "SDK_VERSION", "\"1.5.16\""
65+
buildConfigField "String", "SDK_VERSION", "\"1.5.18\""
6666

6767
buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
6868
buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateLocalRoomTask.kt

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import io.realm.Realm
2121
import io.realm.RealmConfiguration
2222
import io.realm.kotlin.createObject
2323
import kotlinx.coroutines.TimeoutCancellationException
24-
import kotlinx.coroutines.runBlocking
24+
import org.matrix.android.sdk.api.session.events.model.Event
2525
import org.matrix.android.sdk.api.session.events.model.EventType
2626
import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
2727
import org.matrix.android.sdk.api.session.room.model.Membership
@@ -73,8 +73,9 @@ internal class DefaultCreateLocalRoomTask @Inject constructor(
7373
override suspend fun execute(params: CreateRoomParams): String {
7474
val createRoomBody = createRoomBodyBuilder.build(params)
7575
val roomId = RoomLocalEcho.createLocalEchoId()
76+
val eventList = createLocalRoomStateEventsTask.execute(CreateLocalRoomStateEventsTask.Params(createRoomBody))
7677
monarchy.awaitTransaction { realm ->
77-
createLocalRoomEntity(realm, roomId, createRoomBody)
78+
createLocalRoomEntity(realm, roomId, eventList)
7879
createLocalRoomSummaryEntity(realm, roomId, params, createRoomBody)
7980
}
8081

@@ -96,10 +97,10 @@ internal class DefaultCreateLocalRoomTask @Inject constructor(
9697
* Create a local room entity from the given room creation params.
9798
* This will also generate and store in database the chunk and the events related to the room params in order to retrieve and display the local room.
9899
*/
99-
private fun createLocalRoomEntity(realm: Realm, roomId: String, createRoomBody: CreateRoomBody) {
100+
private fun createLocalRoomEntity(realm: Realm, roomId: String, localStateEventList: List<Event>) {
100101
RoomEntity.getOrCreate(realm, roomId).apply {
101102
membership = Membership.JOIN
102-
chunks.add(createLocalRoomChunk(realm, roomId, createRoomBody))
103+
chunks.add(createLocalRoomChunk(realm, roomId, localStateEventList))
103104
membersLoadStatus = RoomMembersLoadStatusType.LOADED
104105
}
105106
}
@@ -145,23 +146,19 @@ internal class DefaultCreateLocalRoomTask @Inject constructor(
145146
*
146147
* @param realm the current instance of realm
147148
* @param roomId the id of the local room
148-
* @param createRoomBody the room creation params
149+
* @param localStateEventList list of local state events for that room
149150
*
150151
* @return a chunk entity
151152
*/
152-
private fun createLocalRoomChunk(realm: Realm, roomId: String, createRoomBody: CreateRoomBody): ChunkEntity {
153+
private fun createLocalRoomChunk(realm: Realm, roomId: String, localStateEventList: List<Event>): ChunkEntity {
153154
val chunkEntity = realm.createObject<ChunkEntity>().apply {
154155
isLastBackward = true
155156
isLastForward = true
156157
}
157158

158-
// Can't suspend when using realm as it could jump thread
159-
val eventList = runBlocking {
160-
createLocalRoomStateEventsTask.execute(CreateLocalRoomStateEventsTask.Params(createRoomBody))
161-
}
162159
val roomMemberContentsByUser = HashMap<String, RoomMemberContent?>()
163160

164-
for (event in eventList) {
161+
for (event in localStateEventList) {
165162
if (event.eventId == null || event.senderId == null || event.type == null) {
166163
continue
167164
}

tools/emojis/emoji_picker_datasource_formatted.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14362,7 +14362,11 @@
1436214362
"plant",
1436314363
"nature",
1436414364
"branch",
14365-
"summer"
14365+
"summer",
14366+
"bamboo",
14367+
"wish",
14368+
"star_festival",
14369+
"tanzaku"
1436614370
]
1436714371
},
1436814372
"pine-decoration": {
@@ -14373,10 +14377,12 @@
1437314377
"celebration",
1437414378
"Japanese",
1437514379
"pine",
14380+
"japanese",
1437614381
"plant",
1437714382
"nature",
1437814383
"vegetable",
14379-
"panda"
14384+
"panda",
14385+
"new_years"
1438014386
]
1438114387
},
1438214388
"japanese-dolls": {

vector-app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ext.versionMinor = 5
3737
// Note: even values are reserved for regular release, odd values for hotfix release.
3838
// When creating a hotfix, you should decrease the value, since the current value
3939
// is the value for the next regular release.
40-
ext.versionPatch = 16
40+
ext.versionPatch = 18
4141

4242
static def getGitTimestamp() {
4343
def cmd = 'git show -s --format=%ct'

vector/src/main/res/raw/emoji_picker_datasource.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)