From 6b3bc4e889cb05b650036a26a31468a50d376fce Mon Sep 17 00:00:00 2001
From: Avior <f.bouillon@aptatio.com>
Date: Tue, 19 Jul 2022 12:18:08 +0200
Subject: [PATCH] fix: Renamed Fake service to Worker

---
 .../core/{BaseService.kt => BaseWorker.kt}           |  5 +++--
 .../java/com/dzeio/openhealth/ui/MainActivity.kt     |  4 ++--
 ...aterReminderService.kt => WaterReminderWorker.kt} | 12 +++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename app/src/main/java/com/dzeio/openhealth/core/{BaseService.kt => BaseWorker.kt} (71%)
 rename app/src/main/java/com/dzeio/openhealth/workers/{WaterReminderService.kt => WaterReminderWorker.kt} (86%)

diff --git a/app/src/main/java/com/dzeio/openhealth/core/BaseService.kt b/app/src/main/java/com/dzeio/openhealth/core/BaseWorker.kt
similarity index 71%
rename from app/src/main/java/com/dzeio/openhealth/core/BaseService.kt
rename to app/src/main/java/com/dzeio/openhealth/core/BaseWorker.kt
index 17bfff7..60ffde0 100644
--- a/app/src/main/java/com/dzeio/openhealth/core/BaseService.kt
+++ b/app/src/main/java/com/dzeio/openhealth/core/BaseWorker.kt
@@ -7,13 +7,14 @@ import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
+import com.dzeio.openhealth.Application
 
-abstract class BaseService(context: Context, params: WorkerParameters) : Worker(context, params) {
+abstract class BaseWorker(context: Context, params: WorkerParameters) : Worker(context, params) {
 
     companion object {
 
         fun schedule(tag: String, request: PeriodicWorkRequest, context: Context) {
-            Log.d("OpenHealth/BaseService", "Scheduled Job $tag")
+            Log.d("${Application.TAG}/BaseWorker", "Scheduled worker $tag")
             WorkManager.getInstance(context)
                 .enqueueUniquePeriodicWork(tag, ExistingPeriodicWorkPolicy.KEEP, request)
         }
diff --git a/app/src/main/java/com/dzeio/openhealth/ui/MainActivity.kt b/app/src/main/java/com/dzeio/openhealth/ui/MainActivity.kt
index 87e43f2..079a702 100644
--- a/app/src/main/java/com/dzeio/openhealth/ui/MainActivity.kt
+++ b/app/src/main/java/com/dzeio/openhealth/ui/MainActivity.kt
@@ -24,7 +24,7 @@ import com.dzeio.openhealth.core.BaseActivity
 import com.dzeio.openhealth.databinding.ActivityMainBinding
 import com.dzeio.openhealth.interfaces.NotificationChannels
 import com.dzeio.openhealth.services.OpenHealthService
-import com.dzeio.openhealth.workers.WaterReminderService
+import com.dzeio.openhealth.workers.WaterReminderWorker
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -72,7 +72,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         createNotificationChannel()
 
         // Services
-        WaterReminderService.setup(this)
+        WaterReminderWorker.setup(this)
 //        StepCountService.setup(this)
 
         this.betterStartService(OpenHealthService::class.java)
diff --git a/app/src/main/java/com/dzeio/openhealth/workers/WaterReminderService.kt b/app/src/main/java/com/dzeio/openhealth/workers/WaterReminderWorker.kt
similarity index 86%
rename from app/src/main/java/com/dzeio/openhealth/workers/WaterReminderService.kt
rename to app/src/main/java/com/dzeio/openhealth/workers/WaterReminderWorker.kt
index 3466bdc..3829842 100644
--- a/app/src/main/java/com/dzeio/openhealth/workers/WaterReminderService.kt
+++ b/app/src/main/java/com/dzeio/openhealth/workers/WaterReminderWorker.kt
@@ -1,6 +1,5 @@
 package com.dzeio.openhealth.workers
 
-import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Context
 import android.os.Build
@@ -12,23 +11,23 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkerParameters
 import com.dzeio.openhealth.Application
 import com.dzeio.openhealth.R
-import com.dzeio.openhealth.core.BaseService
+import com.dzeio.openhealth.core.BaseWorker
 import com.dzeio.openhealth.interfaces.NotificationChannels
 import com.dzeio.openhealth.interfaces.NotificationIds
 import java.util.Date
 import java.util.concurrent.TimeUnit
 
-class WaterReminderService(
+class WaterReminderWorker(
     private val context: Context,
     params: WorkerParameters
-) : BaseService(context, params) {
+) : BaseWorker(context, params) {
 
     companion object {
-        const val TAG = "${Application.TAG}/WaterService"
+        const val TAG = "${Application.TAG}/WaterWorker"
         fun setup(context: Context) {
             schedule(
                 TAG,
-                PeriodicWorkRequestBuilder<WaterReminderService>(1, TimeUnit.HOURS)
+                PeriodicWorkRequestBuilder<WaterReminderWorker>(1, TimeUnit.HOURS)
                     .addTag(TAG)
                     .build(),
                 context
@@ -36,7 +35,6 @@ class WaterReminderService(
         }
     }
 
-    @SuppressLint("UnspecifiedImmutableFlag")
     override fun doWork(): Result {
         Log.d(TAG, "Ran! ${Date().toLocaleString()}")
         with(NotificationManagerCompat.from(context)) {