From 580813df73f3794ed0599e8039e98b52b1e7628f Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 25 Feb 2018 14:39:05 +0100
Subject: [PATCH] Fixes an issue with the notification reappearing and init
state missing
---
.../de/kuschku/quasseldroid_ng/service/QuasselService.kt | 1 +
.../java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.kt
index 4b12192c4..a8f6b2e67 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.kt
@@ -72,6 +72,7 @@ class QuasselService : LifecycleService(),
updateNotification(notificationHandle)
startForeground(notificationHandle.id, notificationHandle.builder.build())
} else {
+ this.notificationHandle = null
stopForeground(true)
}
}
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 a981cdd53..beb5782ac 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
@@ -150,13 +150,13 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
progressBar.hide()
}
ConnectionState.INIT -> {
- progressBar.isIndeterminate = true
- }
- else -> {
progressBar.isIndeterminate = false
progressBar.progress = progress
progressBar.max = max
}
+ else -> {
+ progressBar.isIndeterminate = true
+ }
}
})
--
GitLab