From 47f9550021ad1dd207d0ac4c7af243a34124ac8c Mon Sep 17 00:00:00 2001 From: James Eberhardt Date: Tue, 22 Jun 2021 09:47:05 -0400 Subject: [PATCH] Change `failure` to `success`. (#1718) Fix for persistent notifications on Android. --- .../receiver/worker/ExposureCheckNotificationWorker.kt | 4 ++-- .../receiver/worker/ExposureCheckSchedulerWorker.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/app/covidshield/receiver/worker/ExposureCheckNotificationWorker.kt b/android/app/src/main/java/app/covidshield/receiver/worker/ExposureCheckNotificationWorker.kt index fab35170b..2a3ff22b4 100644 --- a/android/app/src/main/java/app/covidshield/receiver/worker/ExposureCheckNotificationWorker.kt +++ b/android/app/src/main/java/app/covidshield/receiver/worker/ExposureCheckNotificationWorker.kt @@ -71,7 +71,7 @@ class ExposureCheckNotificationWorker (private val context: Context, parameters: setForeground(foregroundInfo) } catch (exception: Exception) { filteredMetricsService.addDebugMetric(107.0, exception.message ?: "Unknown") - return Result.failure() + return Result.success() } val enIsEnabled = exposureNotificationClient.isEnabled.await() @@ -95,7 +95,7 @@ class ExposureCheckNotificationWorker (private val context: Context, parameters: return Result.success() } catch (exception: Exception) { filteredMetricsService.addDebugMetric(106.0, exception.message ?: "Unknown") - return Result.failure() + return Result.success() } } diff --git a/android/app/src/main/java/app/covidshield/receiver/worker/ExposureCheckSchedulerWorker.kt b/android/app/src/main/java/app/covidshield/receiver/worker/ExposureCheckSchedulerWorker.kt index fe315d634..87046b634 100644 --- a/android/app/src/main/java/app/covidshield/receiver/worker/ExposureCheckSchedulerWorker.kt +++ b/android/app/src/main/java/app/covidshield/receiver/worker/ExposureCheckSchedulerWorker.kt @@ -84,17 +84,17 @@ class ExposureCheckSchedulerWorker (val context: Context, parameters: WorkerPara } catch (exception: TimeoutCancellationException) { filteredMetricsService.addDebugMetric(101.0, exception.message ?: "Unknown") log("doWork exception", mapOf("message" to "Timeout")) - return Result.failure() + return Result.success() } catch (exception: Exception) { filteredMetricsService.addDebugMetric(102.0, exception.message ?: "Unknown") log("doWork exception", mapOf("message" to (exception.message ?: "Unknown"))) - return Result.failure() + return Result.success() } } } catch (exception: Exception) { filteredMetricsService.addDebugMetric(103.0, exception.message ?: "Unknown") Log.d("exception", "exception") - return Result.failure() + return Result.success() } return Result.success()