From 9a44603d2fa662f5275ab318bdd0929f1a81b7e7 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Tue, 10 Mar 2020 21:30:27 +0000 Subject: [PATCH] prevent duplicate feed subscriptions --- .../views/com/muwire/gui/SearchTabView.groovy | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gui/griffon-app/views/com/muwire/gui/SearchTabView.groovy b/gui/griffon-app/views/com/muwire/gui/SearchTabView.groovy index 6dbdaf89..ee3d40f7 100644 --- a/gui/griffon-app/views/com/muwire/gui/SearchTabView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/SearchTabView.groovy @@ -345,7 +345,8 @@ class SearchTabView { Persona sender = model.senders[row] model.browseActionEnabled = model.sendersBucket[sender].first().browse model.chatActionEnabled = model.sendersBucket[sender].first().chat - model.subscribeActionEnabled = model.sendersBucket[sender].first().feed + model.subscribeActionEnabled = model.sendersBucket[sender].first().feed && + model.core.feedManager.getFeed(sender) == null model.trustButtonsEnabled = true model.results.clear() model.results.addAll(model.sendersBucket[sender]) @@ -406,12 +407,13 @@ class SearchTabView { model.viewCommentActionEnabled = false return } - model.browseActionEnabled = model.senders2[row].browse - model.chatActionEnabled = model.senders2[row].chat - model.subscribeActionEnabled = model.senders2[row].feed + UIResultEvent e = model.senders2[row] + model.browseActionEnabled = e.browse + model.chatActionEnabled = e.chat + model.subscribeActionEnabled = e.feed && model.core.feedManager.getFeed(e.getSender()) == null model.trustButtonsEnabled = true - model.viewCommentActionEnabled = model.senders2[row].comment != null - model.viewCertificatesActionEnabled = model.senders2[row].certificates > 0 + model.viewCommentActionEnabled = e.comment != null + model.viewCertificatesActionEnabled = e.certificates > 0 }) if (settings.groupByFile)