Removed ExposureNotificationIntentService, the functionality is handl…

…ed by NotificationHelper (#40)
corona-warn-app · May 30, 2020 · c96ede0 · c96ede0
1 parent a5a6d24
commit c96ede0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 62 deletions.
diff --git a/Corona-Warn-App/src/main/AndroidManifest.xml b/Corona-Warn-App/src/main/AndroidManifest.xml
@@ -65,13 +65,6 @@
             android:exported="false"
             android:screenOrientation="fullSensor"
             tools:replace="screenOrientation" />
-
-        <service
-            android:name=".notification.ExposureNotificationIntentService"
-            android:enabled="true"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
     </application>
 
 </manifest>
diff --git a/...-App/src/main/java/de/rki/coronawarnapp/notification/ExposureNotificationIntentService.kt b/...-App/src/main/java/de/rki/coronawarnapp/notification/ExposureNotificationIntentService.kt
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
@@ -1,18 +1,17 @@
 package de.rki.coronawarnapp.ui.main
 
-import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupMenu
 import android.widget.Toast
+import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.fragment.app.activityViewModels
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentMainBinding
-import de.rki.coronawarnapp.notification.ExposureNotificationIntentService
 import de.rki.coronawarnapp.notification.NotificationHelper
 import de.rki.coronawarnapp.timer.TimerHelper
 import de.rki.coronawarnapp.ui.BaseFragment
@@ -152,8 +151,11 @@ class MainFragment : BaseFragment() {
                             .toString()
                     )
                     NotificationHelper.createNotificationChannel()
-                    val intent = Intent(context, ExposureNotificationIntentService::class.java)
-                    activity?.startService(intent)
+                    NotificationHelper.sendNotification(
+                        getString(R.string.notification_headline),
+                        getString(R.string.notification_body),
+                        NotificationCompat.PRIORITY_HIGH
+                    )
                     true
                 }
                 else -> super.onOptionsItemSelected(it)