From c8c0044815e6669813d1dc1bae6b826795a467c4 Mon Sep 17 00:00:00 2001 From: Sebastian Wolf Date: Sun, 15 Nov 2020 23:29:04 +0100 Subject: [PATCH] Display all error messages (let's see how it works...) --- qml/pages/AboutPage.qml | 2 +- qml/pages/ChatPage.qml | 7 +++++++ qml/pages/OverviewPage.qml | 2 ++ rpm/harbour-fernschreiber.spec | 2 +- rpm/harbour-fernschreiber.yaml | 2 +- src/tdlibwrapper.cpp | 2 +- translations/harbour-fernschreiber-de.ts | 4 ++++ translations/harbour-fernschreiber-en.ts | 4 ++++ translations/harbour-fernschreiber-es.ts | 4 ++++ translations/harbour-fernschreiber-fi.ts | 4 ++++ translations/harbour-fernschreiber-hu.ts | 4 ++++ translations/harbour-fernschreiber-it.ts | 4 ++++ translations/harbour-fernschreiber-pl.ts | 4 ++++ translations/harbour-fernschreiber-ru.ts | 4 ++++ translations/harbour-fernschreiber-sv.ts | 4 ++++ translations/harbour-fernschreiber-zh_CN.ts | 4 ++++ translations/harbour-fernschreiber.ts | 4 ++++ 17 files changed, 57 insertions(+), 4 deletions(-) diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 47894cc..aebf817 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -59,7 +59,7 @@ Page { } Label { - text: "Fernschreiber 0.4.1" + text: "Fernschreiber 0.5" horizontalAlignment: Text.AlignHCenter font.pixelSize: Theme.fontSizeExtraLarge anchors { diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml index 5b62c68..4612588 100644 --- a/qml/pages/ChatPage.qml +++ b/qml/pages/ChatPage.qml @@ -340,6 +340,13 @@ Page { onEmojiSearchSuccessful: { chatPage.emojiProposals = result; } + onErrorReceived: { + if (message === "USER_ALREADY_PARTICIPANT") { + appNotification.show(qsTr("You are already a member of this chat.")); + } else { + appNotification.show(message); + } + } } Connections { diff --git a/qml/pages/OverviewPage.qml b/qml/pages/OverviewPage.qml index b47d0f8..7a726b0 100644 --- a/qml/pages/OverviewPage.qml +++ b/qml/pages/OverviewPage.qml @@ -162,6 +162,8 @@ Page { onErrorReceived: { if (message === "USER_ALREADY_PARTICIPANT") { appNotification.show(qsTr("You are already a member of this chat.")); + } else { + appNotification.show(message); } } } diff --git a/rpm/harbour-fernschreiber.spec b/rpm/harbour-fernschreiber.spec index a60b21d..d5bda86 100644 --- a/rpm/harbour-fernschreiber.spec +++ b/rpm/harbour-fernschreiber.spec @@ -11,7 +11,7 @@ Name: harbour-fernschreiber # << macros Summary: Fernschreiber is a Telegram client for Sailfish OS -Version: 0.4.1 +Version: 0.5 Release: 1 Group: Qt/Qt License: LICENSE diff --git a/rpm/harbour-fernschreiber.yaml b/rpm/harbour-fernschreiber.yaml index 91df683..dc84359 100644 --- a/rpm/harbour-fernschreiber.yaml +++ b/rpm/harbour-fernschreiber.yaml @@ -1,6 +1,6 @@ Name: harbour-fernschreiber Summary: Fernschreiber is a Telegram client for Sailfish OS -Version: 0.4.1 +Version: 0.5 Release: 1 # The contents of the Group field should be one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS diff --git a/src/tdlibwrapper.cpp b/src/tdlibwrapper.cpp index e736d06..4ab4ea7 100644 --- a/src/tdlibwrapper.cpp +++ b/src/tdlibwrapper.cpp @@ -1129,7 +1129,7 @@ void TDLibWrapper::setInitialParameters() QSettings hardwareSettings("/etc/hw-release", QSettings::NativeFormat); initialParameters.insert("device_model", hardwareSettings.value("NAME", "Unknown Mobile Device").toString()); initialParameters.insert("system_version", QSysInfo::prettyProductName()); - initialParameters.insert("application_version", "0.4.1"); + initialParameters.insert("application_version", "0.5"); // initialParameters.insert("use_test_dc", true); requestObject.insert("parameters", initialParameters); this->sendRequest(requestObject); diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts index e171b9d..efd3373 100644 --- a/translations/harbour-fernschreiber-de.ts +++ b/translations/harbour-fernschreiber-de.ts @@ -347,6 +347,10 @@ %n Nachrichten weiterleiten + + You are already a member of this chat. + Sie sind bereits Mitglied dieses Chats. + ChatSelectionPage diff --git a/translations/harbour-fernschreiber-en.ts b/translations/harbour-fernschreiber-en.ts index 128a39f..ba48ac2 100644 --- a/translations/harbour-fernschreiber-en.ts +++ b/translations/harbour-fernschreiber-en.ts @@ -347,6 +347,10 @@ Forward %n messages + + You are already a member of this chat. + You are already a member of this chat. + ChatSelectionPage diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts index 71b74a4..f7e57d9 100644 --- a/translations/harbour-fernschreiber-es.ts +++ b/translations/harbour-fernschreiber-es.ts @@ -343,6 +343,10 @@ + + You are already a member of this chat. + Ya eres miembro de este grupo. + ChatSelectionPage diff --git a/translations/harbour-fernschreiber-fi.ts b/translations/harbour-fernschreiber-fi.ts index 242b0cf..7a41c88 100644 --- a/translations/harbour-fernschreiber-fi.ts +++ b/translations/harbour-fernschreiber-fi.ts @@ -347,6 +347,10 @@ + + You are already a member of this chat. + Olet jo tämän ryhmän jäsen. + ChatSelectionPage diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts index c21807c..b6f24dc 100644 --- a/translations/harbour-fernschreiber-hu.ts +++ b/translations/harbour-fernschreiber-hu.ts @@ -343,6 +343,10 @@ + + You are already a member of this chat. + + ChatSelectionPage diff --git a/translations/harbour-fernschreiber-it.ts b/translations/harbour-fernschreiber-it.ts index 8253169..034942d 100644 --- a/translations/harbour-fernschreiber-it.ts +++ b/translations/harbour-fernschreiber-it.ts @@ -347,6 +347,10 @@ + + You are already a member of this chat. + Sei già membro di questa chat. + ChatSelectionPage diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts index d5f4697..a5663d3 100644 --- a/translations/harbour-fernschreiber-pl.ts +++ b/translations/harbour-fernschreiber-pl.ts @@ -351,6 +351,10 @@ + + You are already a member of this chat. + + ChatSelectionPage diff --git a/translations/harbour-fernschreiber-ru.ts b/translations/harbour-fernschreiber-ru.ts index 9fb40ef..4792b55 100644 --- a/translations/harbour-fernschreiber-ru.ts +++ b/translations/harbour-fernschreiber-ru.ts @@ -351,6 +351,10 @@ + + You are already a member of this chat. + Вы уже в этом чате. + ChatSelectionPage diff --git a/translations/harbour-fernschreiber-sv.ts b/translations/harbour-fernschreiber-sv.ts index 4b704b7..e75beaa 100644 --- a/translations/harbour-fernschreiber-sv.ts +++ b/translations/harbour-fernschreiber-sv.ts @@ -347,6 +347,10 @@ + + You are already a member of this chat. + Du är redan medlem i den här chatten. + ChatSelectionPage diff --git a/translations/harbour-fernschreiber-zh_CN.ts b/translations/harbour-fernschreiber-zh_CN.ts index 78d7364..32940a5 100644 --- a/translations/harbour-fernschreiber-zh_CN.ts +++ b/translations/harbour-fernschreiber-zh_CN.ts @@ -343,6 +343,10 @@ + + You are already a member of this chat. + 你已是此对话的成员。 + ChatSelectionPage diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts index 31d5a90..72ffe9e 100644 --- a/translations/harbour-fernschreiber.ts +++ b/translations/harbour-fernschreiber.ts @@ -343,6 +343,10 @@ + + You are already a member of this chat. + + ChatSelectionPage