Pushhelper: Was generating tons of debug output for nothing

New style for the connectro icon: Exclamation mark during network reconnect. Prepare busy property New property enabled for the channel toolbar
ubports · Mar 10, 2018 · b5ec5f5 · b5ec5f5
1 parent 4b5fbeb
commit b5ec5f5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/telegram/app/qml/AccountPage.qml b/telegram/app/qml/AccountPage.qml
@@ -275,7 +275,7 @@ Page {
         extension: profiles.count > 1 ? sections : null
         trailingActionBar.actions: Action {
             visible: !telegram.connected || !Connectivity.online
-            iconName: !Connectivity.online? "sync-paused" : !telegram.connected? "sync-updating" : "ok"
+            iconName: telegram.busy? "sync-updating" : !telegram.connected? "sync-error" : "sync-paused"
         }
     }
 

diff --git a/telegram/app/qml/AccountSendMessage.qml b/telegram/app/qml/AccountSendMessage.qml
@@ -28,7 +28,7 @@ Rectangle {
     property int dialogId: isChannel ? currentDialog.peer.channelId : isChat ? currentDialog.peer.chatId : currentDialog.peer.userId
     property bool isMuted: telegramObject.userData.isMuted(dialogId)
 
-    property bool channelToolbar: isChannel && !chat.megaGroup && false //need to replace 'false' with the property saying if you can write messages to the channel or not
+    property bool channelToolbar: isChannel && !chat.megaGroup && !(chat.isCreator || chat.isEditor || chat.isModerator)
 
     signal accepted( string text, int inReplyTo )
     signal copyRequest()

diff --git a/telegram/app/qml/components/TelegramHeader.qml b/telegram/app/qml/components/TelegramHeader.qml
@@ -144,10 +144,10 @@ PageHeader {
         Rectangle {
             id: connectingIndicator
             anchors.fill: headerImage
-            visible: isConnecting || !Connectivity.online
+            visible: isConnecting || !Connectivity.online || telegram.busy
             color: "white"
             Icon {
-                name: isConnecting? "sync-updating" : "sync-paused"
+                name: telegram.busy? "sync-updating" : isConnecting? "sync-error" : "sync-paused"
                 anchors.fill: parent
             }
             SequentialAnimation {

diff --git a/telegram/push/pushhelper.cpp b/telegram/push/pushhelper.cpp
@@ -84,6 +84,11 @@ QJsonObject PushHelper::pushToPostalMessage(const QJsonObject &push, QString &ta
     if (message.keys().contains("loc_key")) {
         key = message["loc_key"].toString();    // no-i18n
     }
+
+    //Early bail-out: Telegram server just removes notification, message has been read elsewhere
+    if (key == "")
+        return QJsonObject();
+
     QJsonArray args;
     if (message.keys().contains("loc_args")) {
         args = message["loc_args"].toArray();   // no-i18n