From 6283b200fb629c04990f09d58092482fa81f2808 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 23 Jun 2016 13:21:55 +0100
Subject: [PATCH] Remove /encrypt command

Now that we have the room setting to enable encryption, the /encrypt command is
not only redundant, but confusing, since it's in conflict with the room
setting.
---
 src/SlashCommands.js | 22 +---------------------
 src/encryption.js    | 38 --------------------------------------
 2 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 src/encryption.js

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index d4e63018d3..759a95c8ff 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -17,7 +17,6 @@ limitations under the License.
 var MatrixClientPeg = require("./MatrixClientPeg");
 var MatrixTools = require("./MatrixTools");
 var dis = require("./dispatcher");
-var encryption = require("./encryption");
 var Tinter = require("./Tinter");
 
 
@@ -82,32 +81,13 @@ var commands = {
                 return success(
                     MatrixClientPeg.get().setRoomAccountData(
                         room_id, "org.matrix.room.color_scheme", colorScheme
-                    )                    
+                    )
                 );
             }
         }
         return reject(this.getUsage());
     }),
 
-    encrypt: new Command("encrypt", "<on|off>", function(room_id, args) {
-        if (args == "on") {
-            var client = MatrixClientPeg.get();
-            var members = client.getRoom(room_id).currentState.members;
-            var user_ids = Object.keys(members);
-            return success(
-                encryption.enableEncryption(client, room_id, user_ids)
-            );
-        }
-        if (args == "off") {
-            var client = MatrixClientPeg.get();
-            return success(
-                encryption.disableEncryption(client, room_id)
-            );
-
-        }
-        return reject(this.getUsage());
-    }),
-
     // Change the room topic
     topic: new Command("topic", "<topic>", function(room_id, args) {
         if (args) {
diff --git a/src/encryption.js b/src/encryption.js
deleted file mode 100644
index cbe92d36de..0000000000
--- a/src/encryption.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-function enableEncyption(client, roomId, members) {
-    members = members.slice(0);
-    members.push(client.credentials.userId);
-    // TODO: Check the keys actually match what keys the user has.
-    // TODO: Don't redownload keys each time.
-    return client.downloadKeys(members, "forceDownload").then(function(res) {
-        return client.setRoomEncryption(roomId, {
-            algorithm: "m.olm.v1.curve25519-aes-sha2",
-            members: members,
-        });
-    })
-}
-
-function disableEncryption(client, roomId) {
-    return client.disableRoomEncryption(roomId);
-}
-
-
-module.exports = {
-    enableEncryption: enableEncyption,
-    disableEncryption: disableEncryption,
-}