Prepare App Store 1.0 build 4

crates/storage/src/mobile_watch.rs

@@ -229,7 +229,10 @@ impl WatchSnapshotReceiver {
             }
         };
         let mut pairing_changed = false;
-        if let Some(accepted) = self.accepted {
+        // A valid revocation can only remove secrets, so it must survive a sender reset.
+        if !snapshot.is_revocation()
+            && let Some(accepted) = self.accepted
+        {
             if snapshot.revision < accepted.revision {
                 return Ok(WatchSnapshotApply::Stale);
             } else if snapshot.revision == accepted.revision {
@@ -249,10 +252,10 @@ impl WatchSnapshotReceiver {
             revision: snapshot.revision,
             digest: snapshot.digest,
         };
-        let result = if pairing_changed {
-            WatchSnapshotApply::PairingChanged
-        } else if snapshot.is_revocation() {
+        let result = if snapshot.is_revocation() {
             WatchSnapshotApply::Revoked
+        } else if pairing_changed {
+            WatchSnapshotApply::PairingChanged
         } else {
             WatchSnapshotApply::Replaced
         };