From 80bb10e017a9f501d57226404d9adad458e0460f Mon Sep 17 00:00:00 2001
From: James Willcox <snorp@snorp.net>
Date: Thu, 12 Mar 2015 15:21:43 -0500
Subject: [PATCH] Bug 1142459 - Fix mixed content shield notification broke by
 bug 1140830 r=rnewman

---
 mobile/android/base/SiteIdentity.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mobile/android/base/SiteIdentity.java b/mobile/android/base/SiteIdentity.java
index 3b997465a218..b4553c59099b 100644
--- a/mobile/android/base/SiteIdentity.java
+++ b/mobile/android/base/SiteIdentity.java
@@ -122,13 +122,17 @@ public class SiteIdentity {
         reset();
     }
 
-    public void reset() {
+    public void resetIdentity() {
         mSecurityMode = SecurityMode.UNKNOWN;
         mHost = null;
         mOwner = null;
         mSupplemental = null;
         mVerifier = null;
         mEncrypted = null;
+    }
+
+    public void reset() {
+        resetIdentity();
         mMixedMode = MixedMode.UNKNOWN;
         mTrackingMode = TrackingMode.UNKNOWN;
     }
@@ -157,7 +161,7 @@ public class SiteIdentity {
             try {
                 mSecurityMode = SecurityMode.fromString(mode.getString("identity"));
             } catch (Exception e) {
-                reset();
+                resetIdentity();
                 return;
             }
 
@@ -168,12 +172,10 @@ public class SiteIdentity {
                 mVerifier = identityData.getString("verifier");
                 mEncrypted = identityData.getString("encrypted");
             } catch (Exception e) {
-                reset();
+                resetIdentity();
             }
         } catch (Exception e) {
             reset();
-            mMixedMode = MixedMode.UNKNOWN;
-            mTrackingMode = TrackingMode.UNKNOWN;
         }
     }