Skip to content

feat: offer to copy a sign-in code from the new-mail notification on Android #147 #148

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
wmcparla wants to merge 1 commit into
base: main
Choose a base branch
from
+511 −50
Open

feat: offer to copy a sign-in code from the new-mail notification on Android #147 #148

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
84 changes: 63 additions & 21 deletions android/app/src/main/java/com/anonymous/bulwarkmobile/BulwarkFcmModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ class BulwarkFcmModule(reactContext: ReactApplicationContext)
?: reactApplicationContext.getString(R.string.notification_action_delete)
val replyLabel = options.takeIf { it.hasKey("replyLabel") }?.getString("replyLabel")
?: reactApplicationContext.getString(R.string.notification_action_reply)
val copyCodeLabel = options.takeIf { it.hasKey("copyCodeLabel") }?.getString("copyCodeLabel")
?: reactApplicationContext.getString(R.string.notification_action_copy_code)
val codeCopiedLabel = options.takeIf { it.hasKey("codeCopiedLabel") }?.getString("codeCopiedLabel")
?: reactApplicationContext.getString(R.string.notification_code_copied)
// Delete moves the mail to Trash where there is one: no unlock needed
// for that (#85). Without a Trash it destroys the mail, so it asks.
// Unlock stays the default for a caller that doesn't say.
Expand All @@ -95,7 +99,8 @@ class BulwarkFcmModule(reactContext: ReactApplicationContext)
postNotification(
reactApplicationContext, notificationId, title, body, preview, largeIcon, bgColorHex,
emailId, threadId, subject, accountId, jmapAccountId, groupKey,
groupTitle, markReadLabel, deleteLabel, replyLabel, deleteNeedsUnlock,
groupTitle, markReadLabel, deleteLabel, replyLabel, copyCodeLabel, codeCopiedLabel,
deleteNeedsUnlock,
)
if (groupKey != null) {
postGroupSummary(reactApplicationContext, groupKey, groupTitle, bgColorHex, accountId, withoutContent)
Expand Down Expand Up @@ -153,6 +158,8 @@ class BulwarkFcmModule(reactContext: ReactApplicationContext)
markReadLabel: String,
deleteLabel: String,
replyLabel: String,
copyCodeLabel: String,
codeCopiedLabel: String,
deleteNeedsUnlock: Boolean,
) {
val intent = Intent(ctx, MainActivity::class.java).apply {
Expand Down Expand Up @@ -204,6 +211,33 @@ class BulwarkFcmModule(reactContext: ReactApplicationContext)
}

if (emailId != null && accountId != null) {
// A sign-in code in the mail: Copy comes first and takes Reply's
// place, as the tray shows three actions and nobody answers a
// code mail. The label shows the code, so a wrong pick is seen
// before it is pasted. A fault in the search must not cost the
// notification itself.
val code = runCatching { OtpCode.find(subject, preview) }.getOrNull()
if (code != null) {
val copyIntent = Intent(ctx, BulwarkNotificationActionReceiver::class.java).apply {
action = ACTION_COPY_CODE
data = Uri.parse("bulwark-action-copy-code://$notificationId")
putExtra(EXTRA_NOTIFICATION_ID, notificationId)
putExtra(EXTRA_ACTION, "copyCode")
putExtra(EXTRA_CODE, code)
putExtra(EXTRA_CODE_COPIED_LABEL, codeCopiedLabel)
putExtra(NotificationTapStore.EXTRA_ACCOUNT_ID, accountId)
}
val copyPending = PendingIntent.getBroadcast(
ctx,
(notificationId + ":copyCode").hashCode(),
copyIntent,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
)
builder.addAction(
NotificationCompat.Action.Builder(0, copyCodeLabel.replace("{code}", code), copyPending).build()
)
}

// Action 1: Mark as read
val markReadIntent = Intent(ctx, BulwarkNotificationActionReceiver::class.java).apply {
action = ACTION_MARK_READ
Expand Down Expand Up @@ -247,26 +281,28 @@ class BulwarkFcmModule(reactContext: ReactApplicationContext)
.build()
)

// Action 3: Reply
val replyIntent = Intent(ctx, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
data = Uri.parse("bulwark-reply://$notificationId")
putExtra(NotificationTapStore.EXTRA_EMAIL_ID, emailId)
if (threadId != null) putExtra(NotificationTapStore.EXTRA_THREAD_ID, threadId)
if (subject != null) putExtra(NotificationTapStore.EXTRA_SUBJECT, subject)
putExtra(NotificationTapStore.EXTRA_ACCOUNT_ID, accountId)
if (jmapAccountId != null) putExtra(NotificationTapStore.EXTRA_JMAP_ACCOUNT_ID, jmapAccountId)
putExtra(EXTRA_ACTION, "reply")
// Action 3: Reply, unless Copy took its place
if (code == null) {
val replyIntent = Intent(ctx, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
data = Uri.parse("bulwark-reply://$notificationId")
putExtra(NotificationTapStore.EXTRA_EMAIL_ID, emailId)
if (threadId != null) putExtra(NotificationTapStore.EXTRA_THREAD_ID, threadId)
if (subject != null) putExtra(NotificationTapStore.EXTRA_SUBJECT, subject)
putExtra(NotificationTapStore.EXTRA_ACCOUNT_ID, accountId)
if (jmapAccountId != null) putExtra(NotificationTapStore.EXTRA_JMAP_ACCOUNT_ID, jmapAccountId)
putExtra(EXTRA_ACTION, "reply")
}
val replyPending = PendingIntent.getActivity(
ctx,
(notificationId + ":reply").hashCode(),
replyIntent,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
)
builder.addAction(
NotificationCompat.Action.Builder(0, replyLabel, replyPending).build()
)
}
val replyPending = PendingIntent.getActivity(
ctx,
(notificationId + ":reply").hashCode(),
replyIntent,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
)
builder.addAction(
NotificationCompat.Action.Builder(0, replyLabel, replyPending).build()
)
}

val manager = ctx.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
Expand Down Expand Up @@ -418,6 +454,9 @@ class BulwarkFcmModule(reactContext: ReactApplicationContext)
const val EXTRA_NOTIFICATION_ID = "bulwark.notification.notificationId"
const val ACTION_MARK_READ = "com.anonymous.bulwarkmobile.ACTION_MARK_READ"
const val ACTION_DELETE = "com.anonymous.bulwarkmobile.ACTION_DELETE"
const val ACTION_COPY_CODE = "com.anonymous.bulwarkmobile.ACTION_COPY_CODE"
const val EXTRA_CODE = "bulwark.notification.code"
const val EXTRA_CODE_COPIED_LABEL = "bulwark.notification.codeCopiedLabel"

fun emit(eventName: String, params: WritableMap?) {
val module = currentInstance ?: return
Expand Down Expand Up @@ -445,14 +484,17 @@ class BulwarkFcmModule(reactContext: ReactApplicationContext)
markReadLabel: String = context.getString(R.string.notification_action_mark_read),
deleteLabel: String = context.getString(R.string.notification_action_delete),
replyLabel: String = context.getString(R.string.notification_action_reply),
copyCodeLabel: String = context.getString(R.string.notification_action_copy_code),
codeCopiedLabel: String = context.getString(R.string.notification_code_copied),
deleteNeedsUnlock: Boolean = true,
) {
val largeIcon = iconUrl?.let { fetchBitmap(it) }
?: makeLetterAvatar(initials, bgColorHex)
postNotification(
context, notificationId, title, body, preview, largeIcon, bgColorHex,
emailId, threadId, subject, accountId, jmapAccountId, groupKey,
groupTitle, markReadLabel, deleteLabel, replyLabel, deleteNeedsUnlock,
groupTitle, markReadLabel, deleteLabel, replyLabel, copyCodeLabel, codeCopiedLabel,
deleteNeedsUnlock,
)
if (groupKey != null) {
postGroupSummary(context, groupKey, groupTitle ?: "Bulwark Mail", bgColorHex, accountId)
Expand Down
8 changes: 8 additions & 0 deletions android/app/src/main/java/com/anonymous/bulwarkmobile/BulwarkNativePushFetcher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ object BulwarkNativePushFetcher {
val markRead: String,
val delete: String,
val reply: String,
val copyCode: String,
val codeCopied: String,
)

sealed class JmapFetchResult {
Expand Down Expand Up @@ -1047,6 +1049,10 @@ object BulwarkNativePushFetcher {
?: context.getString(R.string.notification_action_delete),
reply = stringsObj?.optString("reply")?.takeIf { it.isNotBlank() }
?: context.getString(R.string.notification_action_reply),
copyCode = stringsObj?.optString("copyCode")?.takeIf { it.isNotBlank() }
?: context.getString(R.string.notification_action_copy_code),
codeCopied = stringsObj?.optString("codeCopied")?.takeIf { it.isNotBlank() }
?: context.getString(R.string.notification_code_copied),
)
}

Expand Down Expand Up @@ -1187,6 +1193,8 @@ object BulwarkNativePushFetcher {
markReadLabel = strings.markRead,
deleteLabel = strings.delete,
replyLabel = strings.reply,
copyCodeLabel = strings.copyCode,
codeCopiedLabel = strings.codeCopied,
deleteNeedsUnlock = !result.hasTrash,
)
}
Expand Down
33 changes: 33 additions & 0 deletions android/app/src/main/java/com/anonymous/bulwarkmobile/BulwarkNotificationActionReceiver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,17 @@ package com.anonymous.bulwarkmobile
import android.app.Application
import android.app.NotificationManager
import android.content.BroadcastReceiver
import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context
import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.os.PersistableBundle
import android.util.Log
import android.widget.Toast
import com.facebook.react.bridge.Arguments
import com.facebook.react.jstasks.HeadlessJsTaskConfig
import com.facebook.react.jstasks.HeadlessJsTaskContext
Expand All @@ -33,6 +38,11 @@ class BulwarkNotificationActionReceiver : BroadcastReceiver() {
BulwarkFcmModule.refreshGroupSummaryAfterCancel(context, accountId)
}

if (action == "copyCode") {
copyCode(context, intent)
return
}

if (emailId.isNullOrBlank() || action.isNullOrBlank() || accountId.isNullOrBlank()) {
Log.w(TAG, "Missing parameters for notification action: action=$action, emailId=$emailId, accountId=$accountId")
return
Expand Down Expand Up @@ -150,6 +160,29 @@ class BulwarkNotificationActionReceiver : BroadcastReceiver() {
}
}

// Copies the sign-in code the notification offered (OtpCode), marked
// sensitive so the clipboard preview of Android 13+ hides it. Older
// Android confirms nothing itself: a toast says it was copied.
private fun copyCode(context: Context, intent: Intent) {
val code = intent.getStringExtra(BulwarkFcmModule.EXTRA_CODE)
if (code.isNullOrBlank()) return
// The label is the app's name: a clipboard viewer may show the label
// even where it hides the sensitive text.
val clip = ClipData.newPlainText(context.getString(R.string.app_name), code).apply {
description.extras = PersistableBundle().apply {
// ClipDescription.EXTRA_IS_SENSITIVE, a constant of API 33.
putBoolean("android.content.extra.IS_SENSITIVE", true)
}
}
val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
clipboard.setPrimaryClip(clip)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
val label = intent.getStringExtra(BulwarkFcmModule.EXTRA_CODE_COPIED_LABEL)
?: context.getString(R.string.notification_code_copied)
Toast.makeText(context, label, Toast.LENGTH_SHORT).show()
}
}

companion object {
private const val TAG = "BulwarkNotifAction"
}
Expand Down
Loading
Loading