Merge branch 'e2ee'

- Support for e2ee rooms
- Implement categories & file logging
- Let the user know when the app can't reach the server (#93)

fixes #13
fixes #326

1 files changed, 10 insertions, 5 deletions

diff --git a/include/timeline/TimelineItem.h b/include/timeline/TimelineItem.h

index 9997ec1d..f055f217 100644
--- a/include/timeline/TimelineItem.h
+++ b/include/timeline/TimelineItem.h
@@ -193,16 +193,17 @@ public:
         QString eventId() const { return event_id_; }
         void setEventId(const QString &event_id) { event_id_ = event_id; }
         void markReceived();
+        bool isReceived() { return isReceived_; };
         void setRoomId(QString room_id) { room_id_ = room_id; }
-        void sendReadReceipt() const
-        {
-                if (!event_id_.isEmpty())
-                        http::client()->readEvent(room_id_, event_id_);
-        }
+        void sendReadReceipt() const;
 
         //! Add a user avatar for this event.
         void addAvatar();
 
+signals:
+        void eventRedacted(const QString &event_id);
+        void redactionFailed(const QString &msg);
+
 protected:
         void paintEvent(QPaintEvent *event) override;
         void contextMenuEvent(QContextMenuEvent *event) override;
@@ -225,6 +226,10 @@ private:
         void setupAvatarLayout(const QString &userName);
         void setupSimpleLayout();
 
+        //! Whether or not the event associated with the widget
+        //! has been acknowledged by the server.
+        bool isReceived_ = false;
+
         QString replaceEmoji(const QString &body);
         QString event_id_;
         QString room_id_;