From f794925595bfeb9193d7fcd42190b4cdbc68bd4b Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 24 Jan 2021 13:30:44 +0100 Subject: [PATCH 1/2] Fixed to not popup the "Refused Connection" by default * Fixed to not popup the "Refused Connection" by default * Enable to show via Notify settings "IP security" checbox" --- retroshare-gui/src/gui/NewsFeed.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index 136acd7c8..ff31a3f6a 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -463,7 +463,7 @@ void NewsFeed::handleSecurityEvent(std::shared_ptr event) #endif uint flags = Settings->getNewsFeedFlags(); - if(e.mErrorCode == RsAuthSslError::PEER_REFUSED_CONNECTION) + if(e.mErrorCode == RsAuthSslError::PEER_REFUSED_CONNECTION && (flags & RS_FEED_TYPE_SECURITY_IP)) { addFeedItemIfUnique(new PeerItem(this, NEWSFEED_PEERLIST, e.mSslId, PEER_TYPE_HELLO, false), true ); return; From 561bd01e8c37704c4d7e5910580e619a076ee92d Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 24 Jan 2021 14:36:22 +0100 Subject: [PATCH 2/2] Enabled some default importend Activity Feeds --- retroshare-gui/src/gui/settings/rsharesettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index ea0bbcb69..594f0bba6 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -137,7 +137,7 @@ void RshareSettings::initSettings() // This is not default... RS_CHAT_FOCUS. uint defNotify = (RS_POPUP_CONNECT | RS_POPUP_MSG); - uint defNewsFeed = (RS_FEED_TYPE_MSG | RS_FEED_TYPE_FILES | RS_FEED_TYPE_SECURITY | RS_FEED_TYPE_SECURITY_IP); + uint defNewsFeed = (RS_FEED_TYPE_MSG | RS_FEED_TYPE_FILES | RS_FEED_TYPE_SECURITY | RS_FEED_TYPE_SECURITY_IP | RS_FEED_TYPE_CIRCLE | RS_FEED_TYPE_CHANNEL |RS_FEED_TYPE_FORUM | RS_FEED_TYPE_POSTED); setDefault(SETTING_NEWSFEED_FLAGS, defNewsFeed); setDefault(SETTING_CHAT_FLAGS, defChat);