mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-30 03:33:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Use FLAG_ACTIVITY_SINGLE_TOP for MainActivity intents (#2022)

Browse Source
This commit is contained in:
James Rich
2025-06-04 14:20:30 -05:00
committed by GitHub
parent a05c48479d
commit 6153cfdab1
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View File

@@ -224,7 +224,9 @@ class MainActivity : AppCompatActivity(), Logging {
val startActivityIntent = Intent(
Intent.ACTION_VIEW, deepLink.toUri(),
this, MainActivity::class.java
)
).apply {
flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
}
val resultPendingIntent: PendingIntent? = TaskStackBuilder.create(this).run {
addNextIntentWithParentStack(startActivityIntent)
@@ -234,11 +236,13 @@ class MainActivity : AppCompatActivity(), Logging {
}
private fun createSettingsIntent(): PendingIntent {
val deepLink = "$DEEP_LINK_BASE_URI/settings"
val deepLink = "$DEEP_LINK_BASE_URI/connections"
val startActivityIntent = Intent(
Intent.ACTION_VIEW, deepLink.toUri(),
this, MainActivity::class.java
)
).apply {
flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
}
val resultPendingIntent: PendingIntent? = TaskStackBuilder.create(this).run {
addNextIntentWithParentStack(startActivityIntent)
@@ -387,7 +391,6 @@ class MainActivity : AppCompatActivity(), Logging {
override fun onStart() {
super.onStart()
bluetoothViewModel.enabled.observe(this) { enabled ->
if (!enabled && !requestedEnable && model.selectedBluetooth) {
requestedEnable = true

9
app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt
View File

@@ -355,7 +355,9 @@ class MeshServiceNotifications(
PendingIntent.getActivity(
context,
0,
Intent(context, MainActivity::class.java),
Intent(context, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
},
PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
)
}
@@ -368,13 +370,16 @@ class MeshServiceNotifications(
}
private fun createOpenMessageIntent(contactKey: String): PendingIntent {
val intentFlags = Intent.FLAG_ACTIVITY_SINGLE_TOP
val deepLink = "$DEEP_LINK_BASE_URI/messages/$contactKey"
val deepLinkIntent = Intent(
Intent.ACTION_VIEW,
deepLink.toUri(),
context,
MainActivity::class.java
)
).apply {
flags = intentFlags
}
val deepLinkPendingIntent: PendingIntent = TaskStackBuilder.create(context).run {
addNextIntentWithParentStack(deepLinkIntent)