rlottie: Abort sticker loading instead of checking message_id

Author: yuraiz

src/components/sticker.rs

@@ -7,7 +7,7 @@ use tdlib::enums::StickerFormat;
 use tdlib::types::Sticker as TdSticker;
 
 use crate::session::Session;
-use crate::utils::{decode_image_from_path, spawn};
+use crate::utils::decode_image_from_path;
 
 mod imp {
     use super::*;
@@ -16,7 +16,7 @@ mod imp {
     #[derive(Debug, Default, glib::Properties)]
     #[properties(wrapper_type = super::Sticker)]
     pub(crate) struct Sticker {
-        pub(super) message_id: Cell<i64>,
+        pub(super) handle: RefCell<Option<glib::JoinHandle<()>>>,
         pub(super) aspect_ratio: Cell<f64>,
         pub(super) child: RefCell<Option<gtk::Widget>>,
 
@@ -95,13 +95,7 @@ glib::wrapper! {
 }
 
 impl Sticker {
-    pub(crate) fn set_sticker(
-        &self,
-        sticker: TdSticker,
-        looped: bool,
-        session: Session,
-        message_id: i64,
-    ) {
+    pub(crate) fn set_sticker(&self, sticker: TdSticker, looped: bool, session: Session) {
         // TODO: draw sticker outline with cairo
         self.set_child(None);
 
@@ -110,18 +104,22 @@ impl Sticker {
         let aspect_ratio = sticker.width as f64 / sticker.height as f64;
         imp.aspect_ratio.set(aspect_ratio);
 
-        imp.message_id.set(message_id);
-
         let format = sticker.format;
 
-        spawn(clone!(@weak self as obj, @weak session => async move {
-            if sticker.sticker.local.is_downloading_completed {
-                obj.load_sticker(&sticker.sticker.local.path, looped, format).await;
-            } else {
-            let file_id = sticker.sticker.id;
+        let context = glib::MainContext::default();
+        let handle = context.spawn_local(clone!(@weak self as obj, @weak session => async move {
+                if sticker.sticker.local.is_downloading_completed {
+                    obj.load_sticker(&sticker.sticker.local.path, looped, format).await;
+                } else {
+                let file_id = sticker.sticker.id;
                 obj.download_sticker(file_id, &session, looped, format).await
             }
         }));
+
+        // Widget can be recycled by ListView
+        if let Some(old_handle) = imp.handle.replace(Some(handle)) {
+            old_handle.abort();
+        };
     }
 
     pub(crate) fn play_animation(&self) {
@@ -153,7 +151,6 @@ impl Sticker {
 
     async fn load_sticker(&self, path: &str, looped: bool, format: StickerFormat) {
         let path = path.to_owned();
-        let message_id = self.imp().message_id.get();
 
         let widget: gtk::Widget = match format {
             StickerFormat::Tgs => {
@@ -183,10 +180,6 @@ impl Sticker {
             _ => unimplemented!(),
         };
 
-        if self.imp().message_id.get() != message_id {
-            return;
-        }
-
         self.set_child(Some(widget));
     }
 

src/session/content/message_row/sticker.rs

@@ -179,7 +179,7 @@ impl MessageBaseExt for MessageSticker {
         imp.sticker.set_margin_bottom(margin_bottom);
 
         imp.sticker
-            .set_sticker(sticker, looped, message.chat().session(), message.id());
+            .set_sticker(sticker, looped, message.chat().session());
 
         self.notify("message");
     }