filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in syncService

Browse Source
This commit is contained in:
Benoit Marty 2020-01-09 15:01:16 +01:00
parent e3205fb493
commit 9775e8c32b
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt
View File

@ -19,6 +19,7 @@ package im.vector.matrix.android.api.session
import androidx.annotation.MainThread import androidx.annotation.MainThread
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import im.vector.matrix.android.api.auth.data.SessionParams import im.vector.matrix.android.api.auth.data.SessionParams
import im.vector.matrix.android.api.auth.data.sessionId
import im.vector.matrix.android.api.failure.GlobalError import im.vector.matrix.android.api.failure.GlobalError
import im.vector.matrix.android.api.pushrules.PushRuleService import im.vector.matrix.android.api.pushrules.PushRuleService
import im.vector.matrix.android.api.session.cache.CacheService import im.vector.matrix.android.api.session.cache.CacheService
@ -73,6 +74,11 @@ interface Session :
val myUserId: String val myUserId: String
get() = sessionParams.credentials.userId get() = sessionParams.credentials.userId
/**
* The sessionId
*/
val sessionId: String
/** /**
* This method allow to open a session. It does start some service on the background. * This method allow to open a session. It does start some service on the background.
*/ */

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
View File

@ -65,7 +65,7 @@ internal class DefaultSession @Inject constructor(
private val context: Context, private val context: Context,
private val eventBus: EventBus, private val eventBus: EventBus,
@SessionId @SessionId
private val sessionId: String, override val sessionId: String,
private val liveEntityObservers: Set<@JvmSuppressWildcards LiveEntityObserver>, private val liveEntityObservers: Set<@JvmSuppressWildcards LiveEntityObserver>,
private val sessionListeners: SessionListeners, private val sessionListeners: SessionListeners,
private val roomService: Lazy<RoomService>, private val roomService: Lazy<RoomService>,

2
vector/src/main/java/im/vector/riotx/core/extensions/Session.kt
View File

@ -47,7 +47,7 @@ fun Session.configureAndStart(context: Context,
fun Session.startSyncing(context: Context) { fun Session.startSyncing(context: Context) {
val applicationContext = context.applicationContext val applicationContext = context.applicationContext
if (!hasAlreadySynced()) { if (!hasAlreadySynced()) {
VectorSyncService.newIntent(applicationContext, myUserId).also { VectorSyncService.newIntent(applicationContext, sessionId).also {
try { try {
ContextCompat.startForegroundService(applicationContext, it) ContextCompat.startForegroundService(applicationContext, it)
} catch (ex: Throwable) { } catch (ex: Throwable) {