Merge branch 'xenial'

ubports · Mar 10, 2018 · 0b661d3 · 0b661d3
2 parents fc22c25 + b47cb63
commit 0b661d3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/telegram/push/pushhelper.cpp b/telegram/push/pushhelper.cpp
@@ -85,10 +85,6 @@ QJsonObject PushHelper::pushToPostalMessage(const QJsonObject &push, QString &ta
         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
@@ -104,6 +100,10 @@ QJsonObject PushHelper::pushToPostalMessage(const QJsonObject &push, QString &ta
         tag = custom["channel_id"].toString();
     }
 
+    //Early bail-out: Telegram server just removes notification, message has been read elsewhere
+    if (key == "")
+        return QJsonObject();
+
     qint64 chatId = tag.toInt();
 
     // TRANSLATORS: Application name.