Merge pull request #12877 from an0n666/private-torrents

Address some issues regarding private torrents

src/base/bittorrent/torrenthandle.h

@@ -285,6 +285,7 @@ namespace BitTorrent
         virtual void addUrlSeeds(const QVector<QUrl> &urlSeeds) = 0;
         virtual void removeUrlSeeds(const QVector<QUrl> &urlSeeds) = 0;
         virtual bool connectPeer(const PeerAddress &peerAddress) = 0;
+        virtual void clearPeers() = 0;
 
         virtual QString createMagnetURI() const = 0;
 

src/base/bittorrent/torrenthandleimpl.cpp

@@ -435,6 +435,11 @@ void TorrentHandleImpl::replaceTrackers(const QVector<TrackerEntry> &trackers)
 
         if (!newTrackers.isEmpty())
             m_session->handleTorrentTrackersAdded(this, newTrackers);
+
+        // Clear the peer list if it's a private torrent since
+        // we do not want to keep connecting with peers from old tracker.
+        if (isPrivate())
+            clearPeers();
     }
 }
 
@@ -489,6 +494,13 @@ void TorrentHandleImpl::removeUrlSeeds(const QVector<QUrl> &urlSeeds)
         m_session->handleTorrentUrlSeedsRemoved(this, removedUrlSeeds);
 }
 
+void TorrentHandleImpl::clearPeers()
+{
+#if (LIBTORRENT_VERSION_NUM >= 10207)
+    m_nativeHandle.clear_peers();
+#endif
+}
+
 bool TorrentHandleImpl::connectPeer(const PeerAddress &peerAddress)
 {
     lt::error_code ec;

src/base/bittorrent/torrenthandleimpl.h

@@ -237,6 +237,7 @@ namespace BitTorrent
         void addUrlSeeds(const QVector<QUrl> &urlSeeds) override;
         void removeUrlSeeds(const QVector<QUrl> &urlSeeds) override;
         bool connectPeer(const PeerAddress &peerAddress) override;
+        void clearPeers() override;
 
         QString createMagnetURI() const override;
 

src/gui/properties/peerlistwidget.cpp

@@ -256,7 +256,8 @@ void PeerListWidget::showPeerListMenu(const QPoint &)
     menu->setAttribute(Qt::WA_DeleteOnClose);
 
     // Add Peer Action
-    if (!torrent->isQueued() && !torrent->isChecking()) {
+    // Do not allow user to add peers in a private torrent
+    if (!torrent->isQueued() && !torrent->isChecking() && !torrent->isPrivate()) {
         const QAction *addPeerAct = menu->addAction(UIThemeManager::instance()->getIcon("user-group-new"), tr("Add a new peer..."));
         connect(addPeerAct, &QAction::triggered, this, [this, torrent]()
         {