From 1899d61893de17e4861671f0c9d547cc836ece65 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 15 Sep 2016 17:01:02 +0100
Subject: [PATCH] textual event for m.room.encryption

---
 src/TextForEvent.js                     | 24 +++++++++++++++---------
 src/components/views/rooms/EventTile.js |  1 +
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index f32d1a7132..2ffd33167f 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -101,19 +101,19 @@ function textForMemberEvent(ev) {
                 return targetName + " left the room.";
             }
     }
-};
+}
 
 function textForTopicEvent(ev) {
     var senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
 
     return senderDisplayName + ' changed the topic to "' + ev.getContent().topic + '"';
-};
+}
 
 function textForRoomNameEvent(ev) {
     var senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
 
     return senderDisplayName + ' changed the room name to "' + ev.getContent().name + '"';
-};
+}
 
 function textForMessageEvent(ev) {
     var senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
@@ -125,19 +125,19 @@ function textForMessageEvent(ev) {
         message = senderDisplayName + " sent an image.";
     }
     return message;
-};
+}
 
 function textForCallAnswerEvent(event) {
     var senderName = event.sender ? event.sender.name : "Someone";
     var supported = MatrixClientPeg.get().supportsVoip() ? "" : " (not supported by this browser)";
     return senderName + " answered the call." + supported;
-};
+}
 
 function textForCallHangupEvent(event) {
     var senderName = event.sender ? event.sender.name : "Someone";
     var supported = MatrixClientPeg.get().supportsVoip() ? "" : " (not supported by this browser)";
     return senderName + " ended the call." + supported;
-};
+}
 
 function textForCallInviteEvent(event) {
     var senderName = event.sender ? event.sender.name : "Someone";
@@ -149,13 +149,13 @@ function textForCallInviteEvent(event) {
     }
     var supported = MatrixClientPeg.get().supportsVoip() ? "" : " (not supported by this browser)";
     return senderName + " placed a " + type + " call." + supported;
-};
+}
 
 function textForThreePidInviteEvent(event) {
     var senderName = event.sender ? event.sender.name : event.getSender();
     return senderName + " sent an invitation to " + event.getContent().display_name +
      " to join the room.";
-};
+}
 
 function textForHistoryVisibilityEvent(event) {
     var senderName = event.sender ? event.sender.name : event.getSender();
@@ -177,7 +177,12 @@ function textForHistoryVisibilityEvent(event) {
         text += " unknown (" + vis + ")";
     }
     return text;
-};
+}
+
+function textForEncryptionEvent(event) {
+    var senderName = event.sender ? event.sender.name : event.getSender();
+    return senderName + " turned on end-to-end encryption (algorithm " + event.getContent().algorithm + ")";
+}
 
 var handlers = {
     'm.room.message': textForMessageEvent,
@@ -189,6 +194,7 @@ var handlers = {
     'm.call.hangup':  textForCallHangupEvent,
     'm.room.third_party_invite': textForThreePidInviteEvent,
     'm.room.history_visibility': textForHistoryVisibilityEvent,
+    'm.room.encryption': textForEncryptionEvent,
 };
 
 module.exports = {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 1efd46b94f..907b28d9a5 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -47,6 +47,7 @@ var eventTileTypes = {
     'm.room.topic'  : 'messages.TextualEvent',
     'm.room.third_party_invite' : 'messages.TextualEvent',
     'm.room.history_visibility' : 'messages.TextualEvent',
+    'm.room.encryption' : 'messages.TextualEvent',
 };
 
 var MAX_READ_AVATARS = 5;