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

Cleanup

Browse Source
This commit is contained in:
Benoit Marty 2021-04-26 15:54:38 +02:00 committed by Benoit Marty
parent 80b155e042
commit e073563a67
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
View File

@ -81,7 +81,6 @@ import javax.inject.Provider
@SessionScope @SessionScope
internal class DefaultSession @Inject constructor( internal class DefaultSession @Inject constructor(
override val sessionParams: SessionParams, override val sessionParams: SessionParams,
private val sessionCoroutineScopeHolder: SessionCoroutineScopeHolder,
private val workManagerProvider: WorkManagerProvider, private val workManagerProvider: WorkManagerProvider,
private val globalErrorHandler: GlobalErrorHandler, private val globalErrorHandler: GlobalErrorHandler,
@SessionId @SessionId
@ -165,7 +164,9 @@ internal class DefaultSession @Inject constructor(
isOpen = true isOpen = true
cryptoService.get().ensureDevice() cryptoService.get().ensureDevice()
uiHandler.post { uiHandler.post {
lifecycleObservers.forEach { it.onSessionStarted(this) } lifecycleObservers.forEach {
it.onSessionStarted(this)
}
sessionListeners.dispatch { sessionListeners.dispatch {
it.onSessionStarted(this) it.onSessionStarted(this)
} }
@ -237,7 +238,9 @@ internal class DefaultSession @Inject constructor(
stopSync() stopSync()
stopAnyBackgroundSync() stopAnyBackgroundSync()
uiHandler.post { uiHandler.post {
lifecycleObservers.forEach { it.onClearCache(this) } lifecycleObservers.forEach {
it.onClearCache(this)
}
sessionListeners.dispatch { sessionListeners.dispatch {
it.onClearCache(this) it.onClearCache(this)
} }

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
View File

@ -37,8 +37,7 @@ internal class SessionCoroutineScopeHolder @Inject constructor(): SessionLifecyc
scope.cancelChildren() scope.cancelChildren()
} }
private fun CoroutineScope.cancelChildren(){ private fun CoroutineScope.cancelChildren() {
coroutineContext.cancelChildren(CancellationException("Closing session")) coroutineContext.cancelChildren(CancellationException("Closing session"))
} }
} }

1
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
View File

@ -1745,7 +1745,6 @@ class RoomDetailFragment @Inject constructor(
} }
private fun onSaveActionClicked(action: EventSharedAction.Save) { private fun onSaveActionClicked(action: EventSharedAction.Save) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q
&& !checkPermissions(PERMISSIONS_FOR_WRITING_FILES, requireActivity(), saveActionActivityResultLauncher)) { && !checkPermissions(PERMISSIONS_FOR_WRITING_FILES, requireActivity(), saveActionActivityResultLauncher)) {
sharedActionViewModel.pendingAction = action sharedActionViewModel.pendingAction = action

1
vector/src/main/java/im/vector/app/features/session/SessionListener.kt
View File

@ -44,5 +44,4 @@ class SessionListener @Inject constructor() : Session.Listener {
override fun onClearCache(session: Session) { override fun onClearCache(session: Session) {
session.coroutineScope.coroutineContext.cancelChildren() session.coroutineScope.coroutineContext.cancelChildren()
} }
} }