corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1102537 - Remove "which is run by *unknown*" block from non-EV site identity message. r=mcomella

Browse Source
This commit is contained in:
Margaret Leibovic
2014-11-26 10:57:09 -08:00
parent 1d170fa981
commit a94e1a2b02
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/SiteIdentity.java
View File

@@ -159,7 +159,7 @@ public class SiteIdentity {
try { try {
mHost = identityData.getString("host"); mHost = identityData.getString("host");
mOwner = identityData.getString("owner"); mOwner = identityData.optString("owner", null);
mSupplemental = identityData.optString("supplemental", null); mSupplemental = identityData.optString("supplemental", null);
mVerifier = identityData.getString("verifier"); mVerifier = identityData.getString("verifier");
mEncrypted = identityData.getString("encrypted"); mEncrypted = identityData.getString("encrypted");

3
mobile/android/base/resources/layout/site_identity.xml
View File

@@ -39,7 +39,8 @@
android:textColor="@color/doorhanger_text" android:textColor="@color/doorhanger_text"
android:textStyle="bold"/> android:textStyle="bold"/>
<TextView android:layout_width="wrap_content" <TextView android:id="@+id/owner_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:textSize="14sp"
android:textColor="@color/doorhanger_text" android:textColor="@color/doorhanger_text"

9
mobile/android/base/toolbar/SiteIdentityPopup.java
View File

@@ -49,6 +49,7 @@ public class SiteIdentityPopup extends ArrowPopup {
private LinearLayout mIdentityUnknownContainer; private LinearLayout mIdentityUnknownContainer;
private TextView mHost; private TextView mHost;
private TextView mOwnerLabel;
private TextView mOwner; private TextView mOwner;
private TextView mVerifier; private TextView mVerifier;
@@ -81,6 +82,7 @@ public class SiteIdentityPopup extends ArrowPopup {
(LinearLayout) mIdentity.findViewById(R.id.site_identity_unknown_container); (LinearLayout) mIdentity.findViewById(R.id.site_identity_unknown_container);
mHost = (TextView) mIdentityKnownContainer.findViewById(R.id.host); mHost = (TextView) mIdentityKnownContainer.findViewById(R.id.host);
mOwnerLabel = (TextView) mIdentityKnownContainer.findViewById(R.id.owner_label);
mOwner = (TextView) mIdentityKnownContainer.findViewById(R.id.owner); mOwner = (TextView) mIdentityKnownContainer.findViewById(R.id.owner);
mVerifier = (TextView) mIdentityKnownContainer.findViewById(R.id.verifier); mVerifier = (TextView) mIdentityKnownContainer.findViewById(R.id.verifier);
} }
@@ -126,6 +128,12 @@ public class SiteIdentityPopup extends ArrowPopup {
mHost.setText(siteIdentity.getHost()); mHost.setText(siteIdentity.getHost());
String owner = siteIdentity.getOwner(); String owner = siteIdentity.getOwner();
if (owner == null) {
mOwnerLabel.setVisibility(View.GONE);
mOwner.setVisibility(View.GONE);
} else {
mOwnerLabel.setVisibility(View.VISIBLE);
mOwner.setVisibility(View.VISIBLE);
// Supplemental data is optional. // Supplemental data is optional.
final String supplemental = siteIdentity.getSupplemental(); final String supplemental = siteIdentity.getSupplemental();
@@ -133,6 +141,7 @@ public class SiteIdentityPopup extends ArrowPopup {
owner += "\n" + supplemental; owner += "\n" + supplemental;
} }
mOwner.setText(owner); mOwner.setText(owner);
}
final String verifier = siteIdentity.getVerifier(); final String verifier = siteIdentity.getVerifier();
final String encrypted = siteIdentity.getEncrypted(); final String encrypted = siteIdentity.getEncrypted();

3
mobile/android/chrome/content/browser.js
View File

@@ -6815,9 +6815,6 @@ var IdentityHandler = {
return result; return result;
} }
// Otherwise, we don't know the cert owner
result.owner = Strings.browser.GetStringFromName("identity.ownerUnknown3");
// Cache the override service the first time we need to check it // Cache the override service the first time we need to check it
if (!this._overrideService) if (!this._overrideService)
this._overrideService = Cc["@mozilla.org/security/certoverride;1"].getService(Ci.nsICertOverrideService); this._overrideService = Cc["@mozilla.org/security/certoverride;1"].getService(Ci.nsICertOverrideService);

1
mobile/android/locales/en-US/chrome/browser.properties
View File

@@ -91,7 +91,6 @@ identity.identified.verified_by_you=You have added a security exception for this
identity.identified.state_and_country=%S, %S identity.identified.state_and_country=%S, %S
identity.identified.title_with_country=%S (%S) identity.identified.title_with_country=%S (%S)
identity.encrypted2=Encrypted identity.encrypted2=Encrypted
identity.ownerUnknown3=unknown
# Geolocation UI # Geolocation UI
geolocation.allow=Share geolocation.allow=Share