diff --git a/README.md b/README.md
index c3d75f8..e36724e 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,19 @@ A Telegram client for Sailfish OS
## Author
Sebastian J. Wolf [sebastian@ygriega.de](mailto:sebastian@ygriega.de)
+## Contributions
+
+Fernschreiber wouldn't be the same without all the people helping in making it better. Thank you very much to all contributors!
+
+### Code (Features, Bugfixes, Optimizations etc.)
+- Chat list model, TDLib receiver, project dependencies: [Slava Monich](https://github.com/monich)
+
+### Translations
+- Chinese: [dashinfantry](https://github.com/dashinfantry)
+- Hungarian [edp17](https://github.com/edp17)
+- Polish: [atlochowski](https://github.com/atlochowski)
+- Spanish: [GNUuser](https://github.com/GNUuser)
+
## License
Licensed under GNU GPLv3
@@ -28,7 +41,4 @@ This project uses
- Emoji parsing and artwork by [Twitter Emoji (Twemoji)](http://twitter.github.io/twemoji/), copyright 2018 Twitter, Inc and other contributors, Code licensed under the [MIT License](http://opensource.org/licenses/MIT), Graphics licensed under [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/)
Fernschreiber was translated to several languages. Thanks to all contributors!
-- Chinese: [dashinfantry](https://github.com/dashinfantry)
-- Hungarian [edp17](https://github.com/edp17)
-- Polish: [atlochowski](https://github.com/atlochowski)
-- Spanish: [GNUuser](https://github.com/GNUuser)
+
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
index e3d7be7..83f4b33 100644
--- a/qml/pages/AboutPage.qml
+++ b/qml/pages/AboutPage.qml
@@ -77,8 +77,13 @@ Page {
}
Label {
- text: qsTr("By Sebastian J. Wolf")
+ text: qsTr("By Sebastian J. Wolf and other contributors")
font.pixelSize: Theme.fontSizeSmall
+ width: parent.width - ( 2 * Theme.horizontalPageMargin )
+ horizontalAlignment: Text.AlignHCenter
+ wrapMode: Text.Wrap
+ linkColor: Theme.highlightColor
+ onLinkActivated: Qt.openUrlExternally(link)
anchors {
horizontalCenter: parent.horizontalCenter
}
diff --git a/src/chatlistmodel.cpp b/src/chatlistmodel.cpp
index f6e5de6..12e18b0 100644
--- a/src/chatlistmodel.cpp
+++ b/src/chatlistmodel.cpp
@@ -77,14 +77,14 @@ bool ChatListModel::ChatData::setOrder(const QString &newOrder)
ChatListModel::ChatListModel(TDLibWrapper *tdLibWrapper)
{
- tdLibWrapper = tdLibWrapper;
- connect(tdLibWrapper, SIGNAL(newChatDiscovered(QString,QVariantMap)), this, SLOT(handleChatDiscovered(QString,QVariantMap)));
- connect(tdLibWrapper, SIGNAL(chatLastMessageUpdated(QString,QString,QVariantMap)), this, SLOT(handleChatLastMessageUpdated(QString,QString,QVariantMap)));
- connect(tdLibWrapper, SIGNAL(chatOrderUpdated(QString,QString)), this, SLOT(handleChatOrderUpdated(QString,QString)));
- connect(tdLibWrapper, SIGNAL(chatReadInboxUpdated(QString,QString,int)), this, SLOT(handleChatReadInboxUpdated(QString,QString,int)));
- connect(tdLibWrapper, SIGNAL(chatReadOutboxUpdated(QString,QString)), this, SLOT(handleChatReadOutboxUpdated(QString,QString)));
- connect(tdLibWrapper, SIGNAL(messageSendSucceeded(QString,QString,QVariantMap)), this, SLOT(handleMessageSendSucceeded(QString,QString,QVariantMap)));
- connect(tdLibWrapper, SIGNAL(chatNotificationSettingsUpdated(QString,QVariantMap)), this, SLOT(handleChatNotificationSettingsUpdated(QString,QVariantMap)));
+ this->tdLibWrapper = tdLibWrapper;
+ connect(tdLibWrapper, SIGNAL(newChatDiscovered(QString, QVariantMap)), this, SLOT(handleChatDiscovered(QString, QVariantMap)));
+ connect(tdLibWrapper, SIGNAL(chatLastMessageUpdated(QString, QString, QVariantMap)), this, SLOT(handleChatLastMessageUpdated(QString, QString, QVariantMap)));
+ connect(tdLibWrapper, SIGNAL(chatOrderUpdated(QString, QString)), this, SLOT(handleChatOrderUpdated(QString, QString)));
+ connect(tdLibWrapper, SIGNAL(chatReadInboxUpdated(QString, QString, int)), this, SLOT(handleChatReadInboxUpdated(QString, QString, int)));
+ connect(tdLibWrapper, SIGNAL(chatReadOutboxUpdated(QString, QString)), this, SLOT(handleChatReadOutboxUpdated(QString, QString)));
+ connect(tdLibWrapper, SIGNAL(messageSendSucceeded(QString, QString, QVariantMap)), this, SLOT(handleMessageSendSucceeded(QString, QString, QVariantMap)));
+ connect(tdLibWrapper, SIGNAL(chatNotificationSettingsUpdated(QString, QVariantMap)), this, SLOT(handleChatNotificationSettingsUpdated(QString, QVariantMap)));
}
ChatListModel::~ChatListModel()
diff --git a/src/tdlibreceiver.cpp b/src/tdlibreceiver.cpp
index 6c06030..da257a9 100644
--- a/src/tdlibreceiver.cpp
+++ b/src/tdlibreceiver.cpp
@@ -219,7 +219,12 @@ void TDLibReceiver::processUpdateUnreadChatCount(const QVariantMap &receivedInfo
void TDLibReceiver::processUpdateChatLastMessage(const QVariantMap &receivedInformation)
{
const QString chat_id(receivedInformation.value(CHAT_ID).toString());
- const QString order(findChatPositionOrder(receivedInformation.value(POSITIONS).toList()));
+ QString order;
+ if (receivedInformation.contains(POSITIONS)) {
+ order = findChatPositionOrder(receivedInformation.value(POSITIONS).toList());
+ } else {
+ order = receivedInformation.value(ORDER).toString();
+ }
const QVariantMap lastMessage = receivedInformation.value(LAST_MESSAGE).toMap();
LOG("Last message of chat" << chat_id << "updated, order" << order << "type" << lastMessage.value("@type").toString());
emit chatLastMessageUpdated(chat_id, order, lastMessage);
diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts
index 458b474..560695c 100644
--- a/translations/harbour-fernschreiber-de.ts
+++ b/translations/harbour-fernschreiber-de.ts
@@ -11,10 +11,6 @@
Ein Telegram-Client für Sailfish OS
-
-
- Von Sebastian J. Wolf
-
E-Mail verschicken
@@ -75,6 +71,10 @@
Twemoji auf GitHub öffnen
+
+
+ Von Sebastian J. Wolf und <a href="https://github.com/Wunderfitz/harbour-fernschreiber#contributions">anderen Beitragenden</a>
+
BackgroundProgressIndicator
diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts
index da9ba5d..f6cb2f5 100644
--- a/translations/harbour-fernschreiber-es.ts
+++ b/translations/harbour-fernschreiber-es.ts
@@ -11,10 +11,6 @@
Un cliente de Telegram para Sailfish SO
-
-
- Por Sebastian J. Wolf
-
Enviar C.Electron.
@@ -75,6 +71,10 @@
Biblioteca twemoji
+
+
+
+
BackgroundProgressIndicator
diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts
index cc00d75..5550932 100644
--- a/translations/harbour-fernschreiber-hu.ts
+++ b/translations/harbour-fernschreiber-hu.ts
@@ -11,10 +11,6 @@
Sailfish OS Telegram kliens
-
-
- Készítette Sebastian J. Wolf
-
E-mail küldés
@@ -75,6 +71,10 @@
twemoji megnyitása a GitHub-on
+
+
+
+
BackgroundProgressIndicator
diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts
index 1bd5bdc..65db071 100644
--- a/translations/harbour-fernschreiber-pl.ts
+++ b/translations/harbour-fernschreiber-pl.ts
@@ -11,10 +11,6 @@
Klien Telegram dla Sailfish OS
-
-
- Stworzony przez Sebastian J. Wolf
-
Wyślij e-mail
@@ -75,6 +71,10 @@
Otwórz twemoji na GitHub
+
+
+
+
BackgroundProgressIndicator
diff --git a/translations/harbour-fernschreiber-zh_CN.ts b/translations/harbour-fernschreiber-zh_CN.ts
index 4b8132a..bebb602 100644
--- a/translations/harbour-fernschreiber-zh_CN.ts
+++ b/translations/harbour-fernschreiber-zh_CN.ts
@@ -11,10 +11,6 @@
一个旗鱼系统 Telegram 客户端
-
-
- 开发者为 Sebastian J. Wolf
-
发送电子邮件
@@ -75,6 +71,10 @@
打开位于 Github 的 Twemoji 页面
+
+
+
+
BackgroundProgressIndicator
diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts
index 21eeceb..98601f0 100644
--- a/translations/harbour-fernschreiber.ts
+++ b/translations/harbour-fernschreiber.ts
@@ -11,10 +11,6 @@
-
-
-
-
@@ -75,6 +71,10 @@
+
+
+
+
BackgroundProgressIndicator