Skip to content
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

Jump to bottom

[expo-sms][android] fix flicker on sendSMSAsync if there are no attachments #8639

Merged
merged 1 commit into from Jun 4, 2020
Merged

[expo-sms][android] fix flicker on sendSMSAsync if there are no attachments #8639

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 30 additions & 22 deletions packages/expo-sms/android/src/main/java/expo/modules/sms/SMSModule.java
View file
Open in desktop
Expand Up @@ -69,38 +69,46 @@ public void sendSMSAsync(
return;
}

Intent SMSIntent = new Intent(Intent.ACTION_SEND);
Intent smsIntent;

List<Map<String, String>> attachments = null;
if (options != null && options.containsKey(OPTIONS_ATTACHMENTS_KEY)) {
attachments = (List<Map<String, String>>) options.get(OPTIONS_ATTACHMENTS_KEY);
}

// ACTION_SEND causes a weird flicker on Android 10 devices if the messaging app is not already
// open in the background, but it seems to be the only intent type that works for including
// attachments, so we use it if there are attachments and fall back to ACTION_SENDTO otherwise.
if (attachments != null && !attachments.isEmpty()) {
smsIntent = new Intent(Intent.ACTION_SEND);
smsIntent.setType("text/plain");
smsIntent.putExtra("address", constructRecipients(addresses));

Map<String, String> attachment = attachments.get(0);
smsIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse(attachment.get("uri")));
smsIntent.setType(attachment.get("mimeType"));
} else {
smsIntent = new Intent(Intent.ACTION_SENDTO);
smsIntent.setData(Uri.parse("smsto:" + constructRecipients(addresses)));
}

String defaultSMSPackage = Telephony.Sms.getDefaultSmsPackage(getContext());
if (defaultSMSPackage != null){
SMSIntent.setPackage(defaultSMSPackage);
smsIntent.setPackage(defaultSMSPackage);
} else {
promise.reject(ERROR_TAG + "_NO_SMS_APP", "No messaging application available");
return;
}
SMSIntent.setType("text/plain");
final String smsTo = constructRecipients(addresses);
SMSIntent.putExtra("address", smsTo);

SMSIntent.putExtra("exit_on_sent", true);
SMSIntent.putExtra("compose_mode", true);
SMSIntent.putExtra(Intent.EXTRA_TEXT, message);
SMSIntent.putExtra("sms_body", message);

if (options != null) {
if (options.containsKey(OPTIONS_ATTACHMENTS_KEY)) {
final List<Map<String, String>> attachments = (List<Map<String, String>>) options.get(OPTIONS_ATTACHMENTS_KEY);
if (attachments != null && !attachments.isEmpty()) {
Map<String, String> attachment = attachments.get(0);
SMSIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse(attachment.get("uri")));
SMSIntent.setType(attachment.get("mimeType"));
}
}
}

smsIntent.putExtra("exit_on_sent", true);
smsIntent.putExtra("compose_mode", true);
smsIntent.putExtra(Intent.EXTRA_TEXT, message);
smsIntent.putExtra("sms_body", message);

mPendingPromise = promise;

ActivityProvider activityProvider = mModuleRegistry.getModule(ActivityProvider.class);
activityProvider.getCurrentActivity().startActivity(SMSIntent);
activityProvider.getCurrentActivity().startActivity(smsIntent);

mSMSComposerOpened = true;
}
Expand Down