Commit 57509a4d authored by Ella Ge's avatar Ella Ge Committed by Commit Bot

Fix typo in Quality Enforcement

It should be "Digital asset link".

TBR=peconn@chromium.org

Bug: 1109609
Change-Id: I59b5eb75493bdf884308ea98fcd7404ade060e29
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366285Reviewed-by: default avatarElla Ge <eirage@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Auto-Submit: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800199}
parent 19614829
......@@ -66,13 +66,13 @@ public class QualityEnforcer implements NativeInitObserver {
// Do not modify or reuse existing entries, they are used in a UMA histogram. Please also edit
// TrustedWebActivityQualityEnforcementViolationType in enums.xml if new value added.
@IntDef({ViolationType.ERROR_404, ViolationType.ERROR_5XX, ViolationType.UNAVAILABLE_OFFLINE,
ViolationType.DIGITAL_ASSERTLINKS})
ViolationType.DIGITAL_ASSETLINKS})
@Retention(RetentionPolicy.SOURCE)
public @interface ViolationType {
int ERROR_404 = 0;
int ERROR_5XX = 1;
int UNAVAILABLE_OFFLINE = 2;
int DIGITAL_ASSERTLINKS = 3;
int DIGITAL_ASSETLINKS = 3;
int NUM_ENTRIES = 4;
}
......@@ -129,7 +129,7 @@ public class QualityEnforcer implements NativeInitObserver {
String url = mIntentDataProvider.getUrlToLoad();
mVerifier.verify(url).then((verified) -> {
if (!verified) {
trigger(ViolationType.DIGITAL_ASSERTLINKS, mIntentDataProvider.getUrlToLoad(), 0);
trigger(ViolationType.DIGITAL_ASSETLINKS, mIntentDataProvider.getUrlToLoad(), 0);
}
});
}
......@@ -193,9 +193,9 @@ public class QualityEnforcer implements NativeInitObserver {
case ViolationType.UNAVAILABLE_OFFLINE:
return ContextUtils.getApplicationContext().getString(
R.string.twa_quality_enforcement_violation_offline, url);
case ViolationType.DIGITAL_ASSERTLINKS:
case ViolationType.DIGITAL_ASSETLINKS:
return ContextUtils.getApplicationContext().getString(
R.string.twa_quality_enforcement_violation_assert_link, url);
R.string.twa_quality_enforcement_violation_asset_link, url);
default:
return "";
}
......@@ -212,8 +212,8 @@ public class QualityEnforcer implements NativeInitObserver {
return httpStatusCode + " on " + url;
case ViolationType.UNAVAILABLE_OFFLINE:
return "Page unavailable offline: " + url;
case ViolationType.DIGITAL_ASSERTLINKS:
return "Digital assert links verification failed on " + url;
case ViolationType.DIGITAL_ASSETLINKS:
return "Digital asset links verification failed on " + url;
default:
return "";
}
......
......@@ -121,7 +121,7 @@ public class QualityEnforcerTest {
@Test
@MediumTest
public void notifiedDigitalAssertLinkFailed() throws TimeoutException {
public void notifiedDigitalAssetLinkFailed() throws TimeoutException {
launchNotVerify(mTestPage);
mCallbackHelper.waitForFirst();
}
......
......@@ -170,20 +170,20 @@ public class QualityEnforcerUnitTest {
}
@Test
public void notTrigger_digitalAssertLinkPass() {
public void notTrigger_digitalAssetLinkPass() {
when(mIntentDataProvider.getUrlToLoad()).thenReturn(TRUSTED_ORIGIN_PAGE);
mQualityEnforcer.onFinishNativeInitialization();
verifyNotTriggered();
}
@Test
public void trigger_digitalAssertLinkFailed() {
public void trigger_digitalAssetLinkFailed() {
when(mIntentDataProvider.getUrlToLoad()).thenReturn(UNTRUSTED_PAGE);
mQualityEnforcer.onFinishNativeInitialization();
Assert.assertEquals(
ContextUtils.getApplicationContext().getString(
R.string.twa_quality_enforcement_violation_assert_link, UNTRUSTED_PAGE),
R.string.twa_quality_enforcement_violation_asset_link, UNTRUSTED_PAGE),
ShadowToast.getTextOfLatestToast());
verifyNotifyClientApp();
}
......
......@@ -3378,8 +3378,8 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_TWA_QUALITY_ENFORCEMENT_VIOLATION_ERROR" desc="Text shown on a toast when TWA violation 404.">
<ph name="ERROR_CODE">%1$s<ex>404</ex></ph> on <ph name="VIOLATED_URL">%2$s<ex>https://example.com/</ex></ph>
</message>
<message name="IDS_TWA_QUALITY_ENFORCEMENT_VIOLATION_ASSERT_LINK" desc="Text shown on a toast when TWA violate the quality enforcement criteria: digital assert link verification failed.">
Digital assert links verification failed on <ph name="VIOLATED_URL">%1$s<ex>https://example.com/</ex></ph>
<message name="IDS_TWA_QUALITY_ENFORCEMENT_VIOLATION_ASSET_LINK" desc="Text shown on a toast when TWA violate the quality enforcement criteria: digital asset link verification failed.">
Digital asset links verification failed on <ph name="VIOLATED_URL">%1$s<ex>https://example.com/</ex></ph>
</message>
<message name="IDS_TWA_QUALITY_ENFORCEMENT_VIOLATION_OFFLINE" desc="Text shown on a toast when TWA violate the quality enforcement criteria: page unavailable offline.">
Page unavailable offline: <ph name="VIOLATED_URL">%1$s<ex>https://example.com/</ex></ph>
......
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