Use AppService.Instance inside AlertDialog

wuan · Apr 27, 2016 · b1ec604 · b1ec604
1 parent 39beae6
commit b1ec604
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/app/src/main/java/org/blitzortung/android/app/Main.kt b/app/src/main/java/org/blitzortung/android/app/Main.kt
@@ -512,9 +512,7 @@ class Main : OwnMapActivity(), OnSharedPreferenceChangeListener {
             R.id.info_dialog -> InfoDialog(this, versionComponent)
 
             R.id.alarm_dialog ->
-                appService?.let { appService ->
-                    AlertDialog(this, appService, AlertDialogColorHandler(PreferenceManager.getDefaultSharedPreferences(this)))
-                }
+                AlertDialog(this, AlertDialogColorHandler(PreferenceManager.getDefaultSharedPreferences(this)))
 
             R.id.log_dialog -> LogDialog(this)
 

diff --git a/app/src/main/java/org/blitzortung/android/dialogs/AlertDialog.kt b/app/src/main/java/org/blitzortung/android/dialogs/AlertDialog.kt
@@ -29,7 +29,7 @@ import org.blitzortung.android.app.R
 import org.blitzortung.android.app.view.AlertView
 import org.blitzortung.android.map.overlay.color.ColorHandler
 
-class AlertDialog(context: Context, private val service: AppService?, private val colorHandler: ColorHandler) : android.app.AlertDialog(context) {
+class AlertDialog(context: Context, private val colorHandler: ColorHandler) : android.app.AlertDialog(context) {
     private lateinit var alertView: AlertView
 
     private val alertHandler: AlertHandler = BOApplication.alertHandler
@@ -51,9 +51,8 @@ class AlertDialog(context: Context, private val service: AppService?, private va
         alertHandler.requestUpdates(alertView.alertEventConsumer)
 
         alertView.setColorHandler(colorHandler, BOApplication.dataHandler.intervalDuration)
-        service?.run {
-            alertView.alertEventConsumer.invoke(this.alertEvent())
-        }
+        alertView.alertEventConsumer(alertHandler.alertEvent)
+
         colorHandler.updateTarget()
     }