GIT_SILENT Sync po/docbooks with svn

This fixes APKs on binary factory having exploded in size 3x-5x after
the Qt 5.15.10 update. This also affects release packages and will need
to be backported to those (in Craft).

CMakeLists.txt

@@ -17,7 +17,7 @@ project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
 set(KF_MIN_VERSION "5.91.0")
 set(QT_MIN_VERSION "5.15.2")
 if (ANDROID)
-    set(QT_MIN_VERSION "5.15.8")
+    set(QT_MIN_VERSION "5.15.10")
 endif()
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)

android/build.gradle

@@ -47,6 +47,7 @@ android {
     compileSdkVersion androidCompileSdkVersion.toInteger()
 
     buildToolsVersion androidBuildToolsVersion
+    ndkVersion androidNdkVersion
 
     sourceSets {
         main {

po/fi/neochat.po

@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 23.04.1\n"
+"X-Generator: Lokalize 22.12.3\n"
 
 #: src/controller.cpp:198
 #, kde-format

src/controller.cpp

@@ -125,22 +125,18 @@ Controller::Controller(QObject *parent)
     }
 #endif
 
-#ifdef QUOTIENT_07
-    connect(&Accounts, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
-#else
     connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
-#endif
 
 #ifdef QUOTIENT_07
     static int oldAccountCount = 0;
-    connect(&Accounts, &AccountRegistry::accountCountChanged, this, [this]() {
-        if (Accounts.size() > oldAccountCount) {
-            auto connection = Accounts.accounts()[Accounts.size() - 1];
-            connect(connection, &Connection::syncDone, this, [this, connection]() {
+    connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, [=]() {
+        if (AccountRegistry::instance().size() > oldAccountCount) {
+            auto connection = AccountRegistry::instance().accounts()[AccountRegistry::instance().size() - 1];
+            connect(connection, &Connection::syncDone, this, [=]() {
                 handleNotifications(connection);
             });
         }
-        oldAccountCount = Accounts.size();
+        oldAccountCount = AccountRegistry::instance().size();
     });
 #endif
 }
@@ -281,18 +277,10 @@ void Controller::logout(Connection *conn, bool serverSideLogout)
     job.start();
     loop.exec();
 
-#ifdef QUOTIENT_07
-    if (Accounts.count() > 1) {
-#else
     if (AccountRegistry::instance().count() > 1) {
-#endif
         // Only set the connection if the the account being logged out is currently active
         if (conn == activeConnection()) {
-#ifdef QUOTIENT_07
-            setActiveConnection(Accounts.accounts()[0]);
-#else
             setActiveConnection(AccountRegistry::instance().accounts()[0]);
-#endif
         }
     } else {
         setActiveConnection(nullptr);
@@ -307,8 +295,8 @@ void Controller::addConnection(Connection *c)
 {
     Q_ASSERT_X(c, __FUNCTION__, "Attempt to add a null connection");
 
-#ifdef QUOTIENT_07
-    Accounts.add(c);
+#ifndef QUOTIENT_07
+    AccountRegistry::instance().add(c);
 #endif
 
     c->setLazyLoading(true);
@@ -560,11 +548,7 @@ NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, b
 
 int Controller::accountCount() const
 {
-#ifdef QUOTIENT_07
-    return Accounts.count();
-#else
     return AccountRegistry::instance().count();
-#endif
 }
 
 bool Controller::quitOnLastWindowClosed()

src/login.cpp

@@ -43,11 +43,7 @@ void Login::init()
             return;
         }
 
-#ifdef QUOTIENT_07
-        m_isLoggedIn = Accounts.isLoggedIn(m_matrixId);
-#else
         m_isLoggedIn = AccountRegistry::instance().isLoggedIn(m_matrixId);
-#endif
         Q_EMIT isLoggedInChanged();
         if (m_isLoggedIn) {
             return;

src/neochatroom.cpp

@@ -63,6 +63,8 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
     : Room(connection, std::move(roomId), joinState)
 {
     connect(connection, &Connection::accountDataChanged, this, &NeoChatRoom::updatePushNotificationState);
+    connect(this, &NeoChatRoom::notificationCountChanged, this, &NeoChatRoom::countChanged);
+    connect(this, &NeoChatRoom::highlightCountChanged, this, &NeoChatRoom::countChanged);
     connect(this, &Room::fileTransferCompleted, this, [this] {
         setFileUploadingProgress(0);
         setHasFileUploading(false);
@@ -337,6 +339,14 @@ void NeoChatRoom::onRedaction(const RoomEvent &prevEvent, const RoomEvent & /*af
     }
 }
 
+void NeoChatRoom::countChanged()
+{
+    if (displayed() && !hasUnreadMessages()) {
+        resetNotificationCount();
+        resetHighlightCount();
+    }
+}
+
 QDateTime NeoChatRoom::lastActiveTime()
 {
     if (timelineSize() == 0) {

src/neochatroom.h

@@ -385,6 +385,7 @@ private:
 #endif
 
 private Q_SLOTS:
+    void countChanged();
     void updatePushNotificationState(QString type);
 
 Q_SIGNALS:

src/qml/main.qml

@@ -249,8 +249,6 @@ Kirigami.ApplicationWindow {
         target: Controller
 
         function onInitiated() {
-            console.warn("INITIATED")
-            console.warn(Controller.accountCount)
             if (Controller.accountCount === 0) {
                 pageStack.replace("qrc:/WelcomePage.qml", {});
             } else if (!roomListLoaded) {