Skip to content

WIP: launch activity using broadcast intent #53

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
wunter8 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP: launch activity using broadcast intent #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions app/src/main/java/io/heckel/ntfy/backup/Backuper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ class Backuper(val context: Context) {
body = a.body,
intent = a.intent,
extras = a.extras,
intent_class = a.intent_class,
intent_package = a.intent_package,
progress = a.progress,
error = a.error
)
Expand Down Expand Up @@ -256,6 +258,8 @@ class Backuper(val context: Context) {
body = a.body,
intent = a.intent,
extras = a.extras,
intent_class = a.intent_class,
intent_package = a.intent_package,
progress = a.progress,
error = a.error
)
Expand Down Expand Up @@ -383,6 +387,8 @@ data class Action(
val body: String?, // used in "http" action
val intent: String?, // used in "broadcast" action
val extras: Map<String,String>?, // used in "broadcast" action
val intent_class: String?, // used in "broadcast" action
val intent_package: String?, // used in "broadcast" action
val progress: Int?, // used to indicate progress in popup
val error: String? // used to indicate errors in popup
)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/io/heckel/ntfy/db/Database.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ data class Action(
@ColumnInfo(name = "body") val body: String?, // used in "http" action
@ColumnInfo(name = "intent") val intent: String?, // used in "broadcast" action
@ColumnInfo(name = "extras") val extras: Map<String,String>?, // used in "broadcast" action
@ColumnInfo(name = "intent_class") val intent_class: String?, // used in "broadcast" action
@ColumnInfo(name = "intent_package") val intent_package: String?, // used in "broadcast" action
@ColumnInfo(name = "progress") val progress: Int?, // used to indicate progress in popup
@ColumnInfo(name = "error") val error: String?, // used to indicate errors in popup
)
Expand Down
16 changes: 15 additions & 1 deletion app/src/main/java/io/heckel/ntfy/msg/BroadcastService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,24 @@ class BroadcastService(private val ctx: Context) {
fun sendUserAction(action: Action) {
val intent = Intent()
intent.action = action.intent ?: USER_ACTION_ACTION
if (action.intent_class != null && action.intent_package != null) {
intent.setClassName(action.intent_package, action.intent_class)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

Log.d(
TAG,
"Sending user action intent to start activity: ${intent.action} to ${action.intent_package}:${action.intent_class} with extras ${intent.extras}"
)
ctx.startActivity(intent)
return
}
action.extras?.forEach { (key, value) ->
intent.putExtra(key, value)
}
Log.d(TAG, "Sending user action intent broadcast: ${intent.action} with extras ${intent.extras}")
Log.d(
TAG,
"Sending user action intent broadcast: ${intent.action} with extras ${intent.extras}"
)
ctx.sendBroadcast(intent)
}

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/io/heckel/ntfy/msg/Message.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ data class MessageAction(
val body: String?, // used in "http" action
val intent: String?, // used in "broadcast" action
val extras: Map<String,String>?, // used in "broadcast" action
val intent_class: String?, // used in "broadcast" action
val intent_package: String?, // used in "broadcast" action
)

const val MESSAGE_ENCODING_BASE64 = "base64"
4 changes: 4 additions & 0 deletions app/src/main/java/io/heckel/ntfy/msg/NotificationParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ class NotificationParser {
body = a.body,
intent = a.intent,
extras = a.extras,
intent_class = a.intent_class,
intent_package = a.intent_package,
progress = null,
error = null
)
Expand Down Expand Up @@ -89,6 +91,8 @@ class NotificationParser {
body = a.body,
intent = a.intent,
extras = a.extras,
intent_class = a.intent_class,
intent_package = a.intent_package,
progress = null,
error = null
)
Expand Down