From 2f3a846855ab613f531d260606c32232f18263c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 27 Sep 2021 11:34:17 -0400
Subject: [PATCH] data transfer: stop if no intent

Change-Id: I55c70c31c48f9d70b01aac317121deb72820220e
---
 .../src/main/java/cx/ring/services/DataTransferService.kt  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ring-android/app/src/main/java/cx/ring/services/DataTransferService.kt b/ring-android/app/src/main/java/cx/ring/services/DataTransferService.kt
index ed5570adf..60c348f10 100644
--- a/ring-android/app/src/main/java/cx/ring/services/DataTransferService.kt
+++ b/ring-android/app/src/main/java/cx/ring/services/DataTransferService.kt
@@ -37,12 +37,17 @@ class DataTransferService : Service() {
 
     @Inject
     lateinit var mNotificationService: NotificationService
+
     private lateinit var notificationManager: NotificationManagerCompat
     private var started = false
     private var serviceNotificationId = 0
     private val serviceNotifications: MutableSet<Int> = HashSet()
 
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (intent == null) {
+            stopSelfResult(startId)
+            return START_NOT_STICKY
+        }
         val notificationId = intent.getIntExtra(NotificationService.KEY_NOTIFICATION_ID, -1)
         val action = intent.action
         if (ACTION_START == action) {
-- 
GitLab