Skip to content

fix: accept Intent.EXTRA_EMAIL as String or String[] #256

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

fix: accept Intent.EXTRA_EMAIL as String or String[] #256

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
5 changes: 3 additions & 2 deletions src/com/android/messaging/ui/conversation/LaunchConversationActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,13 @@ protected void onCreate(final Bundle savedInstanceState) {
recipients = commaSeparatedRecipients.split(",");
}
final boolean haveAddress = !TextUtils.isEmpty(intent.getStringExtra(ADDRESS));
final boolean haveEmail = !TextUtils.isEmpty(intent.getStringExtra(Intent.EXTRA_EMAIL));
final String[] emails = intent.getStringArrayExtra(Intent.EXTRA_EMAIL);
final boolean haveEmail = emails != null && emails.length > 0;
if (recipients == null && (haveAddress || haveEmail)) {
if (haveAddress) {
recipients = new String[] { intent.getStringExtra(ADDRESS) };
} else {
recipients = new String[] { intent.getStringExtra(Intent.EXTRA_EMAIL) };
recipients = emails;
}
}
if (recipients != null) {
Expand Down
2 changes: 1 addition & 1 deletion src/com/android/messaging/ui/conversationpicker/host/share/ShareIntentActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class ShareIntentActivity : BugleComponentActivity() {

private fun redirectToSendToIfNeeded(): Boolean {
val hasNoDestination = intent.getStringExtra(EXTRA_ADDRESS).isNullOrEmpty() &&
intent.getStringExtra(Intent.EXTRA_EMAIL).isNullOrEmpty()
intent.getStringArrayExtra(Intent.EXTRA_EMAIL).isNullOrEmpty()

if (Intent.ACTION_SEND != intent.action || hasNoDestination) {
return false
Expand Down