From d965427f1218354f05d22e40eb07a2b7a392caca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Br=C3=BCggenthies?= <tim.brueggenthies@outlook.de>
Date: Tue, 2 Jun 2020 11:22:39 +0200
Subject: [PATCH] Moves creation of notification channel to app startup (#32)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
---
 .../src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt | 2 ++
 .../de/rki/coronawarnapp/notification/NotificationHelper.kt     | 1 -
 .../src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt  | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
index 40a4b67b3..d0887aaa1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
@@ -2,6 +2,7 @@ package de.rki.coronawarnapp
 
 import android.app.Application
 import android.content.Context
+import de.rki.coronawarnapp.notification.NotificationHelper
 
 class CoronaWarnApplication : Application() {
 
@@ -13,6 +14,7 @@ class CoronaWarnApplication : Application() {
 
     override fun onCreate() {
         instance = this
+        NotificationHelper.createNotificationChannel()
         super.onCreate()
     }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/notification/NotificationHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/notification/NotificationHelper.kt
index c41ff76fa..05974bd02 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/notification/NotificationHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/notification/NotificationHelper.kt
@@ -128,7 +128,6 @@ object NotificationHelper {
      * @param visibility: Int
      */
     fun sendNotification(title: String, content: String, visibility: Int) {
-        createNotificationChannel()
         val notification = buildNotification(title, content, visibility) ?: return
         with(NotificationManagerCompat.from(CoronaWarnApplication.getAppContext())) {
             notify(Random.nextInt(), notification)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
index 216794328..33324442b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
@@ -150,7 +150,6 @@ class MainFragment : BaseFragment() {
                         NotificationManagerCompat.from(requireContext()).areNotificationsEnabled()
                             .toString()
                     )
-                    NotificationHelper.createNotificationChannel()
                     NotificationHelper.sendNotification(
                         getString(R.string.notification_headline),
                         getString(R.string.notification_body),
-- 
GitLab