From 82c4a5a1f9d4ceb507b51579b1ec806d83ffa4c0 Mon Sep 17 00:00:00 2001 From: davidoskky Date: Sat, 20 Aug 2022 12:42:24 +0200 Subject: [PATCH] Don't send toast messages from the repository --- .../apps/readerforselfossv2/android/HomeActivity.kt | 7 ------- .../readerforselfossv2/repository/RepositoryImpl.kt | 13 ------------- 2 files changed, 20 deletions(-) diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt index e92b4ab..b39639b 100644 --- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt +++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt @@ -17,7 +17,6 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.SearchView import androidx.core.view.doOnNextLayout import androidx.drawerlayout.widget.DrawerLayout -import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.* import androidx.room.Room import androidx.work.Constraints @@ -179,12 +178,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar dataBase = AndroidDeviceDatabase(applicationContext) - lifecycleScope.launch { - repository.toastMessageState.collect { - Toast.makeText(baseContext, it, Toast.LENGTH_SHORT).show() - } - } - handleBottomBar() handleDrawer() diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt index d2d6600..a29b924 100644 --- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt +++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt @@ -10,9 +10,6 @@ import com.russhwolf.settings.Settings import io.github.aakira.napier.Napier import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch class Repository(private val api: SelfossApi, private val apiDetails: ApiDetailsService, val connectivityStatus: ConnectivityStatus) { @@ -21,9 +18,6 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails var items = ArrayList() private val isConnectionAvailable = connectivityStatus.isNetworkConnected - private val _toastMessageState = MutableSharedFlow(0) - val toastMessageState = _toastMessageState.asSharedFlow() - var baseUrl = apiDetails.getBaseUrl() lateinit var dateUtils: DateUtils @@ -50,13 +44,6 @@ class Repository(private val api: SelfossApi, private val apiDetails: ApiDetails updateApiVersion() dateUtils = DateUtils(apiMajorVersion) reloadBadges() - - isConnectionAvailable.asStateFlow().collect { connectionAvailable -> - if (!connectionAvailable) { - // TODO: Localize this string - _toastMessageState.emit("Network connection lost") - } - } } }