From 95d64008aa4fb02d3599e567336a77955386f532 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 1 Jul 2019 20:12:05 +0200
Subject: [PATCH] Move to sdk

---
 .../matrix/android/internal/session/DefaultSession.kt       | 6 ++++++
 .../java/im/vector/riotredesign/features/MainActivity.kt    | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
index bd25efaa..e98b459a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
@@ -20,6 +20,7 @@ import android.content.Context
 import android.os.Looper
 import androidx.annotation.MainThread
 import androidx.lifecycle.LiveData
+import androidx.work.WorkManager
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.auth.data.SessionParams
@@ -150,6 +151,11 @@ internal class DefaultSession @Inject constructor(override val sessionParams: Se
                     override fun onSuccess(data: Unit) {
                         Timber.w("SIGN_OUT: clear cache -> SUCCESS: clear crypto cache")
                         cryptoService.clearCryptoCache(MatrixCallbackDelegate(callback))
+
+                        WorkManager.getInstance(context).also {
+                            it.cancelAllWork()
+                            it.pruneWork()
+                        }
                     }
 
                     override fun onFailure(failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt
index 23848281..f67663ac 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt
@@ -19,7 +19,6 @@ package im.vector.riotredesign.features
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import androidx.work.WorkManager
 import im.vector.matrix.android.api.Matrix
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.auth.Authenticator
@@ -67,10 +66,6 @@ class MainActivity : VectorBaseActivity() {
                 override fun onSuccess(data: Unit) {
                     Timber.w("SIGN_OUT: success, start app")
                     sessionHolder.clearActiveSession()
-                    WorkManager.getInstance(applicationContext).also {
-                        it.cancelAllWork()
-                        it.pruneWork()
-                    }
                     start()
                 }
             })