Skip to content

Replace alarm fragment on new intent #1504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Futsch1 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Replace alarm fragment on new intent #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9823fe
Replace alarm fragment on new intent
Futsch1 Jun 25, 2026
91e2741
Fixes for SDK 28
Futsch1 Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/src/androidTest/java/com/futsch1/medtimer/NotificationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,10 +814,9 @@ class NotificationTest : BaseTestHelper() {
device: UiDevice,
context: Context
) {
val o1 = device.findObject(By.desc(context.getString(R.string.taken)))
while (device.findObject(By.text(context.getString(R.string.snooze))) != null) {
try {
o1.click()
device.findObject(By.desc(context.getString(R.string.taken)))?.click()
} catch (_: StaleObjectException) {
// Ignore
}
Expand Down
3 changes: 1 addition & 2 deletions ...ure/reminders/src/main/java/com/futsch1/medtimer/feature/reminders/alarm/AlarmFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,11 @@ class AlarmFragment(

private fun closeWithIntent(pendingIntent: PendingIntent) {
pendingIntent.send()
requireActivity().supportFragmentManager.beginTransaction().remove(this).commit()
requireActivity().finishAndRemoveTask()
}

override fun onDestroyView() {
super.onDestroyView()
Log.d(ALARM, "Closing activity")
requireActivity().finishAndRemoveTask()
}
}
8 changes: 7 additions & 1 deletion ...nders/src/main/java/com/futsch1/medtimer/feature/reminders/alarm/ReminderAlarmActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,17 @@ class ReminderAlarmActivity : AppCompatActivity() {
return true
}

override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
setIntent(intent)
addAlarmFragment(intent)
}

private fun addAlarmFragment(intent: Intent?) {
if (intent != null) {
Log.d(LogTags.ALARM, "Adding alarm fragment")
supportFragmentManager.beginTransaction()
.add(R.id.alarmFragmentContainer, AlarmFragment::class.java, intent.extras).commit()
.replace(R.id.alarmFragmentContainer, AlarmFragment::class.java, intent.extras).commit()
}
}

Expand Down
Loading