misc: bump daemon

Change-Id: Ie3c9570dd55e442a6b1e996801e0bb1a7f92b77c
misc: remove ubuntu 22.10 (EOL)
2025-10-30 07:53:33 +08:00 · 2023-09-12 11:34:20 -04:00 · 2023-09-12 11:26:27 -04:00 · 2023-09-12 10:59:23 -04:00
10 changed files with 46 additions and 28 deletions
--- a/2
+++ b/2
--- a/extras/packaging/gnu-linux/Makefile
+++ b/extras/packaging/gnu-linux/Makefile
@ -166,7 +166,6 @@ DISTRIBUTIONS := \
 	debian_unstable \
 	ubuntu_20.04 \
 	ubuntu_22.04 \
-	ubuntu_22.10 \
 	ubuntu_23.04 \
 	fedora_37 \
 	fedora_38 \
--- a/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_22.10
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_22.10
@ -1,22 +0,0 @@
-FROM ubuntu:22.10
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y -o Acquire::Retries=10 \
-        devscripts \
-        equivs \
-        python-is-python3 \
-        wget
-
-ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
-
-COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control
-RUN /opt/prebuild-package-debian.sh qt-deps
-
-COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control
-RUN /opt/prebuild-package-debian.sh jami-deps
-
-ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh
-CMD ["/opt/build-package-debian.sh"]
--- a/extras/packaging/gnu-linux/rules/debian/jami-all.postinst
+++ b/extras/packaging/gnu-linux/rules/debian/jami-all.postinst
@ -99,8 +99,6 @@ if [ -f /etc/os-release ]; then
        ENDTAG="ubuntu_20.04"
    elif [ "${UBUNTU_CODENAME}" = "jammy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.04" ]; then
        ENDTAG="ubuntu_22.04"
-    elif [ "${UBUNTU_CODENAME}" = "kinetic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.10" ]; then
-        ENDTAG="ubuntu_22.10"
    elif [ "${UBUNTU_CODENAME}" = "lunar" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.04" ]; then
        ENDTAG="ubuntu_23.04"
    elif [ "${ID}" = "debian" ] && \
--- a/src/app/commoncomponents/MessageOptionsPopup.qml
+++ b/src/app/commoncomponents/MessageOptionsPopup.qml
@ -228,6 +228,18 @@ Popup {
                }
            }

+            MessageOptionButton {
+                visible: type === Interaction.Type.DATA_TRANSFER && Status === Interaction.Status.TRANSFER_FINISHED
+                textButton: JamiStrings.removeLocally
+                iconSource: JamiResources.trash_black_24dp_svg
+                Layout.fillWidth: true
+                Layout.margins: 5
+                onClicked: {
+                    MessagesAdapter.removeFile(msgId, root.location)
+                    close()
+                }
+            }
+
            MessageOptionButton {
                id: buttonEdit

--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@ -496,6 +496,7 @@ Item {
    // Context Menu
    property string saveFile: qsTr("Save file")
    property string openLocation: qsTr("Open location")
+    property string removeLocally: qsTr("Delete file from device")

    // Updates
    property string betaInstall: qsTr("Install beta version")
--- a/src/app/messagesadapter.cpp
+++ b/src/app/messagesadapter.cpp
@ -299,6 +299,13 @@ MessagesAdapter::openDirectory(const QString& path)
    }
 }

+void
+MessagesAdapter::removeFile(const QString& interactionId, const QString& path)
+{
+    auto convUid = lrcInstance_->get_selectedConvUid();
+    lrcInstance_->getCurrentConversationModel()->removeFile(convUid, interactionId, path);
+}
+
 void
 MessagesAdapter::acceptFile(const QString& interactionId)
 {
--- a/src/app/messagesadapter.h
+++ b/src/app/messagesadapter.h
@ -111,6 +111,7 @@ protected:
    Q_INVOKABLE void cancelFile(const QString& arg);
    Q_INVOKABLE void openUrl(const QString& url);
    Q_INVOKABLE void openDirectory(const QString& arg);
+    Q_INVOKABLE void removeFile(const QString& interactionId, const QString& path);
    Q_INVOKABLE void deleteInteraction(const QString& interactionId);
    Q_INVOKABLE void joinCall(const QString& uri,
                              const QString& deviceId,
--- a/src/libclient/api/conversationmodel.h
+++ b/src/libclient/api/conversationmodel.h
@ -306,6 +306,9 @@ public:
    void getTransferInfo(const QString& conversationId,
                         const QString& interactionId,
                         api::datatransfer::Info& info) const;
+    void removeFile(const QString& conversationId,
+                    const QString& interactionId,
+                    const QString& path);

    /**
     * Starts a search of all medias in a conversation
--- a/src/libclient/conversationmodel.cpp
+++ b/src/libclient/conversationmodel.cpp
@ -3384,8 +3384,7 @@ ConversationModelPimpl::slotNewCall(const QString& fromId, const QString& callId
        // in case if we receive call after removing contact add conversation request;
        try {
            auto contact = linked.owner.contactModel->getContact(fromId);
-            if (!isOutgoing && !contact.isBanned
-                && fromId != linked.owner.profileInfo.uri) {
+            if (!isOutgoing && !contact.isBanned && fromId != linked.owner.profileInfo.uri) {
                addContactRequest(fromId);
            }
            if (isOutgoing && contact.profileInfo.type == profile::Type::TEMPORARY) {
@ -4049,6 +4048,26 @@ ConversationModel::getTransferInfo(const QString& conversationId,
    }
 }

+void
+ConversationModel::removeFile(const QString& conversationId,
+                              const QString& interactionId,
+                              const QString& path)
+{
+    auto convOpt = getConversationForUid(conversationId);
+    if (!convOpt)
+        return;
+
+    QFile::remove(path);
+
+    std::lock_guard<std::mutex> lk(pimpl_->interactionsLocks[convOpt->get().uid]);
+    auto& interactions = convOpt->get().interactions;
+    auto it = interactions->find(interactionId);
+    if (it != interactions->end()) {
+        it->second.status = interaction::Status::TRANSFER_AWAITING_HOST;
+        interactions->emitDataChanged(it, {MessageList::Role::Status});
+    }
+}
+
 int
 ConversationModel::getNumberOfUnreadMessagesFor(const QString& convUid)
 {
Author	SHA1	Message	Date
Sébastien Blin	e8075a412e	misc: bump daemon Change-Id: Ie3c9570dd55e442a6b1e996801e0bb1a7f92b77c	2023-09-12 11:34:20 -04:00
Sébastien Blin	4d55a1430d	misc: remove ubuntu 22.10 (EOL) Change-Id: I9a7bbd77a91b885666519e726530df2ebd7097ca	2023-09-12 11:26:27 -04:00
Sébastien Blin	8de099e38d	MessageOptionsPopup: add option to locally delete file This button offers an option to remove sent/downloaded files from the device. Change-Id: Ida1b135681243fd6055034d8a2d699d11bf040e5 GitLab: #1287	2023-09-12 10:59:23 -04:00