Skip to content

Fix cancel button functionality for Android 14+ #21

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

Draft
codegen-sh wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix cancel button functionality for Android 14+ #21

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
12 changes: 8 additions & 4 deletions Android/app/src/main/java/de/canyumusak/androiddrop/TransferService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class TransferService : Service() {
registerReceiver(
transferServiceBroadcastReceiver,
IntentFilter(CANCEL_REQUEST_ACTION),
RECEIVER_EXPORTED,
RECEIVER_NOT_EXPORTED,
)
} else {
registerReceiver(
Expand Down Expand Up @@ -137,7 +137,9 @@ class TransferService : Service() {
val intent = PendingIntent.getBroadcast(
context,
0,
Intent(CANCEL_REQUEST_ACTION),
Intent(CANCEL_REQUEST_ACTION).apply {
setPackage(context.packageName)
},
PendingIntent.FLAG_IMMUTABLE
)
val action = NotificationCompat.Action(0, "Cancel", intent)
Expand All @@ -161,7 +163,9 @@ class TransferService : Service() {
val intent = PendingIntent.getBroadcast(
context,
0,
Intent(CANCEL_REQUEST_ACTION),
Intent(CANCEL_REQUEST_ACTION).apply {
setPackage(context.packageName)
},
PendingIntent.FLAG_IMMUTABLE
)
val action = NotificationCompat.Action(0, "Cancel", intent)
Expand Down Expand Up @@ -228,11 +232,11 @@ class TransferService : Service() {

class TransferServiceBroadcastReceiver(val service: TransferService) : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) {
// Validate that this is a legitimate cancel request
if (intent?.action == TransferService.CANCEL_REQUEST_ACTION) {
service.cancelCurrentTransfer()
}
}

}

data class FileTransferCommand(
Expand Down