Commit da58452d authored by Travis Skare's avatar Travis Skare Committed by Commit Bot

[Sharing Hub] Don't call QR service with empty URL.

Bug: 1109649
Change-Id: I319cebee36eee81087bf8b19f2f04bc0bac8190a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2321766
Commit-Queue: Travis Skare <skare@chromium.org>
Reviewed-by: default avatarTanya Gupta <tgupta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792518}
parent 054ecc4e
......@@ -14,6 +14,7 @@ import android.os.Process;
import android.text.DynamicLayout;
import android.text.Layout.Alignment;
import android.text.TextPaint;
import android.text.TextUtils;
import android.text.TextUtils.TruncateAt;
import android.view.View;
......@@ -70,6 +71,12 @@ class QrCodeShareMediator {
* @param data The data to encode.
*/
protected void refreshQrCode(String data) {
if (TextUtils.isEmpty(data)) {
mPropertyModel.set(QrCodeShareViewProperties.ERROR_STRING,
mContext.getResources().getString(R.string.qr_code_error_unknown));
return;
}
QRCodeGenerationRequest.QRCodeServiceCallback callback =
new QRCodeGenerationRequest.QRCodeServiceCallback() {
@Override
......@@ -82,7 +89,7 @@ class QrCodeShareMediator {
ChromeFeatureList.CHROME_SHARE_QRCODE, "max_url_length",
/*defaultValue=*/122);
String errorMessage;
if (mUrl.length() > maxUrlLength) {
if (data != null && data.length() > maxUrlLength) {
errorMessage = mContext.getResources().getString(
R.string.qr_code_error_too_long, maxUrlLength);
} else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment