-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update sort order in the SDK without recreating duplicate room lists
Change-Id: Ieffbfc5199d8c9c2d06d32b52993497f17aac339
- Loading branch information
1 parent
929f529
commit c48cab9
Showing
21 changed files
with
141 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
app/src/main/kotlin/io/element/android/x/ScElementXApplicationExtensions.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
package io.element.android.x | ||
|
||
import android.content.Context | ||
import androidx.startup.Initializer | ||
import io.element.android.libraries.architecture.bindings | ||
import io.element.android.x.di.AppBindings | ||
import kotlinx.coroutines.runBlocking | ||
import timber.log.Timber | ||
|
||
class ScInitializer : Initializer<Unit> { | ||
override fun create(context: Context) { | ||
val ts = System.currentTimeMillis() | ||
val appBindings = context.bindings<AppBindings>() | ||
// runBlocking is not nice, but we want to make sure that preferences are ready before creating room list service | ||
runBlocking { | ||
appBindings.scPreferencesStore().prefetch() | ||
} | ||
Timber.d("Initialized SC dependencies in ${System.currentTimeMillis() - ts} ms") | ||
} | ||
|
||
override fun dependencies(): List<Class<out Initializer<*>>> = emptyList() | ||
} |
32 changes: 32 additions & 0 deletions
32
...res/roomlist/impl/src/main/kotlin/chat/schildi/features/roomlist/ScInboxSettingsSource.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
package chat.schildi.features.roomlist | ||
|
||
import chat.schildi.lib.preferences.ScPreferencesStore | ||
import chat.schildi.lib.preferences.ScPrefs | ||
import io.element.android.libraries.matrix.api.roomlist.RoomListService | ||
import io.element.android.libraries.matrix.api.roomlist.ScSdkInboxSettings | ||
import io.element.android.libraries.matrix.api.roomlist.ScSdkRoomSortOrder | ||
import kotlinx.coroutines.CoroutineScope | ||
import kotlinx.coroutines.flow.launchIn | ||
import kotlinx.coroutines.flow.onEach | ||
import javax.inject.Inject | ||
|
||
class ScInboxSettingsSource @Inject constructor( | ||
private val scPreferencesStore: ScPreferencesStore, | ||
private val roomListService: RoomListService, | ||
) { | ||
fun launchIn(scope: CoroutineScope) { | ||
scPreferencesStore.combinedSettingFlow { lookup -> | ||
ScSdkInboxSettings( | ||
sortOrder = ScSdkRoomSortOrder( | ||
byUnread = ScPrefs.SORT_BY_UNREAD.let { it.ensureType(lookup(it)) ?: it.defaultValue }, | ||
pinFavourites = ScPrefs.PIN_FAVORITES.let { it.ensureType(lookup(it)) ?: it.defaultValue }, | ||
buryLowPriority = ScPrefs.BURY_LOW_PRIORITY.let { it.ensureType(lookup(it)) ?: it.defaultValue }, | ||
clientSideUnreadCounts = ScPrefs.CLIENT_GENERATED_UNREAD_COUNTS.let { it.ensureType(lookup(it)) ?: it.defaultValue }, | ||
withSilentUnread = ScPrefs.SORT_WITH_SILENT_UNREAD.let { it.ensureType(lookup(it)) ?: it.defaultValue }, | ||
) | ||
) | ||
}.onEach { inboxSettings -> | ||
roomListService.allRooms.updateSettings(inboxSettings) | ||
}.launchIn(scope) | ||
} | ||
} |
42 changes: 0 additions & 42 deletions
42
...res/roomlist/impl/src/main/kotlin/chat/schildi/features/roomlist/ScRoomSortOrderSource.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 4 additions & 1 deletion
5
...es/matrix/api/roomlist/ScRoomSortOrder.kt → ...matrix/api/roomlist/ScSdkRoomSortOrder.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.