From 7809f4282b079d3bc4d39a12d5636e8d06cee1fc Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 17 Nov 2016 20:45:51 +0100
Subject: [PATCH] use the general EVENT_ID constant at NotificationReceiver

---
 .../simplemobiletools/calendar/activities/EventActivity.kt | 6 +++---
 .../com/simplemobiletools/calendar/extensions/Context.kt   | 2 +-
 .../calendar/receivers/NotificationReceiver.kt             | 7 ++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index cf9b53254..6c7f844ee 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -19,9 +19,9 @@ import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
 
 class EventActivity : SimpleActivity(), DBHelper.EventsListener {
-    private var mWasReminderInit: Boolean = false
-    private var mWasEndDateSet: Boolean = false
-    private var mWasEndTimeSet: Boolean = false
+    private var mWasReminderInit = false
+    private var mWasEndDateSet = false
+    private var mWasEndTimeSet = false
 
     lateinit var mEventStartDateTime: DateTime
     lateinit var mEventEndDateTime: DateTime
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
index 48c29e4c1..b50085529 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
@@ -75,6 +75,6 @@ fun Context.scheduleEventIn(notifTS: Int, event: Event) {
 
 private fun getNotificationIntent(context: Context, eventId: Int): PendingIntent {
     val intent = Intent(context, NotificationReceiver::class.java)
-    intent.putExtra(NotificationReceiver.EVENT_ID, eventId)
+    intent.putExtra(EVENT_ID, eventId)
     return PendingIntent.getBroadcast(context, eventId, intent, PendingIntent.FLAG_UPDATE_CURRENT)
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt
index b3e55dcc1..d1516c405 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt
@@ -11,14 +11,11 @@ import com.simplemobiletools.calendar.R
 import com.simplemobiletools.calendar.activities.EventActivity
 import com.simplemobiletools.calendar.extensions.scheduleNextEvent
 import com.simplemobiletools.calendar.helpers.DBHelper
+import com.simplemobiletools.calendar.helpers.EVENT_ID
 import com.simplemobiletools.calendar.helpers.Formatter
 import com.simplemobiletools.calendar.models.Event
 
 class NotificationReceiver : BroadcastReceiver() {
-    companion object {
-        var EVENT_ID = "event_id"
-    }
-
     override fun onReceive(context: Context, intent: Intent) {
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         val id = intent.getIntExtra(EVENT_ID, -1)
@@ -44,7 +41,7 @@ class NotificationReceiver : BroadcastReceiver() {
 
     private fun getPendingIntent(context: Context, event: Event): PendingIntent {
         val intent = Intent(context, EventActivity::class.java)
-        intent.putExtra(EVENT_ID, event)
+        intent.putExtra(EVENT_ID, event.id)
         return PendingIntent.getActivity(context, event.id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
     }