From 189803e27af79ebadda3775dc5a6553e0185f6b5 Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Thu, 14 Oct 2021 18:31:55 +0100
Subject: [PATCH] Fix right-click menu options when uploads are cleared
 automatically.  GitHub issue #86

---
 .../com/muwire/gui/MainFrameController.groovy | 35 ++++---------------
 .../views/com/muwire/gui/MainFrameView.groovy | 14 ++++----
 2 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
index c4000cbd..9b7d0e45 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
@@ -445,10 +445,7 @@ class MainFrameController {
     }
     
     @ControllerAction
-    void browseFromUpload() {
-        Uploader u = view.selectedUploader()
-        if (u == null)
-            return
+    void browseFromUpload(Uploader u) {
         Persona p = u.getDownloaderPersona()
 
         String groupId = UUID.randomUUID().toString()
@@ -460,10 +457,7 @@ class MainFrameController {
     }
     
     @ControllerAction
-    void browseCollectionsFromUpload() {
-        Uploader u = view.selectedUploader()
-        if (u == null)
-            return
+    void browseCollectionsFromUpload(Uploader u) {
         Persona p = u.getDownloaderPersona()
         
         UUID uuid = UUID.randomUUID()
@@ -479,10 +473,7 @@ class MainFrameController {
     }
     
     @ControllerAction
-    void subscribeFromUpload() {
-        Uploader u = view.selectedUploader()
-        if (u == null)
-            return
+    void subscribeFromUpload(Uploader u) {
         Persona p = u.getDownloaderPersona()
         
         Feed feed = new Feed(p)
@@ -496,10 +487,7 @@ class MainFrameController {
     }
     
     @ControllerAction
-    void chatFromUpload() {
-        Uploader u = view.selectedUploader()
-        if (u == null)
-            return
+    void chatFromUpload(Uploader u) {
         Persona p = u.getDownloaderPersona()
         startChat(p)
         view.showChatWindow.call()
@@ -569,10 +557,7 @@ class MainFrameController {
     }
     
     @ControllerAction
-    void showInLibrary() {
-        Uploader uploader = view.selectedUploader()
-        if (uploader == null)
-            return
+    void showInLibrary(Uploader uploader) {
         SharedFile sf = null
         if (uploader instanceof HashListUploader) {
             InfoHash infoHash = uploader.infoHash
@@ -900,10 +885,7 @@ class MainFrameController {
     }
     
     @ControllerAction
-    void messageComposeFromUpload() {
-        Uploader u = view.selectedUploader()
-        if (u == null)
-            return
+    void messageComposeFromUpload(Uploader u) {
         Persona p = u.getDownloaderPersona()
         
         def params = [:]
@@ -926,10 +908,7 @@ class MainFrameController {
     }
     
     @ControllerAction
-    void copyIdFromUploads() {
-        Uploader u = view.selectedUploader()
-        if (u == null)
-            return
+    void copyIdFromUploads(Uploader u) {
         CopyPasteSupport.copyToClipboard(u.getDownloaderPersona().toBase64())
     }
     
diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
index 58b7ea9c..21a213a3 100644
--- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
@@ -1618,38 +1618,38 @@ class MainFrameView {
             
         JPopupMenu uploadsTableMenu = new JPopupMenu()
         JMenuItem showInLibrary = new JMenuItem(trans("SHOW_IN_LIBRARY"))
-        showInLibrary.addActionListener({mvcGroup.controller.showInLibrary()})
+        showInLibrary.addActionListener({mvcGroup.controller.showInLibrary(uploader)})
         uploadsTableMenu.add(showInLibrary)
         
         if (uploader.isBrowseEnabled()) {
             JMenuItem browseItem = new JMenuItem(trans("BROWSE_HOST"))
-            browseItem.addActionListener({mvcGroup.controller.browseFromUpload()})
+            browseItem.addActionListener({mvcGroup.controller.browseFromUpload(uploader)})
             uploadsTableMenu.add(browseItem)
             JMenuItem browseCollectionsItem = new JMenuItem(trans("BROWSE_COLLECTIONS"))
-            browseCollectionsItem.addActionListener({mvcGroup.controller.browseCollectionsFromUpload()})
+            browseCollectionsItem.addActionListener({mvcGroup.controller.browseCollectionsFromUpload(uploader)})
             uploadsTableMenu.add(browseCollectionsItem)
         }
         
         if (uploader.isFeedEnabled() && mvcGroup.controller.core.feedManager.getFeed(uploader.getDownloaderPersona()) == null) {
             JMenuItem feedItem = new JMenuItem(trans("SUBSCRIBE"))
-            feedItem.addActionListener({mvcGroup.controller.subscribeFromUpload()})
+            feedItem.addActionListener({mvcGroup.controller.subscribeFromUpload(uploader)})
             uploadsTableMenu.add(feedItem)
         }
         
         if (uploader.isChatEnabled() && !mvcGroup.controller.core.chatManager.isConnected(uploader.getDownloaderPersona())) {
             JMenuItem chatItem = new JMenuItem(trans("CHAT"))
-            chatItem.addActionListener({mvcGroup.controller.chatFromUpload()})
+            chatItem.addActionListener({mvcGroup.controller.chatFromUpload(uploader)})
             uploadsTableMenu.add(chatItem)
         }
         
         if (uploader.isMessageEnabled()) {
             JMenuItem messageItem = new JMenuItem(trans("MESSAGE_VERB"))
-            messageItem.addActionListener({mvcGroup.controller.messageComposeFromUpload()})
+            messageItem.addActionListener({mvcGroup.controller.messageComposeFromUpload(uploader)})
             uploadsTableMenu.add(messageItem)
         }
         
         JMenuItem copyIDItem = new JMenuItem(trans("COPY_FULL_ID"))
-        copyIDItem.addActionListener({mvcGroup.controller.copyIdFromUploads()})
+        copyIDItem.addActionListener({mvcGroup.controller.copyIdFromUploads(uploader)})
         uploadsTableMenu.add(copyIDItem)
         
         showPopupMenu(uploadsTableMenu, e)