Updated update policy and wrapped EmojiCompat with try/catch block

Javinator9889 · Apr 21, 2020 · 0e9e747 · 0e9e747
1 parent 7b26092
commit 0e9e747
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/activities/LauncherActivity.kt b/app/src/main/java/com/javinator9889/handwashingreminder/activities/LauncherActivity.kt
@@ -175,6 +175,11 @@ class LauncherActivity : AppCompatActivity() {
         }
     }
 
+    override fun finish() {
+        Timber.d("Calling finish")
+        super.finish()
+    }
+
     private fun installRequiredModules() {
         val modules = ArrayList<String>(MODULE_COUNT)
         val googleApi = GoogleApiAvailability.getInstance()

diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/jobs/workers/NotificationsWorker.kt b/app/src/main/java/com/javinator9889/handwashingreminder/jobs/workers/NotificationsWorker.kt
@@ -43,7 +43,7 @@ data class NotificationStructure(
 
 class NotificationsWorker(
     private val context: Context,
-    private val params: WorkerParameters
+    params: WorkerParameters
 ) : CoroutineWorker(context, params) {
 
     override suspend fun doWork(): Result = coroutineScope {
@@ -70,11 +70,19 @@ class NotificationsWorker(
 
 
             val emojiCompat = emojiLoader.await()
-            val title =
-                emojiCompat.process(context.getString(notificationData.title))
-            val comments =
-                context.resources.getStringArray(notificationData.content)
-            val comment = emojiCompat.process(comments.asList().random())
+            var title: CharSequence
+            var comment: CharSequence
+            try {
+                title =
+                    emojiCompat.process(context.getString(notificationData.title))
+                val comments =
+                    context.resources.getStringArray(notificationData.content)
+                comment = emojiCompat.process(comments.asList().random())
+            } catch (_: IllegalStateException) {
+                title = context.getText(notificationData.title)
+                comment = context.resources
+                    .getStringArray(notificationData.content).asList().random()
+            }
 
             withContext(Dispatchers.Main) {
                 notificationsHandler.createNotification(

diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/jobs/workers/WorkHandler.kt b/app/src/main/java/com/javinator9889/handwashingreminder/jobs/workers/WorkHandler.kt
@@ -103,7 +103,7 @@ class WorkHandler(private val context: Context) {
         with(workManager) {
             enqueueUniqueWork(
                 who,
-                ExistingWorkPolicy.REPLACE,
+                ExistingWorkPolicy.APPEND,
                 jobRequest
             )
         }