From af04c95bab11946ff45a839cd34ac14f335c0f36 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Fri, 3 Jan 2020 18:16:32 +0100 Subject: [PATCH] Disable logs --- .../nextcloud/talk/application/NextcloudTalkApplication.kt | 3 --- .../java/com/nextcloud/talk/newarch/mvvm/BaseViewModel.kt | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt index eb47dc16d..f947c0eab 100644 --- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt +++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt @@ -35,7 +35,6 @@ import androidx.work.PeriodicWorkRequest import androidx.work.WorkManager import coil.Coil import coil.ImageLoader -import coil.util.CoilLogger import com.bluelinelabs.logansquare.LoganSquare import com.nextcloud.talk.BuildConfig import com.nextcloud.talk.components.filebrowser.webdav.DavUtils @@ -126,8 +125,6 @@ class NextcloudTalkApplication : Application(), LifecycleObserver { startKoin() DavUtils.registerCustomFactories() - CoilLogger.setLevel(Log.DEBUG) - CoilLogger.setEnabled(true)// Enable logging to the standard Android log. Coil.setDefaultImageLoader(imageLoader) migrateUsers() diff --git a/app/src/main/java/com/nextcloud/talk/newarch/mvvm/BaseViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/mvvm/BaseViewModel.kt index 9d57d98ba..724f40f86 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/mvvm/BaseViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/mvvm/BaseViewModel.kt @@ -36,7 +36,7 @@ abstract class BaseViewModel(application: Application) : AndroidVi protected val disposables: CompositeDisposable = CompositeDisposable() protected val context: Context = application.applicationContext - val backgroundAndUIScope = CoroutineScope( + val uiScope = CoroutineScope( Job() + Dispatchers.Main ) @@ -47,7 +47,7 @@ abstract class BaseViewModel(application: Application) : AndroidVi override fun onCleared() { super.onCleared() disposables.clear() - backgroundAndUIScope.cancel() + uiScope.cancel() backgroundScope.cancel() } } \ No newline at end of file