Optional Notifications For Worker (#103)

- withNotification member variables for Worker.kt - default argument of boolean false
evilthreads669966 · Jan 1, 2021 · 9d65f34 · 9d65f34
1 parent c9073f3
commit 9d65f34
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/app/src/main/java/com/candroid/lacedboots/Workers.kt b/app/src/main/java/com/candroid/lacedboots/Workers.kt
@@ -59,7 +59,7 @@ class DailyWorker: Worker(222, "Daily Worker"){
     }
 }
 
-class PeriodicWorker: Worker(777, "Periodic Worker"){
+class PeriodicWorker: Worker(777, "Periodic Worker", withNotification = true){
     override val receiver: WorkReceiver?
         get() = null
 
@@ -85,11 +85,12 @@ class FutureWorker: Worker(999, "Future Worker"){
         Log.d("Future worker", "working")
     }
 }
-class OneTimeWorker: Worker(66,"One time work") {
+class OneTimeWorker: Worker(66,"One time work", withNotification = true) {
     override val receiver: WorkReceiver?
         get() = null
 
     override suspend fun doWork(ctx: Context) {
+        Log.d("OneTimeWorker", "working one time")
         for(i in 1..10)
             delay(1000)
     }
@@ -120,7 +121,7 @@ class ScreenLockerJob: Worker(666,"Locking the screen"){
             val intent = Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)
             delay(500)
             if (powerMgr.isInteractive)
-               ctx.sendBroadcast(intent)
+                ctx.sendBroadcast(intent)
         }
     }
-}
+}
diff --git a/bootlaces/src/main/java/com/candroid/bootlaces/Work.kt b/bootlaces/src/main/java/com/candroid/bootlaces/Work.kt
@@ -7,7 +7,7 @@ import kotlinx.android.parcel.Parcelize
 
 @Parcelize
 @Entity
-internal data class Work(@PrimaryKey(autoGenerate = false) val id: Int, val job: String, var interval: Long? = null, var delay: Long? = null, var hourly: Boolean = false, var daily: Boolean = false, var monthly: Boolean = false, var yearly: Boolean = false): Parcelable{
+data class Work(@PrimaryKey(autoGenerate = false) val id: Int, val job: String, var interval: Long? = null, var delay: Long? = null, var hourly: Boolean = false, var daily: Boolean = false, var monthly: Boolean = false, var yearly: Boolean = false): Parcelable{
     fun toWorker(): Worker = Class.forName(this.job).newInstance() as Worker
     companion object{
        const val KEY_PARCEL = "KEY_PARCEL"

diff --git a/bootlaces/src/main/java/com/candroid/bootlaces/WorkService.kt b/bootlaces/src/main/java/com/candroid/bootlaces/WorkService.kt
@@ -180,11 +180,13 @@ class WorkService: BaseWorkService() {
             workers -= worker.apply {
                 workerCount = workers.also { it += this }.size
                 val intent = IntentFactory.createWorkNotificationIntent(this)
-                NotificatonService.enqueue(this@WorkService, intent)
+                if(withNotification == true)
+                    NotificatonService.enqueue(this@WorkService, intent)
                 registerWorkReceiver()
                 doWork(this@WorkService)
                 unregisterWorkReceiver()
-                NotificatonService.enqueue(this@WorkService, intent.apply { setAction(Actions.ACTION_FINISH.action) })
+                if(withNotification == true)
+                    NotificatonService.enqueue(this@WorkService, intent.apply { setAction(Actions.ACTION_FINISH.action) })
             }
             workerCount--
         }

diff --git a/bootlaces/src/main/java/com/candroid/bootlaces/Worker.kt b/bootlaces/src/main/java/com/candroid/bootlaces/Worker.kt
@@ -42,7 +42,7 @@ import android.content.Intent
  * @email [email protected]
  * @date 10/18/20
  **/
-abstract class Worker(val id: Int, val description: String, var interval: Long? = null, var delay: Long? = null, var hourly: Boolean = false, var daily: Boolean = false, var monthly: Boolean = false, var yearly: Boolean = false){
+abstract class Worker(val id: Int, val description: String, var withNotification: Boolean = false, var interval: Long? = null, var delay: Long? = null, var hourly: Boolean = false, var daily: Boolean = false, var monthly: Boolean = false, var yearly: Boolean = false){
      abstract val receiver: WorkReceiver?
 
      suspend abstract fun doWork(ctx: Context)