Bug 1395557 - Show the right icon for mixed passive mode in Custom Tabs r=esawin draft
authorJames Willcox <snorp@snorp.net>
Wed, 13 Sep 2017 12:25:00 -0500
changeset 664067 c1dd4dd9c2de3a11d92db82f2b41fb363e34ae8e
parent 664066 9c22d53d011aa5c9b93824aea5af68361d3d67b1
child 731364 ff5c64b3822a7a69e89dbde4d9913c6e7227697a
push id79613
push userbmo:snorp@snorp.net
push dateWed, 13 Sep 2017 17:46:58 +0000
reviewersesawin
bugs1395557
milestone57.0a1
Bug 1395557 - Show the right icon for mixed passive mode in Custom Tabs r=esawin MozReview-Commit-ID: GHXVl3BNW9Q
mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java
--- a/mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java
+++ b/mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java
@@ -208,16 +208,21 @@ public class ActionBarPresenter {
             mIconView.setVisibility(View.INVISIBLE);
         } else {
             SecurityModeUtil.IconType icon;
             if ("unknown".equals(security.securityMode)) {
                 icon = SecurityModeUtil.IconType.UNKNOWN;
             } else {
                 icon = SecurityModeUtil.IconType.LOCK_SECURE;
             }
+
+            if ("loaded".equals(security.mixedModePassive)) {
+                icon = SecurityModeUtil.IconType.WARNING;
+            }
+
             mIconView.setVisibility(View.VISIBLE);
             mIconView.setImageLevel(SecurityModeUtil.getImageLevel(icon));
             mIdentityPopup.setSecurityInformation(security);
 
             if (icon == SecurityModeUtil.IconType.LOCK_SECURE) {
                 // Lock-Secure is a special case. Keep its original green color.
                 DrawableCompat.setTintList(mIconView.getDrawable(), null);
             } else {