From fab7303d89c454ada33acf97b3fd9baaefbe389d Mon Sep 17 00:00:00 2001 From: Mamel0uk Date: Wed, 18 Nov 2026 02:00:00 +0100 Subject: [PATCH 1/5] feat(chat): send failed photos again once back online While the conversation is open, a photo that failed for want of a connection is sent again with the same message ID as soon as the device is online. Other failures still wait for Retry. The ViewModel gets the connection through a new ConnectivityObserver interface. Co-Authored-By: Claude Opus 5.5 --- .../chat/viewmodel/ConversationViewModel.kt | 29 ++++++++++ .../network/ConnectivityObserver.kt | 54 +++++++++++++++++++ .../polybazaar/ui/navigation/AppNavHost.kt | 2 + .../network/FakeConnectivityObserver.kt | 12 +++++ .../chat/ui/ConversationScreenTest.kt | 2 + .../viewmodel/ConversationViewModelTest.kt | 4 ++ 6 files changed, 103 insertions(+) create mode 100644 app/src/main/java/com/android/polybazaar/network/ConnectivityObserver.kt create mode 100644 app/src/sharedTest/java/com/android/polybazaar/network/FakeConnectivityObserver.kt diff --git a/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt b/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt index 5b6e0341..9bf61eee 100644 --- a/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt +++ b/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt @@ -17,6 +17,7 @@ import com.android.polybazaar.listing.model.Listing import com.android.polybazaar.listing.model.ListingRepository import com.android.polybazaar.listing.model.ObservedListing import com.android.polybazaar.listing.model.PhotoStorage +import com.android.polybazaar.network.ConnectivityObserver import com.android.polybazaar.profile.model.ProfileRepository import java.time.Instant import java.util.concurrent.atomic.AtomicBoolean @@ -27,6 +28,8 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch @@ -142,6 +145,9 @@ private data class LoadedListing( * [photoUploadScope]. Once the screen is closed, an upload that ends deletes its photo if it was * taken with the camera, whether it was sent or not, as nothing can retry it any more. * + * [connectivity] tells when the device is back online, to send again the photos that failed for + * want of a connection while the screen is open. + * * The lender must only be routed here for a conversation that already exists: until then the * security rules refuse them the conversation and its messages, which shows as a load error. */ @@ -155,6 +161,7 @@ class ConversationViewModel( private val photoStorage: PhotoStorage, private val savedStateHandle: SavedStateHandle, private val uploadScope: CoroutineScope, + private val connectivity: ConnectivityObserver, ) : ViewModel() { private val _uiState = MutableStateFlow(ConversationUiState(myUid = myUid)) @@ -197,6 +204,28 @@ class ConversationViewModel( observeConversation() observeMessages() observeOtherUser() + retryPhotosWhenOnline() + } + + /** + * Each time the device comes back online, sends again the photos that failed with + * [AppError.NETWORK]. Other failures, such as a refusal, would fail again, so they wait for the + * user's Retry. + */ + private fun retryPhotosWhenOnline() { + viewModelScope.launch { + connectivity + .observeOnline() + .distinctUntilChanged() + .filter { online -> online } + // Without it, the user can still tap Retry; toAppError() logs unrecognised failures. + .catch { exception -> exception.toAppError() } + .collect { + _uiState.value.pendingPhotos + .filter { it.status == PendingPhotoStatus.FAILED && it.error == AppError.NETWORK } + .forEach { retryPhoto(it.messageId) } + } + } } /** diff --git a/app/src/main/java/com/android/polybazaar/network/ConnectivityObserver.kt b/app/src/main/java/com/android/polybazaar/network/ConnectivityObserver.kt new file mode 100644 index 00000000..cf50f522 --- /dev/null +++ b/app/src/main/java/com/android/polybazaar/network/ConnectivityObserver.kt @@ -0,0 +1,54 @@ +// Co-authored-by: Claude Code (Claude Opus 5.5) +package com.android.polybazaar.network + +import android.content.Context +import android.net.ConnectivityManager +import android.net.Network +import android.net.NetworkCapabilities +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.flow.distinctUntilChanged + +/** Tells whether the device can reach the internet, so work that needs it can wait for it. */ +fun interface ConnectivityObserver { + /** Emits whether the device is online now, then again each time that changes. */ + fun observeOnline(): Flow +} + +/** + * Online means the default network has internet access that Android has checked, so a Wi-Fi with no + * internet behind it counts as offline. + */ +class AndroidConnectivityObserver(context: Context) : ConnectivityObserver { + private val connectivityManager = context.getSystemService(ConnectivityManager::class.java) + + override fun observeOnline(): Flow = callbackFlow { + val callback = + object : ConnectivityManager.NetworkCallback() { + override fun onCapabilitiesChanged( + network: Network, + capabilities: NetworkCapabilities, + ) { + trySend(capabilities.reachesInternet()) + } + + override fun onLost(network: Network) { + trySend(false) + } + } + // The callback only reports a network once there is one, so offline it says nothing. + val active = connectivityManager.activeNetwork + trySend( + active != null && + connectivityManager.getNetworkCapabilities(active)?.reachesInternet() == true + ) + connectivityManager.registerDefaultNetworkCallback(callback) + awaitClose { connectivityManager.unregisterNetworkCallback(callback) } + } + .distinctUntilChanged() + + private fun NetworkCapabilities.reachesInternet(): Boolean = + hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && + hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) +} diff --git a/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt b/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt index 3b077936..e6b0b5d8 100644 --- a/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt +++ b/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt @@ -89,6 +89,7 @@ import com.android.polybazaar.map.ui.ListingsMap import com.android.polybazaar.map.ui.MapScreen import com.android.polybazaar.map.viewmodel.MapUiState import com.android.polybazaar.map.viewmodel.MapViewModel +import com.android.polybazaar.network.AndroidConnectivityObserver import com.android.polybazaar.profile.model.ProfileRepository import com.android.polybazaar.profile.ui.EditProfileActions import com.android.polybazaar.profile.ui.EditProfileContent @@ -535,6 +536,7 @@ fun AppNavHost( photoStorage = chatPhotoStorage, savedStateHandle = createSavedStateHandle(), uploadScope = photoUploadScope, + connectivity = AndroidConnectivityObserver(appContext), ) } } diff --git a/app/src/sharedTest/java/com/android/polybazaar/network/FakeConnectivityObserver.kt b/app/src/sharedTest/java/com/android/polybazaar/network/FakeConnectivityObserver.kt new file mode 100644 index 00000000..16e28091 --- /dev/null +++ b/app/src/sharedTest/java/com/android/polybazaar/network/FakeConnectivityObserver.kt @@ -0,0 +1,12 @@ +// Co-authored-by: Claude Code (Claude Opus 5.5) +package com.android.polybazaar.network + +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow + +/** A connection a test turns on and off by setting [online]. Online unless told otherwise. */ +class FakeConnectivityObserver(online: Boolean = true) : ConnectivityObserver { + val online = MutableStateFlow(online) + + override fun observeOnline(): Flow = online +} diff --git a/app/src/test/java/com/android/polybazaar/chat/ui/ConversationScreenTest.kt b/app/src/test/java/com/android/polybazaar/chat/ui/ConversationScreenTest.kt index 415dafe6..2c37f9bf 100644 --- a/app/src/test/java/com/android/polybazaar/chat/ui/ConversationScreenTest.kt +++ b/app/src/test/java/com/android/polybazaar/chat/ui/ConversationScreenTest.kt @@ -74,6 +74,7 @@ import com.android.polybazaar.listing.model.ListingCategory import com.android.polybazaar.listing.model.PhotoStorage import com.android.polybazaar.listing.model.TakenPhoto import com.android.polybazaar.listing.ui.CreateListingScreenTags +import com.android.polybazaar.network.FakeConnectivityObserver import com.android.polybazaar.profile.model.FakeProfileRepository import com.android.polybazaar.profile.ui.redPhoto import java.io.File @@ -243,6 +244,7 @@ class ConversationScreenTest { photoStorage = photoStorage, savedStateHandle = SavedStateHandle(), uploadScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate), + connectivity = FakeConnectivityObserver(), ) val launcherOwner = object : ActivityResultRegistryOwner { diff --git a/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt b/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt index d8633a40..da982513 100644 --- a/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt +++ b/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt @@ -21,6 +21,7 @@ import com.android.polybazaar.listing.model.ItemListing import com.android.polybazaar.listing.model.ListingCategory import com.android.polybazaar.listing.model.PhotoStorage import com.android.polybazaar.listing.model.TakenPhoto +import com.android.polybazaar.network.FakeConnectivityObserver import com.android.polybazaar.profile.model.FakeProfileRepository import com.google.firebase.firestore.FirebaseFirestoreException import java.net.UnknownHostException @@ -55,6 +56,7 @@ class ConversationViewModelTest { private lateinit var profiles: FakeProfileRepository private lateinit var listings: FakeListingRepository private lateinit var photoStorage: FakePhotoStorage + private lateinit var connectivity: FakeConnectivityObserver private lateinit var downloads: CountingDownloads private val lender = User(uid = "lender", email = "", username = "Lena") @@ -90,6 +92,7 @@ class ConversationViewModelTest { profiles = FakeProfileRepository(listOf(lender, renter).associateBy { it.uid }) listings = FakeListingRepository(allListings = listOf(listing)) photoStorage = FakePhotoStorage() + connectivity = FakeConnectivityObserver() } @After @@ -117,6 +120,7 @@ class ConversationViewModelTest { photoStorage, savedState, uploadScope, + connectivity, ) /** Creates the ViewModel and lets its loads finish. */ From 0c3897bb8c0fbe093d5ad50ce57a0f3bcd29692f Mon Sep 17 00:00:00 2001 From: Mamel0uk Date: Wed, 18 Nov 2026 03:55:06 +0100 Subject: [PATCH 2/5] test(chat): cover sending failed photos again once back online Co-Authored-By: Claude Opus 5.5 --- .../viewmodel/ConversationViewModelTest.kt | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt b/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt index da982513..5c65ab78 100644 --- a/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt +++ b/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt @@ -1760,6 +1760,59 @@ class ConversationViewModelTest { assertEquals(listOf(conversation.id to "m1"), chat.deletedPhotoMessages) } + @Test + fun backOnline_sendsANetworkFailureAgainWithTheSameId() { + connectivity.online.value = false + val viewModel = failedPhotoSend(offline) + chat.sendFailure = null + + connectivity.online.value = true + advance() + + assertEquals(listOf("m1", "m1"), chat.sentPhotos.map { it.messageId }) + assertEquals(emptyList(), viewModel.uiState.value.pendingPhotos) + } + + @Test + fun backOnline_leavesARefusedPhotoForTheUsersRetry() { + connectivity.online.value = false + val viewModel = failedPhotoSend(refused) + + connectivity.online.value = true + advance() + + assertEquals(1, chat.sentPhotos.size) + assertEquals(AppError.PERMISSION_DENIED, viewModel.uiState.value.pendingPhotos.single().error) + } + + @Test + fun stillOffline_sendsNothingAgain() { + connectivity.online.value = false + val viewModel = failedPhotoSend(offline) + + connectivity.online.value = false + advance() + + assertEquals(1, chat.sentPhotos.size) + assertEquals(PendingPhotoStatus.FAILED, viewModel.uiState.value.pendingPhotos.single().status) + } + + @Test + fun backOnlineAgain_afterASecondNetworkFailure_sendsItAgain() { + connectivity.online.value = false + failedPhotoSend(offline) + connectivity.online.value = true + advance() + assertEquals(2, chat.sentPhotos.size) + + connectivity.online.value = false + advance() + connectivity.online.value = true + advance() + + assertEquals(listOf("m1", "m1", "m1"), chat.sentPhotos.map { it.messageId }) + } + private val photoPath = "chats/drill_renter/m1.jpg" private val photoBytes = byteArrayOf(1, 2, 3) private val missing = AppException(AppError.NOT_FOUND) From d273a63e36098224a07fdbb4f00ac4ff7abb4d70 Mon Sep 17 00:00:00 2001 From: Mamel0uk Date: Wed, 18 Nov 2026 22:06:14 +0100 Subject: [PATCH 3/5] test(chat): cover the connectivity observer and photos still sending Co-Authored-By: Claude Opus 5.5 --- .../viewmodel/ConversationViewModelTest.kt | 19 +++ .../AndroidConnectivityObserverTest.kt | 121 ++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 app/src/test/java/com/android/polybazaar/network/AndroidConnectivityObserverTest.kt diff --git a/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt b/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt index 5c65ab78..b9407362 100644 --- a/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt +++ b/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt @@ -1785,6 +1785,25 @@ class ConversationViewModelTest { assertEquals(AppError.PERMISSION_DENIED, viewModel.uiState.value.pendingPhotos.single().error) } + @Test + fun backOnline_leavesAPhotoStillSendingAlone() { + connectivity.online.value = false + val viewModel = inConversation() + chat.gate = CompletableDeferred() + viewModel.attachPhoto(galleryPhoto) + viewModel.send() + advance() + + connectivity.online.value = true + advance() + + assertEquals(1, chat.sentPhotos.size) + assertEquals( + listOf(PendingPhotoStatus.UPLOADING), + viewModel.uiState.value.pendingPhotos.map { it.status }, + ) + } + @Test fun stillOffline_sendsNothingAgain() { connectivity.online.value = false diff --git a/app/src/test/java/com/android/polybazaar/network/AndroidConnectivityObserverTest.kt b/app/src/test/java/com/android/polybazaar/network/AndroidConnectivityObserverTest.kt new file mode 100644 index 00000000..90a1d9b7 --- /dev/null +++ b/app/src/test/java/com/android/polybazaar/network/AndroidConnectivityObserverTest.kt @@ -0,0 +1,121 @@ +// Co-authored-by: Claude Code (Claude Opus 5.5) +package com.android.polybazaar.network + +import android.content.Context +import android.net.ConnectivityManager +import android.net.NetworkCapabilities +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.toList +import kotlinx.coroutines.launch +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.UnconfinedTestDispatcher +import kotlinx.coroutines.test.runTest +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Shadows.shadowOf +import org.robolectric.shadows.ShadowNetworkCapabilities + +@OptIn(ExperimentalCoroutinesApi::class) +@RunWith(AndroidJUnit4::class) +class AndroidConnectivityObserverTest { + + private val context: Context = ApplicationProvider.getApplicationContext() + private val connectivityManager = context.getSystemService(ConnectivityManager::class.java) + private val shadow = shadowOf(connectivityManager) + + @Before + fun setUp() { + shadow.setDefaultNetworkActive(true) + } + + private fun capabilities(vararg capabilities: Int): NetworkCapabilities = + ShadowNetworkCapabilities.newInstance().also { caps -> + capabilities.forEach { shadowOf(caps).addCapability(it) } + } + + private val online + get() = + capabilities( + NetworkCapabilities.NET_CAPABILITY_INTERNET, + NetworkCapabilities.NET_CAPABILITY_VALIDATED, + ) + + /** Everything [AndroidConnectivityObserver.observeOnline] emits until [job] is cancelled. */ + private fun TestScope.observe(): Pair, Job> { + val values = mutableListOf() + val job = + backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) { + AndroidConnectivityObserver(context).observeOnline().toList(values) + } + return values to job + } + + private fun assertStartsWith(expected: Boolean) = runTest { + val (values, job) = observe() + job.cancel() + assertEquals(listOf(expected), values) + } + + @Test + fun startsOnlineWhenTheActiveNetworkReachesTheInternet() { + shadow.setNetworkCapabilities(connectivityManager.activeNetwork, online) + + assertStartsWith(true) + } + + @Test + fun startsOfflineWithoutAnActiveNetwork() { + shadow.setDefaultNetworkActive(false) + + assertStartsWith(false) + } + + @Test + fun startsOfflineWhenTheActiveNetworkHasNoCapabilities() { + shadow.setNetworkCapabilities(connectivityManager.activeNetwork, null) + + assertStartsWith(false) + } + + @Test + fun startsOfflineWhenTheActiveNetworkHasNoInternet() { + shadow.setNetworkCapabilities( + connectivityManager.activeNetwork, + capabilities(NetworkCapabilities.NET_CAPABILITY_VALIDATED), + ) + + assertStartsWith(false) + } + + @Test + fun startsOfflineWhenTheInternetIsNotValidated() { + shadow.setNetworkCapabilities( + connectivityManager.activeNetwork, + capabilities(NetworkCapabilities.NET_CAPABILITY_INTERNET), + ) + + assertStartsWith(false) + } + + @Test + fun followsTheDefaultNetworkAndStopsListeningWhenCancelled() = runTest { + val network = connectivityManager.activeNetwork!! + shadow.setDefaultNetworkActive(false) + val (values, job) = observe() + val callback = shadow.networkCallbacks.single() + + callback.onCapabilitiesChanged(network, online) + callback.onCapabilitiesChanged(network, online) + callback.onLost(network) + job.cancel() + + assertEquals(listOf(false, true, false), values) + assertTrue(shadow.networkCallbacks.isEmpty()) + } +} From 110475c243708bf610429d0bea36b0c6b90bc6b5 Mon Sep 17 00:00:00 2001 From: Mamel0uk Date: Thu, 19 Nov 2026 18:53:57 +0100 Subject: [PATCH 4/5] refactor(chat): resend photos with the app's connectivity repository Co-Authored-By: Claude Opus 5.5 --- .../chat/viewmodel/ConversationViewModel.kt | 13 +- .../network/ConnectivityObserver.kt | 54 -------- .../polybazaar/ui/navigation/AppNavHost.kt | 6 +- .../network/FakeConnectivityObserver.kt | 12 -- .../chat/ui/ConversationScreenTest.kt | 4 +- .../viewmodel/ConversationViewModelTest.kt | 30 ++--- .../AndroidConnectivityObserverTest.kt | 121 ------------------ 7 files changed, 24 insertions(+), 216 deletions(-) delete mode 100644 app/src/main/java/com/android/polybazaar/network/ConnectivityObserver.kt delete mode 100644 app/src/sharedTest/java/com/android/polybazaar/network/FakeConnectivityObserver.kt delete mode 100644 app/src/test/java/com/android/polybazaar/network/AndroidConnectivityObserverTest.kt diff --git a/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt b/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt index 9bf61eee..eeb9a575 100644 --- a/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt +++ b/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt @@ -11,13 +11,13 @@ import com.android.polybazaar.chat.model.ChatRepository import com.android.polybazaar.chat.model.ChatRules import com.android.polybazaar.chat.model.Conversation import com.android.polybazaar.chat.model.conversationId +import com.android.polybazaar.connectivity.model.ConnectivityRepository import com.android.polybazaar.error.model.AppError import com.android.polybazaar.error.model.toAppError import com.android.polybazaar.listing.model.Listing import com.android.polybazaar.listing.model.ListingRepository import com.android.polybazaar.listing.model.ObservedListing import com.android.polybazaar.listing.model.PhotoStorage -import com.android.polybazaar.network.ConnectivityObserver import com.android.polybazaar.profile.model.ProfileRepository import java.time.Instant import java.util.concurrent.atomic.AtomicBoolean @@ -28,7 +28,6 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.catch -import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch @@ -146,7 +145,7 @@ private data class LoadedListing( * taken with the camera, whether it was sent or not, as nothing can retry it any more. * * [connectivity] tells when the device is back online, to send again the photos that failed for - * want of a connection while the screen is open. + * want of a connection while the screen is open. Pass the app's single [ConnectivityRepository]. * * The lender must only be routed here for a conversation that already exists: until then the * security rules refuse them the conversation and its messages, which shows as a load error. @@ -161,7 +160,7 @@ class ConversationViewModel( private val photoStorage: PhotoStorage, private val savedStateHandle: SavedStateHandle, private val uploadScope: CoroutineScope, - private val connectivity: ConnectivityObserver, + private val connectivity: ConnectivityRepository, ) : ViewModel() { private val _uiState = MutableStateFlow(ConversationUiState(myUid = myUid)) @@ -214,12 +213,8 @@ class ConversationViewModel( */ private fun retryPhotosWhenOnline() { viewModelScope.launch { - connectivity - .observeOnline() - .distinctUntilChanged() + connectivity.isOnline .filter { online -> online } - // Without it, the user can still tap Retry; toAppError() logs unrecognised failures. - .catch { exception -> exception.toAppError() } .collect { _uiState.value.pendingPhotos .filter { it.status == PendingPhotoStatus.FAILED && it.error == AppError.NETWORK } diff --git a/app/src/main/java/com/android/polybazaar/network/ConnectivityObserver.kt b/app/src/main/java/com/android/polybazaar/network/ConnectivityObserver.kt deleted file mode 100644 index cf50f522..00000000 --- a/app/src/main/java/com/android/polybazaar/network/ConnectivityObserver.kt +++ /dev/null @@ -1,54 +0,0 @@ -// Co-authored-by: Claude Code (Claude Opus 5.5) -package com.android.polybazaar.network - -import android.content.Context -import android.net.ConnectivityManager -import android.net.Network -import android.net.NetworkCapabilities -import kotlinx.coroutines.channels.awaitClose -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.callbackFlow -import kotlinx.coroutines.flow.distinctUntilChanged - -/** Tells whether the device can reach the internet, so work that needs it can wait for it. */ -fun interface ConnectivityObserver { - /** Emits whether the device is online now, then again each time that changes. */ - fun observeOnline(): Flow -} - -/** - * Online means the default network has internet access that Android has checked, so a Wi-Fi with no - * internet behind it counts as offline. - */ -class AndroidConnectivityObserver(context: Context) : ConnectivityObserver { - private val connectivityManager = context.getSystemService(ConnectivityManager::class.java) - - override fun observeOnline(): Flow = callbackFlow { - val callback = - object : ConnectivityManager.NetworkCallback() { - override fun onCapabilitiesChanged( - network: Network, - capabilities: NetworkCapabilities, - ) { - trySend(capabilities.reachesInternet()) - } - - override fun onLost(network: Network) { - trySend(false) - } - } - // The callback only reports a network once there is one, so offline it says nothing. - val active = connectivityManager.activeNetwork - trySend( - active != null && - connectivityManager.getNetworkCapabilities(active)?.reachesInternet() == true - ) - connectivityManager.registerDefaultNetworkCallback(callback) - awaitClose { connectivityManager.unregisterNetworkCallback(callback) } - } - .distinctUntilChanged() - - private fun NetworkCapabilities.reachesInternet(): Boolean = - hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && - hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) -} diff --git a/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt b/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt index e6b0b5d8..68714b6b 100644 --- a/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt +++ b/app/src/main/java/com/android/polybazaar/ui/navigation/AppNavHost.kt @@ -89,7 +89,6 @@ import com.android.polybazaar.map.ui.ListingsMap import com.android.polybazaar.map.ui.MapScreen import com.android.polybazaar.map.viewmodel.MapUiState import com.android.polybazaar.map.viewmodel.MapViewModel -import com.android.polybazaar.network.AndroidConnectivityObserver import com.android.polybazaar.profile.model.ProfileRepository import com.android.polybazaar.profile.ui.EditProfileActions import com.android.polybazaar.profile.ui.EditProfileContent @@ -130,7 +129,8 @@ object AppNavHostTags { * folder than [photoStorage]: opening a form deletes the photos its folder holds for other forms. * @param locationRepository reads the device's approximate location: to centre the Map tab on the * renter, and to open the listing form's map picker where the lender is. - * @param connectivityRepository tells the listing forms whether the device is online. + * @param connectivityRepository tells the listing forms and the conversations whether the device is + * online. */ @Composable fun AppNavHost( @@ -536,7 +536,7 @@ fun AppNavHost( photoStorage = chatPhotoStorage, savedStateHandle = createSavedStateHandle(), uploadScope = photoUploadScope, - connectivity = AndroidConnectivityObserver(appContext), + connectivity = connectivityRepository, ) } } diff --git a/app/src/sharedTest/java/com/android/polybazaar/network/FakeConnectivityObserver.kt b/app/src/sharedTest/java/com/android/polybazaar/network/FakeConnectivityObserver.kt deleted file mode 100644 index 16e28091..00000000 --- a/app/src/sharedTest/java/com/android/polybazaar/network/FakeConnectivityObserver.kt +++ /dev/null @@ -1,12 +0,0 @@ -// Co-authored-by: Claude Code (Claude Opus 5.5) -package com.android.polybazaar.network - -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.MutableStateFlow - -/** A connection a test turns on and off by setting [online]. Online unless told otherwise. */ -class FakeConnectivityObserver(online: Boolean = true) : ConnectivityObserver { - val online = MutableStateFlow(online) - - override fun observeOnline(): Flow = online -} diff --git a/app/src/test/java/com/android/polybazaar/chat/ui/ConversationScreenTest.kt b/app/src/test/java/com/android/polybazaar/chat/ui/ConversationScreenTest.kt index 2c37f9bf..6d1c76f4 100644 --- a/app/src/test/java/com/android/polybazaar/chat/ui/ConversationScreenTest.kt +++ b/app/src/test/java/com/android/polybazaar/chat/ui/ConversationScreenTest.kt @@ -66,6 +66,7 @@ import com.android.polybazaar.chat.viewmodel.ConversationUiState import com.android.polybazaar.chat.viewmodel.ConversationViewModel import com.android.polybazaar.chat.viewmodel.PendingPhoto import com.android.polybazaar.chat.viewmodel.PendingPhotoStatus +import com.android.polybazaar.connectivity.model.FakeConnectivityRepository import com.android.polybazaar.error.model.AppError import com.android.polybazaar.listing.model.FakeListingRepository import com.android.polybazaar.listing.model.FilePhotoStorage @@ -74,7 +75,6 @@ import com.android.polybazaar.listing.model.ListingCategory import com.android.polybazaar.listing.model.PhotoStorage import com.android.polybazaar.listing.model.TakenPhoto import com.android.polybazaar.listing.ui.CreateListingScreenTags -import com.android.polybazaar.network.FakeConnectivityObserver import com.android.polybazaar.profile.model.FakeProfileRepository import com.android.polybazaar.profile.ui.redPhoto import java.io.File @@ -244,7 +244,7 @@ class ConversationScreenTest { photoStorage = photoStorage, savedStateHandle = SavedStateHandle(), uploadScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate), - connectivity = FakeConnectivityObserver(), + connectivity = FakeConnectivityRepository(), ) val launcherOwner = object : ActivityResultRegistryOwner { diff --git a/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt b/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt index b9407362..5bf58b07 100644 --- a/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt +++ b/app/src/test/java/com/android/polybazaar/chat/viewmodel/ConversationViewModelTest.kt @@ -14,6 +14,7 @@ import com.android.polybazaar.chat.model.ChatRepository import com.android.polybazaar.chat.model.ChatRules import com.android.polybazaar.chat.model.Conversation import com.android.polybazaar.chat.model.FakeChatRepository +import com.android.polybazaar.connectivity.model.FakeConnectivityRepository import com.android.polybazaar.error.model.AppError import com.android.polybazaar.error.model.AppException import com.android.polybazaar.listing.model.FakeListingRepository @@ -21,7 +22,6 @@ import com.android.polybazaar.listing.model.ItemListing import com.android.polybazaar.listing.model.ListingCategory import com.android.polybazaar.listing.model.PhotoStorage import com.android.polybazaar.listing.model.TakenPhoto -import com.android.polybazaar.network.FakeConnectivityObserver import com.android.polybazaar.profile.model.FakeProfileRepository import com.google.firebase.firestore.FirebaseFirestoreException import java.net.UnknownHostException @@ -56,7 +56,7 @@ class ConversationViewModelTest { private lateinit var profiles: FakeProfileRepository private lateinit var listings: FakeListingRepository private lateinit var photoStorage: FakePhotoStorage - private lateinit var connectivity: FakeConnectivityObserver + private lateinit var connectivity: FakeConnectivityRepository private lateinit var downloads: CountingDownloads private val lender = User(uid = "lender", email = "", username = "Lena") @@ -92,7 +92,7 @@ class ConversationViewModelTest { profiles = FakeProfileRepository(listOf(lender, renter).associateBy { it.uid }) listings = FakeListingRepository(allListings = listOf(listing)) photoStorage = FakePhotoStorage() - connectivity = FakeConnectivityObserver() + connectivity = FakeConnectivityRepository() } @After @@ -1762,11 +1762,11 @@ class ConversationViewModelTest { @Test fun backOnline_sendsANetworkFailureAgainWithTheSameId() { - connectivity.online.value = false + connectivity.isOnline.value = false val viewModel = failedPhotoSend(offline) chat.sendFailure = null - connectivity.online.value = true + connectivity.isOnline.value = true advance() assertEquals(listOf("m1", "m1"), chat.sentPhotos.map { it.messageId }) @@ -1775,10 +1775,10 @@ class ConversationViewModelTest { @Test fun backOnline_leavesARefusedPhotoForTheUsersRetry() { - connectivity.online.value = false + connectivity.isOnline.value = false val viewModel = failedPhotoSend(refused) - connectivity.online.value = true + connectivity.isOnline.value = true advance() assertEquals(1, chat.sentPhotos.size) @@ -1787,14 +1787,14 @@ class ConversationViewModelTest { @Test fun backOnline_leavesAPhotoStillSendingAlone() { - connectivity.online.value = false + connectivity.isOnline.value = false val viewModel = inConversation() chat.gate = CompletableDeferred() viewModel.attachPhoto(galleryPhoto) viewModel.send() advance() - connectivity.online.value = true + connectivity.isOnline.value = true advance() assertEquals(1, chat.sentPhotos.size) @@ -1806,10 +1806,10 @@ class ConversationViewModelTest { @Test fun stillOffline_sendsNothingAgain() { - connectivity.online.value = false + connectivity.isOnline.value = false val viewModel = failedPhotoSend(offline) - connectivity.online.value = false + connectivity.isOnline.value = false advance() assertEquals(1, chat.sentPhotos.size) @@ -1818,15 +1818,15 @@ class ConversationViewModelTest { @Test fun backOnlineAgain_afterASecondNetworkFailure_sendsItAgain() { - connectivity.online.value = false + connectivity.isOnline.value = false failedPhotoSend(offline) - connectivity.online.value = true + connectivity.isOnline.value = true advance() assertEquals(2, chat.sentPhotos.size) - connectivity.online.value = false + connectivity.isOnline.value = false advance() - connectivity.online.value = true + connectivity.isOnline.value = true advance() assertEquals(listOf("m1", "m1", "m1"), chat.sentPhotos.map { it.messageId }) diff --git a/app/src/test/java/com/android/polybazaar/network/AndroidConnectivityObserverTest.kt b/app/src/test/java/com/android/polybazaar/network/AndroidConnectivityObserverTest.kt deleted file mode 100644 index 90a1d9b7..00000000 --- a/app/src/test/java/com/android/polybazaar/network/AndroidConnectivityObserverTest.kt +++ /dev/null @@ -1,121 +0,0 @@ -// Co-authored-by: Claude Code (Claude Opus 5.5) -package com.android.polybazaar.network - -import android.content.Context -import android.net.ConnectivityManager -import android.net.NetworkCapabilities -import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.Job -import kotlinx.coroutines.flow.toList -import kotlinx.coroutines.launch -import kotlinx.coroutines.test.TestScope -import kotlinx.coroutines.test.UnconfinedTestDispatcher -import kotlinx.coroutines.test.runTest -import org.junit.Assert.assertEquals -import org.junit.Assert.assertTrue -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.Shadows.shadowOf -import org.robolectric.shadows.ShadowNetworkCapabilities - -@OptIn(ExperimentalCoroutinesApi::class) -@RunWith(AndroidJUnit4::class) -class AndroidConnectivityObserverTest { - - private val context: Context = ApplicationProvider.getApplicationContext() - private val connectivityManager = context.getSystemService(ConnectivityManager::class.java) - private val shadow = shadowOf(connectivityManager) - - @Before - fun setUp() { - shadow.setDefaultNetworkActive(true) - } - - private fun capabilities(vararg capabilities: Int): NetworkCapabilities = - ShadowNetworkCapabilities.newInstance().also { caps -> - capabilities.forEach { shadowOf(caps).addCapability(it) } - } - - private val online - get() = - capabilities( - NetworkCapabilities.NET_CAPABILITY_INTERNET, - NetworkCapabilities.NET_CAPABILITY_VALIDATED, - ) - - /** Everything [AndroidConnectivityObserver.observeOnline] emits until [job] is cancelled. */ - private fun TestScope.observe(): Pair, Job> { - val values = mutableListOf() - val job = - backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) { - AndroidConnectivityObserver(context).observeOnline().toList(values) - } - return values to job - } - - private fun assertStartsWith(expected: Boolean) = runTest { - val (values, job) = observe() - job.cancel() - assertEquals(listOf(expected), values) - } - - @Test - fun startsOnlineWhenTheActiveNetworkReachesTheInternet() { - shadow.setNetworkCapabilities(connectivityManager.activeNetwork, online) - - assertStartsWith(true) - } - - @Test - fun startsOfflineWithoutAnActiveNetwork() { - shadow.setDefaultNetworkActive(false) - - assertStartsWith(false) - } - - @Test - fun startsOfflineWhenTheActiveNetworkHasNoCapabilities() { - shadow.setNetworkCapabilities(connectivityManager.activeNetwork, null) - - assertStartsWith(false) - } - - @Test - fun startsOfflineWhenTheActiveNetworkHasNoInternet() { - shadow.setNetworkCapabilities( - connectivityManager.activeNetwork, - capabilities(NetworkCapabilities.NET_CAPABILITY_VALIDATED), - ) - - assertStartsWith(false) - } - - @Test - fun startsOfflineWhenTheInternetIsNotValidated() { - shadow.setNetworkCapabilities( - connectivityManager.activeNetwork, - capabilities(NetworkCapabilities.NET_CAPABILITY_INTERNET), - ) - - assertStartsWith(false) - } - - @Test - fun followsTheDefaultNetworkAndStopsListeningWhenCancelled() = runTest { - val network = connectivityManager.activeNetwork!! - shadow.setDefaultNetworkActive(false) - val (values, job) = observe() - val callback = shadow.networkCallbacks.single() - - callback.onCapabilitiesChanged(network, online) - callback.onCapabilitiesChanged(network, online) - callback.onLost(network) - job.cancel() - - assertEquals(listOf(false, true, false), values) - assertTrue(shadow.networkCallbacks.isEmpty()) - } -} From e8bdbf442a4b5ca3663f7c0816fd6458d0a643ae Mon Sep 17 00:00:00 2001 From: Mamel0uk Date: Thu, 19 Nov 2026 18:53:58 +0100 Subject: [PATCH 5/5] docs(chat): say the first connectivity value sends nothing again Co-Authored-By: Claude Opus 5.5 --- .../android/polybazaar/chat/viewmodel/ConversationViewModel.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt b/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt index eeb9a575..f533c964 100644 --- a/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt +++ b/app/src/main/java/com/android/polybazaar/chat/viewmodel/ConversationViewModel.kt @@ -210,6 +210,9 @@ class ConversationViewModel( * Each time the device comes back online, sends again the photos that failed with * [AppError.NETWORK]. Other failures, such as a refusal, would fail again, so they wait for the * user's Retry. + * + * [ConnectivityRepository.isOnline] also gives its current value first, but no photo has been + * sent yet when the screen opens, so that first value sends nothing again. */ private fun retryPhotosWhenOnline() { viewModelScope.launch {