Skip to content
Snippets Groups Projects
Commit dd262076 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Trim recipient addresses that are unreasonably long. 2p: e37bb58f 2p: 22ba5f1d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/23181897

Bug: 278556945
Change-Id: Icaf4e03f5e9ecf4380f8adb902388e53e6c1ee9e
parents a4838ac9 22ba5f1d
No related branches found
No related tags found
No related merge requests found
...@@ -37,6 +37,8 @@ import com.android.messaging.util.UriUtil; ...@@ -37,6 +37,8 @@ import com.android.messaging.util.UriUtil;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.List;
/** /**
* Launches ConversationActivity for sending a message to, or viewing messages from, a specific * Launches ConversationActivity for sending a message to, or viewing messages from, a specific
...@@ -46,6 +48,7 @@ import java.net.URLDecoder; ...@@ -46,6 +48,7 @@ import java.net.URLDecoder;
*/ */
public class LaunchConversationActivity extends Activity implements public class LaunchConversationActivity extends Activity implements
LaunchConversationData.LaunchConversationDataListener { LaunchConversationData.LaunchConversationDataListener {
private static final int MAX_RECIPIENT_LENGTH = 100;
static final String SMS_BODY = "sms_body"; static final String SMS_BODY = "sms_body";
static final String ADDRESS = "address"; static final String ADDRESS = "address";
final Binding<LaunchConversationData> mBinding = BindingBase.createBinding(this); final Binding<LaunchConversationData> mBinding = BindingBase.createBinding(this);
...@@ -76,6 +79,9 @@ public class LaunchConversationActivity extends Activity implements ...@@ -76,6 +79,9 @@ public class LaunchConversationActivity extends Activity implements
recipients = new String[] { intent.getStringExtra(Intent.EXTRA_EMAIL) }; recipients = new String[] { intent.getStringExtra(Intent.EXTRA_EMAIL) };
} }
} }
if (recipients != null) {
recipients = trimInvalidRecipients(recipients);
}
mSmsBody = intent.getStringExtra(SMS_BODY); mSmsBody = intent.getStringExtra(SMS_BODY);
if (TextUtils.isEmpty(mSmsBody)) { if (TextUtils.isEmpty(mSmsBody)) {
// Used by intents sent from the web YouTube (and perhaps others). // Used by intents sent from the web YouTube (and perhaps others).
...@@ -103,6 +109,20 @@ public class LaunchConversationActivity extends Activity implements ...@@ -103,6 +109,20 @@ public class LaunchConversationActivity extends Activity implements
finish(); finish();
} }
private String[] trimInvalidRecipients(String[] recipients) {
List<String> trimmedRecipients = new ArrayList<>();
for (String recipient : recipients) {
if (recipient.length() < MAX_RECIPIENT_LENGTH) {
trimmedRecipients.add(recipient);
}
}
if (trimmedRecipients.size() > 0) {
return trimmedRecipients.toArray(new String[0]);
} else {
return null;
}
}
private String getBody(final Uri uri) { private String getBody(final Uri uri) {
if (uri == null) { if (uri == null) {
return null; return null;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment