gtk: fix attachment download race condition

core/Cargo.lock

@@ -1274,7 +1274,7 @@ dependencies = [
 
 [[package]]
 name = "kordophoned"
-version = "1.0.1"
+version = "1.3.0"
 dependencies = [
  "anyhow",
  "async-trait",

core/Makefile

@@ -13,7 +13,7 @@ rpm:
 	strip -s target/release/kordophoned
 	strip -s target/release/kpcli
 	strip -s target/release/kptui
-	cargo generate-rpm -p kordophoned
+	cargo generate-rpm -p kordophoned --auto-req builtin
 
 .PHONY: deb
 deb:

core/kordophoned/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kordophoned"
-version = "1.0.1"
+version = "1.3.0"
 edition = "2021"
 license = "GPL-3.0"
 description = "Client daemon for the Kordophone chat protocol"

gtk/Makefile

@@ -5,11 +5,12 @@ all: setup
 setup: build/
 	meson build
 
-VER := 1.0.2
+VER_RAW := $(shell git -C .. describe --tags --abbrev=0 2>/dev/null || git -C .. describe --tags 2>/dev/null || printf '0.0.0')
+VER := $(patsubst v%,%,$(VER_RAW))
 TMP := $(shell mktemp -d)
 rpm:
 	git -C .. archive --format=tar.gz --prefix=kordophone/ -o $(TMP)/v$(VER).tar.gz HEAD
-	rpmbuild -ba dist/rpm/kordophone.spec --define "_sourcedir $(TMP)"
+	rpmbuild -ba dist/rpm/kordophone.spec --define "_sourcedir $(TMP)" --define "app_version $(VER)"
 
 deb:
 	./dist/deb/build-deb.sh $(VER)

gtk/dist/deb/build-deb.sh

@@ -37,7 +37,7 @@ Priority: optional
 Architecture: ${ARCH}
 Maintainer: James Magahern <james@magahern.com>
 Installed-Size: ${INSTALLED_SIZE_KB}
-Depends: libgtk-4-1, libadwaita-1-0, libglib2.0-0, libgee-0.8-2, libsecret-1-0, kordophoned (>= 1.0.0)
+Depends: libgtk-4-1, libadwaita-1-0, libglib2.0-0, libgee-0.8-2, libsecret-1-0, kordophoned (>= 1.3.0)
 Description: GTK4/Libadwaita client for Kordophone
  A GTK4/Libadwaita Linux client for the Kordophone client daemon.
 EOF

gtk/dist/rpm/kordophone.spec

@@ -1,5 +1,5 @@
 Name:           kordophone
-Version:        1.0.2
+Version:        %{?app_version}%{!?app_version:1.3.0}
 Release:        1%{?dist}
 Summary:        GTK4/Libadwaita client for Kordophone
 
@@ -22,7 +22,7 @@ Requires:       libadwaita
 Requires:       glib2
 Requires:       libgee
 Requires:       libsecret
-Requires:       kordophoned >= 1.0.0
+Requires:       kordophoned >= 1.3.0
 
 %description
 A GTK4/Libadwaita Linux Client for the Kordophone client daemon.
@@ -49,4 +49,3 @@ popd
 %changelog
 * Fri Aug 8 2025 James Magahern <james@magahern.com>
 - Updated rpmspec 
-

gtk/src/transcript/layouts/image-bubble-layout.vala

@@ -60,22 +60,31 @@ private class ImageBubbleLayout : BubbleLayout
         this.is_downloaded = false;
         this.cached_texture = TextureCache.get_instance().get_texture(attachment_guid);
 
+        if (this.cached_texture != null) {
+            this.image_size = Graphene.Size() {
+                width = (float)this.cached_texture.get_width(),
+                height = (float)this.cached_texture.get_height()
+            };
+            SizeCache.get_instance().set_size(attachment_guid, this.image_size);
+            return;
+        }
+
         // Calculate image dimensions for layout
         calculate_image_dimensions(image_size);
     }
 
     private void calculate_image_dimensions(Graphene.Size? image_size) {
-        if (image_size != null) {
-            this.image_size = image_size;
-            return;
-        }
-
         var cached_size = SizeCache.get_instance().get_size(attachment_guid);
         if (cached_size != null) {
             this.image_size = cached_size;
             return;
         }
 
+        if (image_size != null) {
+            this.image_size = image_size;
+            return;
+        }
+
         this.image_size = Graphene.Size() { width = 200.0f, height = 150.0f };
     }
 

gtk/src/transcript/transcript-drawing-area.vala

@@ -327,7 +327,8 @@ private class TranscriptDrawingArea : Widget
 
     private void recompute_message_layouts() {
         var container_width = get_width();
-        float max_width = container_width * 0.90f;
+        float max_width = container_width * 0.80f;
+        float image_max_width = max_width * 0.70f;
 
         DateTime? last_date = null;
         string? last_sender = null;
@@ -371,7 +372,7 @@ private class TranscriptDrawingArea : Widget
                     };
                 }
 
-                var image_layout = new ImageBubbleLayout(attachment.guid, message.from_me, this, max_width, image_size);
+                var image_layout = new ImageBubbleLayout(attachment.guid, message.from_me, this, image_max_width, image_size);
                 image_layout.id = @"image-$(attachment.guid)";
 
                 if (animate) {

gtk/src/transcript/transcript-view.vala

@@ -159,7 +159,6 @@ public class TranscriptView : Adw.Bin
     }
 
     delegate void OpenPath(string path);
-    private ulong attachment_downloaded_handler_id = 0;
     private void open_attachment(string attachment_guid) {
         OpenPath open_path = (path) => {
             try {
@@ -180,10 +179,17 @@ public class TranscriptView : Adw.Bin
 
                 // TODO: Should probably indicate progress here. 
                 
-                attachment_downloaded_handler_id = Repository.get_instance().attachment_downloaded.connect((guid) => {
+                ulong handler_id = 0;
+                handler_id = Repository.get_instance().attachment_downloaded.connect((guid) => {
                     if (guid == attachment_guid) {
-                        open_path(attachment_info.path);
-                        Repository.get_instance().disconnect(attachment_downloaded_handler_id);
+                        try {
+                            var updated_attachment_info = Repository.get_instance().get_attachment_info(attachment_guid);
+                            open_path(updated_attachment_info.path);
+                        } catch (GLib.Error e) {
+                            warning("Failed to get attachment info after download: %s", e.message);
+                        }
+
+                        Repository.get_instance().disconnect(handler_id);
                     }
                 });
             }