Handle no internet connection

MarkNjunge · MarkNjunge · commit e6261d28b6a8 · 2020-02-06T23:32:21.000+03:00
diff --git a/app/src/main/java/com/marknkamau/justjava/JustJavaApp.kt b/app/src/main/java/com/marknkamau/justjava/JustJavaApp.kt
@@ -5,7 +5,6 @@ import com.google.android.libraries.places.api.Places
 import com.marknjunge.core.data.local.PreferencesRepository
 import com.marknjunge.core.data.repository.UsersRepository
 import com.marknjunge.core.di.repositoriesModule
-import com.marknkamau.justjava.data.network.FirebaseService
 import com.marknkamau.justjava.di.appModule
 import com.marknkamau.justjava.di.dbModule
 import com.marknkamau.justjava.di.viewModelModule
@@ -24,7 +23,6 @@ import timber.log.Timber
 open class JustJavaApp : Application() {
     private val preferencesRepository: PreferencesRepository by inject()
     private val usersRepository: UsersRepository by inject()
-    private val firebaseService: FirebaseService by inject()
 
     private val coroutineScope = CoroutineScope(Dispatchers.IO)
 
@@ -57,8 +55,8 @@ open class JustJavaApp : Application() {
 
         if (preferencesRepository.isSignedIn) {
             coroutineScope.launch {
-                usersRepository.updateFcmToken(firebaseService.getFcmToken())
-                usersRepository.getCurrentUser().collect {  }
+                usersRepository.updateFcmToken()
+                usersRepository.getCurrentUser().collect { }
             }
         }
     }
diff --git a/app/src/main/java/com/marknkamau/justjava/data/network/FirebaseService.kt b/app/src/main/java/com/marknkamau/justjava/data/network/FirebaseService.kt
@@ -1,12 +1,9 @@
 package com.marknkamau.justjava.data.network
 
 import com.google.firebase.iid.FirebaseInstanceId
+import com.marknjunge.core.data.network.FirebaseService
 import kotlinx.coroutines.tasks.await
 
-interface FirebaseService {
-    suspend fun getFcmToken(): String
-}
-
 class AppFirebaseService : FirebaseService {
     private val firebaseInstanceId by lazy { FirebaseInstanceId.getInstance() }
 
diff --git a/app/src/main/java/com/marknkamau/justjava/data/network/JustJavaFirebaseMessagingService.kt b/app/src/main/java/com/marknkamau/justjava/data/network/JustJavaFirebaseMessagingService.kt
@@ -73,7 +73,7 @@ class JustJavaFirebaseMessagingService : FirebaseMessagingService(), KoinCompone
 
     override fun onNewToken(token: String) {
         coroutineScope.launch {
-            when (val resource = usersRepository.updateFcmToken(token)) {
+            when (val resource = usersRepository.updateFcmToken()) {
                 is Resource.Success -> Timber.d("FCM token updated")
                 is Resource.Failure -> Timber.d("FCM token update failed: ${resource.message}")
             }
diff --git a/app/src/main/java/com/marknkamau/justjava/di/Modules.kt b/app/src/main/java/com/marknkamau/justjava/di/Modules.kt
@@ -5,13 +5,13 @@ import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.marknjunge.core.data.local.PreferencesRepository
+import com.marknjunge.core.data.network.FirebaseService
 import com.marknjunge.core.data.network.GoogleSignInClientStub
 import com.marknkamau.justjava.BuildConfig
 import com.marknkamau.justjava.data.db.AppDatabase
 import com.marknkamau.justjava.data.db.DbRepository
 import com.marknkamau.justjava.data.db.DbRepositoryImpl
 import com.marknkamau.justjava.data.network.AppFirebaseService
-import com.marknkamau.justjava.data.network.FirebaseService
 import com.marknkamau.justjava.data.network.GoogleSignInClientStubImpl
 import com.marknkamau.justjava.data.preferences.PreferencesRepositoryImpl
 import com.marknkamau.justjava.ui.addressBook.AddressBookViewModel
@@ -65,9 +65,9 @@ val viewModelModule = module {
     viewModel { MainViewModel(get()) }
     viewModel { ProductDetailsViewModel(get()) }
     viewModel { CartViewModel(get(), get(), get()) }
-    viewModel { SignInViewModel(get(), get(), get()) }
-    viewModel { CompleteSignUpViewModel(get(), get()) }
-    viewModel { SignUpViewModel(get(), get(), get()) }
+    viewModel { SignInViewModel(get(), get()) }
+    viewModel { CompleteSignUpViewModel(get()) }
+    viewModel { SignUpViewModel(get(), get()) }
     viewModel { ProfileViewModel(get(), get()) }
     viewModel { AddressBookViewModel(get()) }
     viewModel { CheckoutViewModel(get(), get(), get(), get()) }
diff --git a/app/src/main/java/com/marknkamau/justjava/ui/completeSignUp/CompleteSignUpViewModel.kt b/app/src/main/java/com/marknkamau/justjava/ui/completeSignUp/CompleteSignUpViewModel.kt
@@ -6,10 +6,9 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.repository.UsersRepository
-import com.marknkamau.justjava.data.network.FirebaseService
 import kotlinx.coroutines.launch
 
-class CompleteSignUpViewModel(private val usersRepository: UsersRepository, private val firebaseService: FirebaseService) : ViewModel() {
+class CompleteSignUpViewModel(private val usersRepository: UsersRepository) : ViewModel() {
     private val _loading = MutableLiveData<Boolean>()
     val loading: LiveData<Boolean> = _loading
 
diff --git a/app/src/main/java/com/marknkamau/justjava/ui/login/SignInViewModel.kt b/app/src/main/java/com/marknkamau/justjava/ui/login/SignInViewModel.kt
@@ -8,13 +8,11 @@ import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.User
 import com.marknjunge.core.data.repository.AuthRepository
 import com.marknjunge.core.data.repository.UsersRepository
-import com.marknkamau.justjava.data.network.FirebaseService
 import kotlinx.coroutines.launch
 
 class SignInViewModel(
     private val authRepository: AuthRepository,
-    private val usersRepository: UsersRepository,
-    private val firebaseService: FirebaseService
+    private val usersRepository: UsersRepository
 ) : ViewModel() {
     private val _loading = MutableLiveData<Boolean>()
     val loading: LiveData<Boolean> = _loading
@@ -27,7 +25,7 @@ class SignInViewModel(
             liveData.value = authRepository.signInWithGoogle(idToken)
 
             if(liveData.value is Resource.Success){
-                usersRepository.updateFcmToken(firebaseService.getFcmToken())
+                usersRepository.updateFcmToken()
             }
 
             _loading.value = false
@@ -44,7 +42,7 @@ class SignInViewModel(
             liveData.value = authRepository.signIn(email, password)
 
             if(liveData.value is Resource.Success){
-                usersRepository.updateFcmToken(firebaseService.getFcmToken())
+                usersRepository.updateFcmToken()
             }
 
             _loading.value = false
diff --git a/app/src/main/java/com/marknkamau/justjava/ui/signup/SignUpViewModel.kt b/app/src/main/java/com/marknkamau/justjava/ui/signup/SignUpViewModel.kt
@@ -8,13 +8,11 @@ import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.User
 import com.marknjunge.core.data.repository.AuthRepository
 import com.marknjunge.core.data.repository.UsersRepository
-import com.marknkamau.justjava.data.network.FirebaseService
 import kotlinx.coroutines.launch
 
 class SignUpViewModel(
     private val authRepository: AuthRepository,
-    private val usersRepository: UsersRepository,
-    private val firebaseService: FirebaseService
+    private val usersRepository: UsersRepository
 ) : ViewModel() {
     private val _loading = MutableLiveData<Boolean>()
     val loading: LiveData<Boolean> = _loading
@@ -33,7 +31,7 @@ class SignUpViewModel(
             livedata.value = authRepository.signUp(firstName, lastName, mobile, email, password)
 
             if(livedata.value is Resource.Success){
-                usersRepository.updateFcmToken(firebaseService.getFcmToken())
+                usersRepository.updateFcmToken()
             }
 
             _loading.value = false
diff --git a/app/src/test/java/com/marknkamau/justjava/ui/completeSignUp/CompleteSignUpViewModelTest.kt b/app/src/test/java/com/marknkamau/justjava/ui/completeSignUp/CompleteSignUpViewModelTest.kt
@@ -3,8 +3,8 @@ package com.marknkamau.justjava.ui.completeSignUp
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.marknjunge.core.data.model.Resource
+import com.marknjunge.core.data.network.FirebaseService
 import com.marknjunge.core.data.repository.UsersRepository
-import com.marknkamau.justjava.data.network.FirebaseService
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.impl.annotations.MockK
@@ -40,11 +40,11 @@ class CompleteSignUpViewModelTest {
     @Before
     fun setup() {
         MockKAnnotations.init(this, relaxUnitFun = true)
-        viewModel = CompleteSignUpViewModel(usersRepository, firebaseService)
+        viewModel = CompleteSignUpViewModel(usersRepository)
         Dispatchers.setMain(testDispatcher)
 
         coEvery { firebaseService.getFcmToken() } returns ""
-        coEvery { usersRepository.updateFcmToken(any()) } returns Resource.Success(Unit)
+        coEvery { usersRepository.updateFcmToken() } returns Resource.Success(Unit)
     }
 
     @ExperimentalCoroutinesApi
diff --git a/app/src/test/java/com/marknkamau/justjava/ui/login/SignInViewModelTest.kt b/app/src/test/java/com/marknkamau/justjava/ui/login/SignInViewModelTest.kt
@@ -4,9 +4,9 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.User
+import com.marknjunge.core.data.network.FirebaseService
 import com.marknjunge.core.data.repository.AuthRepository
 import com.marknjunge.core.data.repository.UsersRepository
-import com.marknkamau.justjava.data.network.FirebaseService
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.impl.annotations.MockK
@@ -45,11 +45,11 @@ class SignInViewModelTest {
     @Before
     fun setup() {
         MockKAnnotations.init(this, relaxUnitFun = true)
-        viewModel = SignInViewModel(authRepository, usersRepository, firebaseService)
+        viewModel = SignInViewModel(authRepository, usersRepository)
         Dispatchers.setMain(testDispatcher)
 
         coEvery { firebaseService.getFcmToken() } returns ""
-        coEvery { usersRepository.updateFcmToken(any()) } returns Resource.Success(Unit)
+        coEvery { usersRepository.updateFcmToken() } returns Resource.Success(Unit)
     }
 
     @ExperimentalCoroutinesApi
diff --git a/app/src/test/java/com/marknkamau/justjava/ui/profile/ProfileViewModelTest.kt b/app/src/test/java/com/marknkamau/justjava/ui/profile/ProfileViewModelTest.kt
@@ -4,6 +4,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.User
+import com.marknjunge.core.data.repository.AuthRepository
 import com.marknjunge.core.data.repository.UsersRepository
 import com.marknkamau.justjava.utils.SampleData
 import io.mockk.MockKAnnotations
@@ -33,14 +34,17 @@ class ProfileViewModelTest {
     @MockK
     private lateinit var usersRepository: UsersRepository
 
+    @MockK
+    private lateinit var authRepository: AuthRepository
+
     private lateinit var viewModel: ProfileViewModel
 
     @ExperimentalCoroutinesApi
     @Before
     fun setup() {
         MockKAnnotations.init(this, relaxUnitFun = true)
         Dispatchers.setMain(testDispatcher)
-        viewModel = ProfileViewModel(usersRepository)
+        viewModel = ProfileViewModel(usersRepository, authRepository)
     }
 
     @ExperimentalCoroutinesApi
diff --git a/app/src/test/java/com/marknkamau/justjava/ui/signup/SignUpViewModelTest.kt b/app/src/test/java/com/marknkamau/justjava/ui/signup/SignUpViewModelTest.kt
@@ -4,9 +4,9 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.User
+import com.marknjunge.core.data.network.FirebaseService
 import com.marknjunge.core.data.repository.AuthRepository
 import com.marknjunge.core.data.repository.UsersRepository
-import com.marknkamau.justjava.data.network.FirebaseService
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.impl.annotations.MockK
@@ -45,11 +45,11 @@ class SignUpViewModelTest {
     @Before
     fun setup() {
         MockKAnnotations.init(this, relaxUnitFun = true)
-        viewModel = SignUpViewModel(authRepository, usersRepository, firebaseService)
+        viewModel = SignUpViewModel(authRepository, usersRepository)
         Dispatchers.setMain(testDispatcher)
 
         coEvery { firebaseService.getFcmToken() } returns ""
-        coEvery { usersRepository.updateFcmToken(any()) } returns Resource.Success(Unit)
+        coEvery { usersRepository.updateFcmToken() } returns Resource.Success(Unit)
     }
 
     @ExperimentalCoroutinesApi
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
@@ -1,2 +1,5 @@
-<manifest
-    package="com.marknjunge.core" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.marknjunge.core">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+</manifest>
diff --git a/core/src/main/java/com/marknjunge/core/data/network/FirebaseService.kt b/core/src/main/java/com/marknjunge/core/data/network/FirebaseService.kt
@@ -0,0 +1,5 @@
+package com.marknjunge.core.data.network
+
+interface FirebaseService {
+    suspend fun getFcmToken(): String
+}
diff --git a/core/src/main/java/com/marknjunge/core/data/network/NetworkProvider.kt b/core/src/main/java/com/marknjunge/core/data/network/NetworkProvider.kt
@@ -1,17 +1,19 @@
 package com.marknjunge.core.data.network
 
+import android.content.Context
 import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import com.marknjunge.core.BuildConfig
 import com.marknjunge.core.data.network.interceptors.ConvertNoContentInterceptor
+import com.marknjunge.core.data.network.interceptors.NetworkConnectionInterceptor
 import com.marknjunge.core.utils.appConfig
 import kotlinx.serialization.json.JsonConfiguration
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 
-internal class NetworkProvider {
+internal class NetworkProvider(private val context: Context) {
     private val apiBaseUrl = BuildConfig.API_BASE_URL
     private val mediaType = "application/json".toMediaType()
 
@@ -46,6 +48,7 @@ internal class NetworkProvider {
         loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
 
         val builder = OkHttpClient.Builder()
+        builder.addInterceptor(NetworkConnectionInterceptor(context))
         builder.addNetworkInterceptor(ConvertNoContentInterceptor())
         builder.addNetworkInterceptor(loggingInterceptor)
 
diff --git a/core/src/main/java/com/marknjunge/core/data/network/interceptors/NetworkConnectionInterceptor.kt b/core/src/main/java/com/marknjunge/core/data/network/interceptors/NetworkConnectionInterceptor.kt
@@ -0,0 +1,28 @@
+package com.marknjunge.core.data.network.interceptors
+
+import android.content.Context
+import android.net.ConnectivityManager
+import com.marknjunge.core.utils.NoInternetException
+import okhttp3.Interceptor
+import okhttp3.Response
+
+internal class NetworkConnectionInterceptor(private val context: Context) : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+
+        if (!isInternetAvailable()) {
+            throw NoInternetException()
+        }
+
+        return chain.proceed(chain.request())
+    }
+
+    private fun isInternetAvailable(): Boolean {
+        val connectivityManager =
+            context.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+        connectivityManager.activeNetworkInfo.also {
+            return it != null
+        }
+    }
+
+}
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/UsersRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/UsersRepository.kt
@@ -4,6 +4,7 @@ import com.marknjunge.core.data.local.PreferencesRepository
 import com.marknjunge.core.data.model.*
 import com.marknjunge.core.data.model.UpdateFcmTokenDto
 import com.marknjunge.core.data.model.UpdateUserDto
+import com.marknjunge.core.data.network.FirebaseService
 import com.marknjunge.core.data.network.GoogleSignInClientStub
 import com.marknjunge.core.data.network.UsersService
 import com.marknjunge.core.utils.call
@@ -22,20 +23,20 @@ interface UsersRepository {
 
     suspend fun deleteAddress(address: Address): Resource<Unit>
 
-    suspend fun updateFcmToken(token: String): Resource<Unit>
+    suspend fun updateFcmToken(): Resource<Unit>
 
     suspend fun deleteUser():Resource<Unit>
 }
 
 internal class ApiUsersRepository(
     private val usersService: UsersService,
     private val preferencesRepository: PreferencesRepository,
-    private val googleSignInClient: GoogleSignInClientStub
+    private val googleSignInClient: GoogleSignInClientStub,
+    private val firebaseService: FirebaseService
 ) : UsersRepository {
     override suspend fun getCurrentUser(): Flow<Resource<User>> = flow {
         emit(Resource.Success(preferencesRepository.user!!))
 
-
         try {
             val user = usersService.getCurrentUser(preferencesRepository.sessionId)
             preferencesRepository.user = user
@@ -97,8 +98,9 @@ internal class ApiUsersRepository(
         }
     }
 
-    override suspend fun updateFcmToken(token: String) = withContext(Dispatchers.IO) {
+    override suspend fun updateFcmToken() = withContext(Dispatchers.IO) {
         call {
+            val token = firebaseService.getFcmToken()
             usersService.updateFcmToken(preferencesRepository.sessionId, UpdateFcmTokenDto(token))
             val updatedUser = preferencesRepository.user!!.copy(fcmToken = token)
             preferencesRepository.user = updatedUser
diff --git a/core/src/main/java/com/marknjunge/core/di/modules.kt b/core/src/main/java/com/marknjunge/core/di/modules.kt
@@ -2,15 +2,16 @@ package com.marknjunge.core.di
 
 import com.marknjunge.core.data.network.NetworkProvider
 import com.marknjunge.core.data.repository.*
+import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 
 val repositoriesModule = module {
-    val networkProvider = NetworkProvider()
+    single { NetworkProvider(androidContext()) }
 
-    single<AuthRepository> { ApiAuthRepository(networkProvider.authService, get(), get()) }
-    single<ProductsRepository> { ApiProductsRepository(networkProvider.apiService) }
-    single<UsersRepository> { ApiUsersRepository(networkProvider.usersService, get(), get()) }
-    single<CartRepository> { ApiCartRepository(networkProvider.cartService) }
-    single<OrdersRepository> { ApiOrdersRepository(networkProvider.ordersService, get()) }
-    single<PaymentsRepository> { ApiPaymentsRepository(networkProvider.paymentsService, get()) }
+    single<AuthRepository> { ApiAuthRepository(get<NetworkProvider>().authService, get(), get()) }
+    single<ProductsRepository> { ApiProductsRepository(get<NetworkProvider>().apiService) }
+    single<UsersRepository> { ApiUsersRepository(get<NetworkProvider>().usersService, get(), get(), get()) }
+    single<CartRepository> { ApiCartRepository(get<NetworkProvider>().cartService) }
+    single<OrdersRepository> { ApiOrdersRepository(get<NetworkProvider>().ordersService, get()) }
+    single<PaymentsRepository> { ApiPaymentsRepository(get<NetworkProvider>().paymentsService, get()) }
 }
diff --git a/core/src/main/java/com/marknjunge/core/utils/NoInternetException.kt b/core/src/main/java/com/marknjunge/core/utils/NoInternetException.kt
@@ -0,0 +1,6 @@
+package com.marknjunge.core.utils
+
+import kotlinx.io.IOException
+
+// Has to be IO exception. See https://stackoverflow.com/a/47058587
+class NoInternetException : IOException("Check your internet connection")

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class JustJavaFirebaseMessagingService : FirebaseMessagingService(), KoinCompone`
`73`	`73`
`74`	`74`	`override fun onNewToken(token: String) {`
`75`	`75`	`coroutineScope.launch {`
`76`		`- when (val resource = usersRepository.updateFcmToken(token)) {`
	`76`	`+ when (val resource = usersRepository.updateFcmToken()) {`
`77`	`77`	`is Resource.Success -> Timber.d("FCM token updated")`
`78`	`78`	`is Resource.Failure -> Timber.d("FCM token update failed: ${resource.message}")`
`79`	`79`	`}`