Update worker and some changes

hoc081098 · Oct 31, 2018 · 65a2790 · 65a2790
1 parent f35d44e
commit 65a2790
Show file tree

Hide file tree

Showing 20 changed files with 140 additions and 89 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -42,10 +42,10 @@
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />
         <!--
-             The API key for Google Maps-based APIs is defined as a string resource.
+             The API key for Google Maps-based APIs is defined as enqueueUpdateCurrentWeatherWorkRequestImmediately string resource.
              (See the file "res/values/google_maps_api.xml").
              Note that the API key is linked to the encryption key used to sign the APK.
-             You need a different API key for each encryption key, including the release key that is used to
+             You need enqueueUpdateCurrentWeatherWorkRequestImmediately different API key for each encryption key, including the release key that is used to
              sign the APK for publishing.
              You can define the keys for the debug and release targets in src/debug/ and src/release/. 
         -->

diff --git a/app/src/main/java/com/hoc/weatherapp/data/Repository.kt b/app/src/main/java/com/hoc/weatherapp/data/Repository.kt
@@ -32,10 +32,19 @@ interface Repository {
    * *********************************************************************************************
    */
 
+  /**
+   * Refresh both current weather and five day forecast of [city]
+   * @return [Single] emit result or error
+   */
   fun refreshWeatherOf(city: City): Single<Pair<CityAndCurrentWeather, List<DailyWeather>>>
 
+  /**
+   * Refresh current weather of selected city
+   * @return [Single] emit result or error ([NoSelectedCityException] when have no selected city)
+   */
   fun refreshCurrentWeatherOfSelectedCity(): Single<CityAndCurrentWeather>
 
+
   fun getSelectedCityAndCurrentWeatherOfSelectedCity(): Observable<Optional<CityAndCurrentWeather>>
 
   fun getAllCityAndCurrentWeathers(querySearch: String): Observable<List<CityAndCurrentWeather>>
@@ -48,5 +57,9 @@ interface Repository {
 
   fun getFiveDayForecastOfSelectedCity(): Observable<Optional<List<DailyWeather>>>
 
+  /**
+   * Refresh five day forecast of selected city
+   * @return [Single] emit result or error ([NoSelectedCityException] when have no selected city)
+   */
   fun refreshFiveDayForecastOfSelectedCity(): Single<List<DailyWeather>>
 }
diff --git a/app/src/main/java/com/hoc/weatherapp/data/RepositoryImpl.kt b/app/src/main/java/com/hoc/weatherapp/data/RepositoryImpl.kt
@@ -52,14 +52,16 @@ class RepositoryImpl(
 
     return cityLocalDataSource
       .insertOrUpdateCity(city)
-      .andThen(currentWeatherLocalDataSource.insertOrUpdateCurrentWeather(weather))
+      .andThen(
+        currentWeatherLocalDataSource.insertOrUpdateCurrentWeather(weather)
+      )
       .toSingleDefault(
         CityAndCurrentWeather().apply {
           this.city = city
           this.currentWeather = weather
         }
       )
-      .doOnSuccess { debug("saveCityAndCurrentWeather successs", "__WorkerUtil__") }
+      .doOnSuccess { debug("saveCityAndCurrentWeather success $it", "__WorkerUtil__") }
       .subscribeOn(Schedulers.io())
   }
 
@@ -78,7 +80,7 @@ class RepositoryImpl(
       .subscribeOn(Schedulers.io())
       .flatMap {
         when (it) {
-          is None -> throw NoSelectedCityException
+          is None -> Single.error(NoSelectedCityException)
           is Some -> weatherApiService
             .getCurrentWeatherByCityId(it.value.id)
             .subscribeOn(Schedulers.io())
@@ -90,6 +92,7 @@ class RepositoryImpl(
   override fun getSelectedCityAndCurrentWeatherOfSelectedCity(): Observable<Optional<CityAndCurrentWeather>> {
     return sharedPrefUtil
       .selectedCityObservable
+      .distinctUntilChanged()
       .switchMap { optional ->
         when (optional) {
           is Some -> currentWeatherLocalDataSource
@@ -158,7 +161,7 @@ class RepositoryImpl(
       .subscribeOn(Schedulers.io())
       .flatMap {
         when (it) {
-          is None -> throw NoSelectedCityException
+          is None -> Single.error(NoSelectedCityException)
           is Some -> weatherApiService
             .get5DayEvery3HourForecastByCityId(it.value.id)
             .subscribeOn(Schedulers.io())

diff --git a/app/src/main/java/com/hoc/weatherapp/data/local/CityDao.kt b/app/src/main/java/com/hoc/weatherapp/data/local/CityDao.kt
@@ -1,19 +1,14 @@
 package com.hoc.weatherapp.data.local
 
-import android.database.sqlite.SQLiteConstraintException
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy.FAIL
-import androidx.room.Transaction
-import androidx.room.Update
+import androidx.room.*
+import androidx.room.OnConflictStrategy.IGNORE
 import com.hoc.weatherapp.data.models.entity.City
 import com.hoc.weatherapp.utils.debug
 
 @Dao
 abstract class CityDao {
-  @Insert(onConflict = FAIL)
-  abstract fun insertCity(city: City)
+  @Insert(onConflict = IGNORE)
+  abstract fun insertCity(city: City): Long
 
   @Update
   abstract fun updateCity(city: City)
@@ -23,12 +18,11 @@ abstract class CityDao {
 
   @Transaction
   open fun upsert(city: City) {
-    try {
-      debug("Insert city=$city", "@@@")
-      insertCity(city)
-    } catch (e: SQLiteConstraintException) {
-      debug("Insert fail --> update city=$city", "@@@")
-      updateCity(city)
-    }
+    insertCity(city)
+      .takeIf {
+        debug("insertCity => $it", "__DAO__")
+        it == -1L
+      }
+      ?.let { updateCity(city) }
   }
 }
diff --git a/app/src/main/java/com/hoc/weatherapp/data/local/CityLocalDataSource.kt b/app/src/main/java/com/hoc/weatherapp/data/local/CityLocalDataSource.kt
@@ -3,6 +3,10 @@ package com.hoc.weatherapp.data.local
 import com.hoc.weatherapp.data.models.entity.City
 import io.reactivex.Completable
 
+/**
+ * A wrapper of [CityDao]
+ */
+
 class CityLocalDataSource(private val cityDao: CityDao) {
   fun deleteCity(city: City): Completable {
     return Completable.fromAction {

diff --git a/app/src/main/java/com/hoc/weatherapp/data/local/CurrentWeatherDao.kt b/app/src/main/java/com/hoc/weatherapp/data/local/CurrentWeatherDao.kt
@@ -1,14 +1,9 @@
 package com.hoc.weatherapp.data.local
 
-import android.database.sqlite.SQLiteConstraintException
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Transaction
-import androidx.room.Update
+import androidx.room.*
 import com.hoc.weatherapp.data.models.entity.CityAndCurrentWeather
 import com.hoc.weatherapp.data.models.entity.CurrentWeather
+import com.hoc.weatherapp.utils.debug
 import io.reactivex.Observable
 
 @Dao
@@ -29,18 +24,19 @@ abstract class CurrentWeatherDao {
   )
   abstract fun getAllCityAndCurrentWeathers(querySearch: String): Observable<List<CityAndCurrentWeather>>
 
-  @Insert(onConflict = OnConflictStrategy.FAIL)
-  abstract fun insertCurrentWeather(currentWeather: CurrentWeather)
+  @Insert(onConflict = OnConflictStrategy.IGNORE)
+  abstract fun insertCurrentWeather(currentWeather: CurrentWeather): Long
 
   @Update
   abstract fun updateCurrentWeather(currentWeather: CurrentWeather)
 
   @Transaction
-  open fun upsert(currentWeather: CurrentWeather) {
-    try {
-      insertCurrentWeather(currentWeather)
-    } catch (e: SQLiteConstraintException) {
-      updateCurrentWeather(currentWeather)
-    }
+  open fun upsert(weather: CurrentWeather) {
+    insertCurrentWeather(weather)
+      .takeIf {
+        debug("insertCurrentWeather => $it", "__DAO__")
+        it == -1L
+      }
+      ?.let { updateCurrentWeather(weather) }
   }
 }
diff --git a/app/src/main/java/com/hoc/weatherapp/data/local/CurrentWeatherLocalDataSource.kt b/app/src/main/java/com/hoc/weatherapp/data/local/CurrentWeatherLocalDataSource.kt
@@ -5,13 +5,21 @@ import com.hoc.weatherapp.data.models.entity.CurrentWeather
 import io.reactivex.Completable
 import io.reactivex.Observable
 
+/**
+ * A wrapper of [CurrentWeatherDao]
+ */
+
 class CurrentWeatherLocalDataSource(private val currentWeatherDao: CurrentWeatherDao) {
   fun getCityAndCurrentWeatherByCityId(cityId: Long): Observable<CityAndCurrentWeather> {
-    return currentWeatherDao.getCityAndCurrentWeatherByCityId(cityId)
+    return currentWeatherDao
+      .getCityAndCurrentWeatherByCityId(cityId)
+      .distinctUntilChanged()
   }
 
   fun getAllCityAndCurrentWeathers(querySearch: String): Observable<List<CityAndCurrentWeather>> {
-    return currentWeatherDao.getAllCityAndCurrentWeathers(querySearch)
+    return currentWeatherDao
+      .getAllCityAndCurrentWeathers(querySearch)
+      .distinctUntilChanged()
   }
 
   fun insertOrUpdateCurrentWeather(weather: CurrentWeather): Completable {

diff --git a/app/src/main/java/com/hoc/weatherapp/data/models/entity/City.kt b/app/src/main/java/com/hoc/weatherapp/data/models/entity/City.kt
@@ -7,7 +7,7 @@ import androidx.room.PrimaryKey
 import kotlinx.android.parcel.Parcelize
 
 /**
- * Declaring the column info allows for the renaming of variables without implementing a
+ * Declaring the column info allows for the renaming of variables without implementing enqueueUpdateCurrentWeatherWorkRequestImmediately
  * database migration, as the column name would not change.
  */
 

diff --git a/app/src/main/java/com/hoc/weatherapp/data/models/entity/CityAndCurrentWeather.kt b/app/src/main/java/com/hoc/weatherapp/data/models/entity/CityAndCurrentWeather.kt
@@ -3,7 +3,7 @@ package com.hoc.weatherapp.data.models.entity
 import androidx.room.Embedded
 
 /**
- * This class captures the relationship between a [City] and a city's [CurrentWeather]s, which is
+ * This class captures the relationship between enqueueUpdateCurrentWeatherWorkRequestImmediately [City] and enqueueUpdateCurrentWeatherWorkRequestImmediately city's [CurrentWeather]s, which is
  * used by Room to fetch the related entities.
  */
 

diff --git a/app/src/main/java/com/hoc/weatherapp/data/models/entity/CurrentWeather.kt b/app/src/main/java/com/hoc/weatherapp/data/models/entity/CurrentWeather.kt
@@ -10,7 +10,7 @@ import kotlinx.android.parcel.Parcelize
 import java.util.Date
 
 /**
- * Declaring the column info allows for the renaming of variables without implementing a
+ * Declaring the column info allows for the renaming of variables without implementing enqueueUpdateCurrentWeatherWorkRequestImmediately
  * database migration, as the column name would not change.
  */
 

diff --git a/app/src/main/java/com/hoc/weatherapp/ui/addcity/AddCityActivity.kt b/app/src/main/java/com/hoc/weatherapp/ui/addcity/AddCityActivity.kt
@@ -85,7 +85,7 @@ class AddCityActivity : MviActivity<AddCityContract.View, AddCityPresenter>(),
     setSupportActionBar(toolbar)
     supportActionBar?.run {
       setDisplayHomeAsUpEnabled(true)
-      title = "Add a city"
+      title = "Add enqueueUpdateCurrentWeatherWorkRequestImmediately city"
     }
 
     setupAutoCompletePlace()

diff --git a/app/src/main/java/com/hoc/weatherapp/ui/main/currentweather/CurrentWeatherPresenter.kt b/app/src/main/java/com/hoc/weatherapp/ui/main/currentweather/CurrentWeatherPresenter.kt
@@ -35,20 +35,17 @@ class CurrentWeatherPresenter(
   }
 
   private fun cityAndWeatherPartialChange(): Observable<PartialStateChange> {
-    val cityAndWeather = repository.getSelectedCityAndCurrentWeatherOfSelectedCity()
-      .publish { shared ->
-        Observable.mergeArray(
-          shared.ofType<None>().switchMap { showError(NoSelectedCityException) },
-          shared.ofType<Some<CityAndCurrentWeather>>()
-            .map { it.value }
-            .map { it.currentWeather }
-            .map { PartialStateChange.Weather(weather = it) }
+    return repository.getSelectedCityAndCurrentWeatherOfSelectedCity()
+      .switchMap { optional ->
+        when (optional) {
+          is None -> showError(NoSelectedCityException)
+          is Some -> PartialStateChange.Weather(weather = optional.value.currentWeather)
+            .let { Observable.just(it) }
             .cast<PartialStateChange>()
             .onErrorResumeNext(::showError)
-        )
+        }
       }
       .doOnNext { debug("cityAndWeather $it", TAG) }
-    return cityAndWeather
   }
 
   private fun refreshWeatherPartialChange(): Observable<PartialStateChange> {

diff --git a/app/src/main/java/com/hoc/weatherapp/ui/setting/SettingsActivity.kt b/app/src/main/java/com/hoc/weatherapp/ui/setting/SettingsActivity.kt
@@ -59,7 +59,8 @@ class SettingsActivity : AppCompatActivity() {
         .skip(1)
         .switchMap { showNotification ->
           if (showNotification) {
-            repository.getSelectedCityAndCurrentWeatherOfSelectedCity()
+            repository
+              .getSelectedCityAndCurrentWeatherOfSelectedCity()
               .observeOn(AndroidSchedulers.mainThread())
               .map {
                 when (it) {
@@ -79,7 +80,7 @@ class SettingsActivity : AppCompatActivity() {
             if (showNotification) {
               when (optional) {
                 is None -> {
-                  view?.snackBar("Please select a city!!")
+                  view?.snackBar("Please select enqueueUpdateCurrentWeatherWorkRequestImmediately city!!")
                   context.cancelNotificationById(WEATHER_NOTIFICATION_ID)
                 }
                 is Some -> optional.value.run {
@@ -111,7 +112,8 @@ class SettingsActivity : AppCompatActivity() {
           sharedPrefUtil.showNotification = newValue
         }
         key == getString(R.string.key_temperature_unit) && newValue is String -> {
-          sharedPrefUtil.temperatureUnit = TemperatureUnit.fromString(newValue)
+          sharedPrefUtil.temperatureUnit =
+              TemperatureUnit.fromString(newValue) //TODO: change temperature unit on notification
         }
         key == getString(R.string.key_pressure_unit) && newValue is String -> {
           sharedPrefUtil.pressureUnit = PressureUnit.valueOf(newValue)

diff --git a/app/src/main/java/com/hoc/weatherapp/utils/blur/BlurImageUtil.kt b/app/src/main/java/com/hoc/weatherapp/utils/blur/BlurImageUtil.kt
@@ -19,10 +19,10 @@ object BlurImageUtil {
         Bitmap.Config.ARGB_8888
       )
 
-      // Create a RenderScript context.
+      // Create enqueueUpdateCurrentWeatherWorkRequestImmediately RenderScript context.
       rsContext = RenderScript.create(applicationContext, RenderScript.ContextType.NORMAL)
 
-      // Creates a RenderScript allocation for the blurred result.
+      // Creates enqueueUpdateCurrentWeatherWorkRequestImmediately RenderScript allocation for the blurred result.
       val inAlloc = Allocation.createFromBitmap(rsContext, bitmap)
       val outAlloc = Allocation.createTyped(rsContext, inAlloc.type)
 

diff --git a/app/src/main/java/com/hoc/weatherapp/work/InitialDelayEnqueueWorker.kt b/app/src/main/java/com/hoc/weatherapp/work/InitialDelayEnqueueWorker.kt
@@ -0,0 +1,16 @@
+package com.hoc.weatherapp.work
+
+import android.content.Context
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+
+class InitialDelayEnqueueWorker(context: Context, workerParams: WorkerParameters) :
+  Worker(context, workerParams) {
+  override fun doWork(): Result {
+    return when (inputData.getString("TAG")) {
+      UpdateDailyWeatherWork.TAG -> Result.SUCCESS.also { WorkerUtil.enqueueUpdateCurrentWeatherWorkRequestImmediately() }
+      UpdateCurrentWeatherWorker.TAG -> Result.SUCCESS.also { WorkerUtil.enqueueUpdateDailyWeatherWorkRequestImmediately() }
+      else -> Result.FAILURE
+    }
+  }
+}
diff --git a/app/src/main/java/com/hoc/weatherapp/work/UpdateCurrentWeatherWorker.kt b/app/src/main/java/com/hoc/weatherapp/work/UpdateCurrentWeatherWorker.kt
@@ -47,5 +47,6 @@ class UpdateCurrentWeatherWorker(context: Context, workerParams: WorkerParameter
 
   companion object {
     const val UNIQUE_WORK_NAME = "UpdateCurrentWeatherWorker"
+    const val TAG = "UpdateCurrentWeatherWorker"
   }
 }
diff --git a/app/src/main/java/com/hoc/weatherapp/work/UpdateDailyWeatherWork.kt b/app/src/main/java/com/hoc/weatherapp/work/UpdateDailyWeatherWork.kt
@@ -33,5 +33,6 @@ class UpdateDailyWeatherWork(context: Context, workerParams: WorkerParameters) :
 
   companion object {
     const val UNIQUE_WORK_NAME = "UpdateDailyWeatherWork"
+    const val TAG = "UpdateDailyWeatherWork"
   }
 }