From 9e88eab5dfd78d1de7582aea820352df8398f024 Mon Sep 17 00:00:00 2001
From: Shonn Li <s854li@uwaterloo.ca>
Date: Wed, 23 Mar 2022 21:13:42 -0400
Subject: [PATCH] finally version found
---
.../java/com/noteapplication/cs398/AddNoteActivity.kt | 9 +++++----
.../main/java/com/noteapplication/cs398/AlertReceiver.kt | 3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/NoteApplication/app/src/main/java/com/noteapplication/cs398/AddNoteActivity.kt b/NoteApplication/app/src/main/java/com/noteapplication/cs398/AddNoteActivity.kt
index 8791088..999cbca 100644
--- a/NoteApplication/app/src/main/java/com/noteapplication/cs398/AddNoteActivity.kt
+++ b/NoteApplication/app/src/main/java/com/noteapplication/cs398/AddNoteActivity.kt
@@ -264,15 +264,16 @@ class AddNoteActivity : AppCompatActivity(), DatePickerDialog.OnDateSetListener,
}
private fun startAlarm(c: Calendar) {
+ var id:Int = calendar.time.time.toInt()
+ if (oldNote != null) {
+ id = oldNote!!.createdAt.toInt()
+ }
val alarmManager: AlarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
val intent = Intent(this, AlertReceiver::class.java)
intent.putExtra("title", title)
intent.putExtra("content", content)
+ intent.putExtra("id", id)
Toast.makeText(this, "title: $title, content:$content", Toast.LENGTH_SHORT).show()
- var id:Int = calendar.time.time.toInt()
- if (oldNote != null) {
- id = oldNote!!.createdAt.toInt()
- }
val pendingIntent =
PendingIntent.getBroadcast(this, id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
diff --git a/NoteApplication/app/src/main/java/com/noteapplication/cs398/AlertReceiver.kt b/NoteApplication/app/src/main/java/com/noteapplication/cs398/AlertReceiver.kt
index 64c1e88..c0fa2df 100644
--- a/NoteApplication/app/src/main/java/com/noteapplication/cs398/AlertReceiver.kt
+++ b/NoteApplication/app/src/main/java/com/noteapplication/cs398/AlertReceiver.kt
@@ -10,8 +10,9 @@ class AlertReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
val title = intent.getSerializableExtra("title") as String
val content = intent.getSerializableExtra("content") as String
+ val id = intent.getSerializableExtra("id") as Int
val notificationHelper = NotificationHelper(context, title, content)
val nb: NotificationCompat.Builder = notificationHelper.channelNotification
- notificationHelper.manager!!.notify(1, nb.build())
+ notificationHelper.manager!!.notify(id, nb.build())
}
}
\ No newline at end of file
--
GitLab