From 29de7f4fca1db9b376280d108b2d758991ac2aa1 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 6 Dec 2017 04:56:41 +0100
Subject: [PATCH] Stop service when not in use
---
.../java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt | 1 +
.../quasseldroid_ng/util/service/ServiceBoundActivity.kt | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
index e51792e05..17638610c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
@@ -145,6 +145,7 @@ class ChatActivity : ServiceBoundActivity() {
putBoolean(Keys.Status.reconnect, false)
}
backend.value?.disconnect(true)
+ stopService()
setResult(Activity.RESULT_OK)
finish()
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/service/ServiceBoundActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/util/service/ServiceBoundActivity.kt
index 07fe3b2d4..9c8598786 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/service/ServiceBoundActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/util/service/ServiceBoundActivity.kt
@@ -64,4 +64,9 @@ abstract class ServiceBoundActivity : AppCompatActivity() {
super.onStop()
unbindService(connection)
}
+
+ protected fun stopService() {
+ unbindService(connection)
+ stopService(Intent(this, QuasselService::class.java))
+ }
}
--
GitLab