Bug 409908: don't decrypt cleartext. Also, fix broken checkStatus calls when resetting server data.

services/sync/modules/crypto.js

@@ -183,6 +183,7 @@ WeaveCrypto.prototype = {
       switch (algorithm) {
       case "none":
         ret = data;
+        break;
       case "XXTEA":
       case "XXXTEA": // Weave 0.1.12.10 and below had this typo
         this._log.debug("Decrypting data");

services/sync/modules/engines.js

@@ -149,9 +149,12 @@ Engine.prototype = {
       this._dav.unlock.async(this._dav, cont);
       let unlocked = yield;
 
-      checkStatus(statusResp.status, "Could not delete status file.", true);
-      checkStatus(snapshotResp.status, "Could not delete snapshot file.", true);
-      checkStatus(deltasResp.status, "Could not delete deltas file.", true);
+      this._checkStatus(statusResp.status,
+                        "Could not delete status file.", true);
+      this._checkStatus(snapshotResp.status,
+                        "Could not delete snapshot file.", true);
+      this._checkStatus(deltasResp.status,
+                        "Could not delete deltas file.", true);
 
       this._log.debug("Server files deleted");
       done = true;