Refresh incidents

app-sandbox/src/main/java/com/crisiscleanup/sandbox/SandboxApplication.kt

@@ -9,7 +9,7 @@ import com.crisiscleanup.core.common.AppEnv
 import com.crisiscleanup.core.common.LocationProvider
 import com.crisiscleanup.core.common.PermissionManager
 import com.crisiscleanup.core.common.PermissionStatus
-import com.crisiscleanup.core.common.event.AuthEventBus
+import com.crisiscleanup.core.common.event.AccountEventBus
 import com.crisiscleanup.core.common.log.TagLogger
 import com.crisiscleanup.core.common.sync.SyncPuller
 import com.crisiscleanup.core.common.sync.SyncPusher
@@ -148,13 +148,17 @@ class AppSyncer @Inject constructor() : SyncPuller, SyncPusher {
 }
 
 @Singleton
-class AppAuthEventBus @Inject constructor() : AuthEventBus {
+class AppAccountEventBus @Inject constructor() : AccountEventBus {
     override val logouts = MutableStateFlow(false)
     override val refreshedTokens = MutableStateFlow(false)
+    override val inactiveOrganizations = MutableStateFlow(0L)
 
     override fun onLogout() {}
 
     override fun onTokensRefreshed() {}
+
+    override fun onAccountInactiveOrganization(accountId: Long) {}
+    override fun clearAccountInactiveOrganization() {}
 }
 
 @Singleton
@@ -206,7 +210,7 @@ interface AppModule {
     fun bindsSyncPusher(syncer: AppSyncer): SyncPusher
 
     @Binds
-    fun bindsAuthEventBus(eventBus: AppAuthEventBus): AuthEventBus
+    fun bindsAccountEventBus(eventBus: AppAccountEventBus): AccountEventBus
 
     @Binds
     fun bindsLocationProvider(provider: AppLocationProvider): LocationProvider

app-sandbox/src/main/java/com/crisiscleanup/sandbox/ui/MultiImageView.kt

@@ -28,14 +28,14 @@ import com.crisiscleanup.sandbox.MultiImageViewModel
 fun MultiImageRoute(
     onBack: () -> Unit = {},
 ) {
-    MultiImageView(onBack = onBack)
+    MultiImageView(onBack)
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun MultiImageView(
-    viewModel: MultiImageViewModel = hiltViewModel(),
     onBack: () -> Unit = {},
+    viewModel: MultiImageViewModel = hiltViewModel(),
 ) {
     var showPhotosGrid by remember { mutableStateOf(false) }
     val hidePhotosGridOnBack = remember(viewModel) {

app/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 
 android {
     defaultConfig {
-        val buildVersion = 223
+        val buildVersion = 233
         applicationId = "com.crisiscleanup"
         versionCode = buildVersion
         versionName = "0.9.${buildVersion - 168}"

app/src/main/java/com/crisiscleanup/MainActivity.kt

@@ -28,15 +28,15 @@ import com.crisiscleanup.core.common.NetworkMonitor
 import com.crisiscleanup.core.common.PermissionManager
 import com.crisiscleanup.core.common.PhoneNumberPicker
 import com.crisiscleanup.core.common.VisualAlertManager
-import com.crisiscleanup.core.common.event.AuthEventBus
+import com.crisiscleanup.core.common.event.AccountEventBus
 import com.crisiscleanup.core.common.event.TrimMemoryEventManager
 import com.crisiscleanup.core.common.log.AppLogger
 import com.crisiscleanup.core.common.log.CrisisCleanupLoggers
 import com.crisiscleanup.core.common.log.Logger
 import com.crisiscleanup.core.common.sync.SyncPuller
-import com.crisiscleanup.core.data.repository.AppMetricsRepository
 import com.crisiscleanup.core.data.repository.EndOfLifeRepository
 import com.crisiscleanup.core.data.repository.LanguageTranslationsRepository
+import com.crisiscleanup.core.data.repository.LocalAppMetricsRepository
 import com.crisiscleanup.core.designsystem.theme.CrisisCleanupTheme
 import com.crisiscleanup.core.designsystem.theme.navigationContainerColor
 import com.crisiscleanup.core.model.data.DarkThemeConfig
@@ -68,7 +68,7 @@ class MainActivity : ComponentActivity() {
     private val viewModel: MainActivityViewModel by viewModels()
 
     @Inject
-    internal lateinit var authEventBus: AuthEventBus
+    internal lateinit var accountEventBus: AccountEventBus
 
     @Inject
     internal lateinit var syncPuller: SyncPuller
@@ -90,7 +90,7 @@ class MainActivity : ComponentActivity() {
     internal lateinit var endOfLifeRepository: EndOfLifeRepository
 
     @Inject
-    internal lateinit var appMetricsRepository: AppMetricsRepository
+    internal lateinit var appMetricsRepository: LocalAppMetricsRepository
 
     @Inject
     internal lateinit var languageTranslationsRepository: LanguageTranslationsRepository

app/src/main/java/com/crisiscleanup/MainActivityViewModel.kt

@@ -13,7 +13,7 @@ import com.crisiscleanup.core.common.KeyResourceTranslator
 import com.crisiscleanup.core.common.NetworkMonitor
 import com.crisiscleanup.core.common.TutorialDirector
 import com.crisiscleanup.core.common.Tutorials
-import com.crisiscleanup.core.common.event.AuthEventBus
+import com.crisiscleanup.core.common.event.AccountEventBus
 import com.crisiscleanup.core.common.event.ExternalEventBus
 import com.crisiscleanup.core.common.event.UserPersistentInvite
 import com.crisiscleanup.core.common.log.AppLogger
@@ -44,7 +44,6 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
@@ -56,7 +55,6 @@ import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import kotlinx.datetime.Clock
 import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject
@@ -80,7 +78,7 @@ class MainActivityViewModel @Inject constructor(
     private val appEnv: AppEnv,
     firebaseAnalytics: FirebaseAnalytics,
     externalEventBus: ExternalEventBus,
-    private val authEventBus: AuthEventBus,
+    private val accountEventBus: AccountEventBus,
     private val networkMonitor: NetworkMonitor,
     @Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,
     @Logger(CrisisCleanupLoggers.App) private val logger: AppLogger,
@@ -190,9 +188,8 @@ class MainActivityViewModel @Inject constructor(
             initialValue = UserPersistentInvite(0, ""),
             started = SharingStarted.WhileSubscribed(),
         )
-
-    val isSwitchingToProduction: StateFlow<Boolean>
-    val productionSwitchMessage: StateFlow<String>
+    var showInactiveOrganization by mutableStateOf(false)
+        private set
 
     val menuTutorialStep = menuTutorialDirector.tutorialStep
 
@@ -208,10 +205,11 @@ class MainActivityViewModel @Inject constructor(
                     logger.setAccountId(it.id.toString())
                 } else {
                     if (!it.hasAcceptedTerms) {
-                        authEventBus.onLogout()
+                        accountEventBus.onLogout()
                     }
                 }
             }
+            .flowOn(ioDispatcher)
             .launchIn(viewModelScope)
 
         incidentSelector.incidentId
@@ -239,29 +237,25 @@ class MainActivityViewModel @Inject constructor(
             .onEach {
                 isAcceptingTerms = false
 
-                withContext(ioDispatcher) {
-                    isFetchingTermsAcceptance.value = true
-                    try {
-                        accountDataRefresher.updateAcceptedTerms()
-                    } finally {
-                        isFetchingTermsAcceptance.value = false
-                    }
+                isFetchingTermsAcceptance.value = true
+                try {
+                    accountDataRefresher.updateAcceptedTerms()
+                } finally {
+                    isFetchingTermsAcceptance.value = false
                 }
             }
+            .flowOn(ioDispatcher)
             .launchIn(viewModelScope)
 
-        val switchProductionApiManager = SwitchProductionApiManager(
-            appMetricsRepository,
-            appDataRepository,
-            logger,
-            viewModelScope,
-        )
-        viewState
-            .filter { it is MainActivityViewState.Success }
-            .onEach { switchProductionApiManager.switchToProduction() }
+        accountEventBus.inactiveOrganizations
+            .throttleLatest(5_000)
+            .filter { it > 0 }
+            .onEach {
+                showInactiveOrganization = true
+                appDataRepository.clearAppData()
+            }
+            .flowOn(ioDispatcher)
             .launchIn(viewModelScope)
-        isSwitchingToProduction = switchProductionApiManager.isSwitchingToProduction
-        productionSwitchMessage = switchProductionApiManager.productionSwitchMessage
     }
 
     private fun sync(cancelOngoing: Boolean) {
@@ -281,15 +275,14 @@ class MainActivityViewModel @Inject constructor(
 
     fun onRejectTerms() {
         acceptTermsErrorMessage = ""
-        authEventBus.onLogout()
+        accountEventBus.onLogout()
     }
 
     fun onAcceptTerms() {
         acceptTermsErrorMessage = ""
 
         if (!isAcceptingTerms) {
-            acceptTermsErrorMessage =
-                translator("termsConditionsModal.must_check_box")
+            acceptTermsErrorMessage = translator("termsConditionsModal.must_check_box")
             return
         }
 
@@ -329,9 +322,10 @@ class MainActivityViewModel @Inject constructor(
         }
     }
 
-    fun closeMenuTutorial() {
-        menuTutorialDirector.skipTutorial()
-        setMenuTutorialDone()
+    fun acknowledgeInactiveOrganization() {
+        showInactiveOrganization = false
+        accountEventBus.onLogout()
+        accountEventBus.clearAccountInactiveOrganization()
     }
 }