Inject connectivity class in repository, if there is no network acces…

…s pull data from room

app/src/main/java/com/cobeisfresh/template/App.kt

@@ -14,12 +14,14 @@ import org.koin.core.logger.Level
 
 class App : Application() {
 
-  lateinit var INSTANCE: Application
-    private set
+  companion object {
+    lateinit var instance: Application
+      private set
+  }
 
   override fun onCreate() {
     super.onCreate()
-    INSTANCE = this
+    instance = this
 
     startKoin {
       androidContext(this@App)

app/src/main/java/com/cobeisfresh/template/common/extensions/AndroidExtensions.kt

@@ -37,16 +37,15 @@ inline fun View.onClick(crossinline onClick: () -> Unit) {
 }
 
 fun FragmentActivity.showFragment(fragment: Fragment, @IdRes container: Int, addToBackStack: Boolean = false) {
-  supportFragmentManager.beginTransaction()
-      .apply {
-        if (addToBackStack) {
-          addToBackStack(fragment.tag)
-        }
-      }
+  supportFragmentManager.beginTransaction().apply {
+    if (addToBackStack) {
+      addToBackStack(fragment.tag)
+    }
+  }
       .replace(container, fragment)
       .commitAllowingStateLoss()
 }
 
-fun FragmentActivity.goBack(){
+fun FragmentActivity.goBack() {
   supportFragmentManager.popBackStack()
 }

app/src/main/java/com/cobeisfresh/template/routing/AppFragmentNavigator.kt

@@ -5,10 +5,13 @@ import com.cobeisfresh.template.R
 import com.cobeisfresh.template.common.extensions.showFragment
 import com.cobeisfresh.template.ui.weather.view.fragments.WeatherDetailsFragment
 
+/**
+ * Every activity that holds fragments should name its container "fragmentContainer"
+ */
+
 class AppFragmentNavigator : FragmentNavigator {
 
   override fun showWeatherDetails(fragmentActivity: FragmentActivity) =
       fragmentActivity.showFragment(WeatherDetailsFragment.newInstance(), R.id.fragmentContainer, true)
-
 }
 

app/src/main/java/com/cobeisfresh/template/routing/FragmentNavigator.kt

@@ -5,5 +5,4 @@ import androidx.fragment.app.FragmentActivity
 interface FragmentNavigator {
 
   fun showWeatherDetails(fragmentActivity: FragmentActivity)
-
 }

app/src/main/java/com/cobeisfresh/template/ui/weather/view/fragments/WeatherDetailsFragment.kt

@@ -5,10 +5,10 @@ import com.cobeisfresh.template.ui.base.BaseFragment
 
 class WeatherDetailsFragment : BaseFragment() {
 
-  override fun viewReady() {}
-
   override fun getLayout() = R.layout.fragment_weather_details
 
+  override fun viewReady() {}
+
   companion object {
     fun newInstance() = WeatherDetailsFragment()
   }

app/src/main/java/com/cobeisfresh/template/ui/weather/view/fragments/WeatherFragment.kt

@@ -7,7 +7,6 @@ import com.cobeisfresh.template.common.extensions.onClick
 import com.cobeisfresh.template.common.extensions.subscribe
 import com.cobeisfresh.template.ui.base.BaseFragment
 import com.cobeisfresh.template.ui.base.ViewState
-import com.cobeisfresh.template.ui.base.ViewState.Status
 import com.cobeisfresh.template.ui.base.ViewState.Status.*
 import com.cobeisfresh.template.ui.weather.presentation.WeatherViewModel
 import com.example.domain.model.WeatherInfo

data/src/main/AndroidManifest.xml

@@ -1,2 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.example.data" />
+  package="com.example.data" >
+
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+</manifest>

data/src/main/java/com/example/data/database/DbConstants.kt

@@ -1,3 +1,4 @@
 package com.example.data.database
 
-const val WEATHER_TABLE_NAME = "weather"
+const val WEATHER_TABLE_NAME = "weather"
+const val DB_ENTRY_ERROR = "No entry found in database"

data/src/main/java/com/example/data/di/RepositoryModule.kt

@@ -1,9 +1,12 @@
 package com.example.data.di
 
 import com.example.data.repository.weather.WeatherRepositoryImpl
+import com.example.data.utils.Connectivity
 import com.example.domain.repository.WeatherRepository
+import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 
 val repositoryModule = module {
-  factory<WeatherRepository> { WeatherRepositoryImpl(get(), get()) }
+  factory<WeatherRepository> { WeatherRepositoryImpl(get(), get(), get()) }
+  factory { Connectivity(androidContext()) }
 }

data/src/main/java/com/example/data/repository/weather/WeatherRepositoryImpl.kt

@@ -1,23 +1,33 @@
 package com.example.data.repository.weather
 
+import com.example.data.database.DB_ENTRY_ERROR
 import com.example.data.database.dao.WeatherDao
 import com.example.data.networking.GENERAL_NETWORK_ERROR
 import com.example.data.networking.WeatherApi
 import com.example.data.networking.base.onFailure
 import com.example.data.networking.base.onSuccess
+import com.example.data.utils.Connectivity
 import com.example.domain.model.*
 import com.example.domain.repository.WeatherRepository
-import kotlinx.coroutines.delay
 
-class WeatherRepositoryImpl(private val weatherApi: WeatherApi, private val weatherDao: WeatherDao) : WeatherRepository {
+class WeatherRepositoryImpl(private val weatherApi: WeatherApi,
+                            private val weatherDao: WeatherDao,
+                            private val connectivity: Connectivity) : WeatherRepository {
 
   override suspend fun getWeatherForLocation(location: String): Result<WeatherInfo> {
-    weatherApi.getWeatherForLocation(location)
-        .onSuccess {
-          val weatherInfo = weatherDao.updateWeatherAndReturn(it.mapToRoomEntity())
-          return Success(weatherInfo.mapToDomainModel())
-        }
-        .onFailure { return Failure(it) }
-    return Failure(HttpError(Throwable(GENERAL_NETWORK_ERROR)))
+    if (connectivity.hasNetworkAccess()) {
+      weatherApi.getWeatherForLocation(location)
+          .onSuccess {
+            val weatherInfo = weatherDao.updateWeatherAndReturn(it.mapToRoomEntity())
+            return Success(weatherInfo.mapToDomainModel())
+          }
+          .onFailure { return Failure(it) }
+      return Failure(HttpError(Throwable(GENERAL_NETWORK_ERROR)))
+    } else {
+      val weatherInfo = weatherDao.getWeatherInfoForCity(location)
+      @Suppress("SENSELESS_COMPARISON") // room can return null here even though it's not nullable type
+      return if (weatherInfo != null) Success(weatherInfo.mapToDomainModel())
+      else Failure(HttpError(Throwable(DB_ENTRY_ERROR)))
+    }
   }
 }

data/src/main/java/com/example/data/utils/Connectivity.kt

@@ -0,0 +1,13 @@
+package com.example.data.utils
+
+import android.content.Context
+import android.net.ConnectivityManager
+
+class Connectivity(private val context: Context) {
+
+  fun hasNetworkAccess(): Boolean {
+    val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    val info = connectivityManager.activeNetworkInfo
+    return info != null && info.isConnected
+  }
+}