3 files changed, 26 insertions, 2 deletions

diff --git a/connection.cpp b/connection.cpp
index ee719b40..2d7235b9 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -791,8 +791,8 @@ void Connection::setHomeserver(const QUrl& url)
     emit homeserverChanged(homeserver());
 }
 
-static constexpr int CACHE_VERSION_MAJOR = 6;
-static constexpr int CACHE_VERSION_MINOR = 1;
+static constexpr int CACHE_VERSION_MAJOR = 7;
+static constexpr int CACHE_VERSION_MINOR = 0;
 
 void Connection::saveState(const QUrl &toFile) const
 {
diff --git a/room.cpp b/room.cpp
index 9dec2b4a..25669889 100644
--- a/room.cpp
+++ b/room.cpp
@@ -94,6 +94,7 @@ class Room::Private
         QString name;
         QString displayname;
         QString topic;
+        QString encryptionAlgorithm;
         Avatar avatar;
         JoinState joinState;
         int highlightCount = 0;
@@ -883,6 +884,11 @@ int Room::timelineSize() const
     return int(d->timeline.size());
 }
 
+bool Room::usesEncryption() const
+{
+    return !d->encryptionAlgorithm.isEmpty();
+}
+
 void Room::Private::insertMemberIntoMap(User *u)
 {
     const auto userName = u->name(q);
@@ -1066,6 +1072,11 @@ void Room::postMessage(const QString& plainText, MessageEventType type)
 
 void Room::postMessage(const RoomMessageEvent& event)
 {
+    if (usesEncryption())
+    {
+        qCCritical(MAIN) << "Room" << displayName()
+            << "enforces encryption; sending encrypted messages is not supported yet";
+    }
     connection()->callApi<SendEventJob>(id(), event);
 }
 
@@ -1509,6 +1520,14 @@ void Room::processStateEvents(const RoomEvents& events)
                 }
                 break;
             }
+            case EventType::RoomEncryption:
+            {
+                d->encryptionAlgorithm =
+                        static_cast<EncryptionEvent*>(event)->algorithm();
+                qCDebug(MAIN) << "Encryption switched on in" << displayName();
+                emit encryption();
+                break;
+            }
             default: /* Ignore events of other types */;
         }
     }
@@ -1759,6 +1778,8 @@ QJsonObject Room::Private::toJson() const
                         QJsonArray::fromStringList(aliases));
         ADD_STATE_EVENT(stateEvents, "m.room.canonical_alias", "alias",
                         canonicalAlias);
+        ADD_STATE_EVENT(stateEvents, "m.room.encryption", "algorithm",
+                        encryptionAlgorithm);
 
         for (const auto *m : membersMap)
             appendStateEvent(stateEvents, QStringLiteral("m.room.member"),
diff --git a/room.h b/room.h
index 015e9dfc..bdef04ee 100644
--- a/room.h
+++ b/room.h
@@ -103,6 +103,7 @@ namespace QMatrixClient
             Q_PROPERTY(QString topic READ topic NOTIFY topicChanged)
             Q_PROPERTY(QString avatarMediaId READ avatarMediaId NOTIFY avatarChanged STORED false)
             Q_PROPERTY(QUrl avatarUrl READ avatarUrl NOTIFY avatarChanged)
+            Q_PROPERTY(bool usesEncryption READ usesEncryption NOTIFY encryption)
 
             Q_PROPERTY(int timelineSize READ timelineSize NOTIFY addedMessages)
             Q_PROPERTY(QStringList memberNames READ memberNames NOTIFY memberListChanged)
@@ -145,6 +146,7 @@ namespace QMatrixClient
             QStringList memberNames() const;
             int memberCount() const;
             int timelineSize() const;
+            bool usesEncryption() const;
 
             /**
              * Returns a square room avatar with the given size and requests it
@@ -360,6 +362,7 @@ namespace QMatrixClient
             void memberAboutToRename(User* user, QString newName);
             void memberRenamed(User* user);
             void memberListChanged();
+            void encryption();
 
             void joinStateChanged(JoinState oldState, JoinState newState);
             void typingChanged();