Revert "Migrate encryption state on room upgrade (#4411)"

hawkowl · web-flow · commit ae311bc6f674 · 2019-01-21T21:17:01.000+11:00
This reverts commit 702c4b7.
diff --git a/changelog.d/4411.bugfix b/changelog.d/4411.bugfix
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
@@ -68,7 +68,6 @@ class EventTypes(object):
     Aliases = "m.room.aliases"
     Redaction = "m.room.redaction"
     ThirdPartyInvite = "m.room.third_party_invite"
-    Encryption = "m.room.encryption"
 
     RoomHistoryVisibility = "m.room.history_visibility"
     CanonicalAlias = "m.room.canonical_alias"
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
@@ -269,7 +269,6 @@ def clone_exiting_room(
             (EventTypes.RoomHistoryVisibility, ""),
             (EventTypes.GuestAccess, ""),
             (EventTypes.RoomAvatar, ""),
-            (EventTypes.Encryption, ""),
         )
 
         old_room_state_ids = yield self.store.get_filtered_current_state_ids(

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,6 @@ def clone_exiting_room(`
`269`	`269`	`(EventTypes.RoomHistoryVisibility, ""),`
`270`	`270`	`(EventTypes.GuestAccess, ""),`
`271`	`271`	`(EventTypes.RoomAvatar, ""),`
`272`		`- (EventTypes.Encryption, ""),`
`273`	`272`	`)`
`274`	`273`
`275`	`274`	`old_room_state_ids = yield self.store.get_filtered_current_state_ids(`