removed the possibility of GXS groups to keep track of post origin before release, as it is too intrusive as compared to the benefits

libretroshare/src/grouter/p3grouter.cc

@@ -1862,15 +1862,6 @@ bool p3GRouter::locked_getLocallyRegisteredClientFromServiceId(const GRouterServ
     return true ;
 }
 
-void p3GRouter::addTrackingInfo(const RsGxsMessageId& mid,const RsPeerId& peer_id)
-{
-    RS_STACK_MUTEX(grMtx) ;
-#ifdef GROUTER_DEBUG
-    grouter_debug() << "Received new routing clue for key " << mid << " from peer " << peer_id << std::endl;
-#endif
-    _routing_matrix.addTrackingInfo(mid,peer_id) ;
-    _changed = true ;
-}
 void p3GRouter::addRoutingClue(const GRouterKeyId& id,const RsPeerId& peer_id)
 {
     RS_STACK_MUTEX(grMtx) ;
@@ -2357,13 +2348,6 @@ bool p3GRouter::getRoutingCacheInfo(std::vector<GRouterRoutingCacheInfo>& infos)
     return true ;
 }
 
-bool p3GRouter::getTrackingInfo(const RsGxsMessageId &mid, RsPeerId &provider_id)
-{
-        RS_STACK_MUTEX(grMtx) ;
-        
-        return _routing_matrix.getTrackingInfo(mid,provider_id) ;
-}
-
 // Dump everything
 //
 void p3GRouter::debugDump()

libretroshare/src/grouter/p3grouter.h

@@ -130,7 +130,6 @@ public:
     //===================================================//
 
     virtual void addRoutingClue(const GRouterKeyId& id,const RsPeerId& peer_id) ;
-    virtual void addTrackingInfo(const RsGxsMessageId& mid,const RsPeerId& peer_id) ;
 
     //===================================================//
     //         Client/server request services            //
@@ -168,7 +167,6 @@ public:
     // 	- Cache state (memory size, etc)
     //
     virtual bool getRoutingCacheInfo(std::vector<GRouterRoutingCacheInfo>& info) ;
-    virtual bool getTrackingInfo(const RsGxsMessageId& mid, RsPeerId& provider_id) ;
 
     //===================================================//
     //         Derived from p3Service                    //

libretroshare/src/gxs/rsgenexchange.cc

@@ -2011,10 +2011,7 @@ void RsGenExchange::publishMsgs()
                 
                 // FIXTESTS global variable rsPeers not available in unittests!
                 if(rsPeers)
-                {
                     mRoutingClues[msg->metaData->mAuthorId].insert(rsPeers->getOwnId()) ;
-                    mTrackingClues.push_back(std::make_pair(msg->msgId,rsPeers->getOwnId())) ;
-                }
                 
 				computeHash(msg->msg, msg->metaData->mHash);
 				mDataAccess->addMsgData(msg);
@@ -2159,11 +2156,6 @@ void RsGenExchange::processRoutingClues()
             rsGRouter->addRoutingClue(GRouterKeyId(it->first),(*it2) ) ;
 
     mRoutingClues.clear() ;
-    
-    for(std::list<std::pair<RsGxsMessageId,RsPeerId> >::const_iterator it = mTrackingClues.begin();it!=mTrackingClues.end();++it)
-	    rsGRouter->addTrackingInfo((*it).first,(*it).second) ;
-    
-    mTrackingClues.clear() ;
 }
 
 void RsGenExchange::processGroupDelete()
@@ -2732,9 +2724,6 @@ void RsGenExchange::processRecvdMessages()
 
 				    if(!msg->metaData->mAuthorId.isNull())
 					    mRoutingClues[msg->metaData->mAuthorId].insert(msg->PeerId()) ;
-
-				    if(grpMeta->mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES)
-					    mTrackingClues.push_back(std::make_pair(msg->msgId,msg->PeerId())) ;
 			    }
 
 			    if(validateReturn == VALIDATE_FAIL)

libretroshare/src/retroshare/rsgrouter.h

@@ -103,9 +103,6 @@ public:
     //===================================================//
 
     virtual void addRoutingClue(const GRouterKeyId& destination, const RsPeerId& source) =0;
-    virtual void addTrackingInfo(const RsGxsMessageId& mid,const RsPeerId& peer_id) =0;
-    
-    virtual bool getTrackingInfo(const RsGxsMessageId& mid, RsPeerId& provider_id) =0;
 };
 
 // To access the GRouter from anywhere

libretroshare/src/retroshare/rsgxsflags.h

@@ -33,7 +33,7 @@ namespace GXS_SERV {
     static const uint32_t FLAG_AUTHOR_AUTHENTICATION_GPG            = 0x00000100;
     static const uint32_t FLAG_AUTHOR_AUTHENTICATION_REQUIRED       = 0x00000200;
     static const uint32_t FLAG_AUTHOR_AUTHENTICATION_IFNOPUBSIGN    = 0x00000400;
-    static const uint32_t FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES = 0x00000800;
+    static const uint32_t FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES = 0x00000800;	// not used anymore
     static const uint32_t FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN      = 0x00001000;
 
     static const uint32_t FLAG_GROUP_SIGN_PUBLISH_MASK       = 0x000000ff;

retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp

@@ -301,8 +301,6 @@ void GxsGroupDialog::setupDefaults()
 			ui.commentsValueLabel->setText(tr("Allowed"));
 		}
 	}
-	    ui.antiSpam_trackMessages->setChecked((bool)(mDefaultsFlags & GXS_GROUP_DEFAULTS_ANTISPAM_TRACK));
-        
         if( (mDefaultsFlags & GXS_GROUP_DEFAULTS_ANTISPAM_FAVOR_PGP) && (mDefaultsFlags & GXS_GROUP_DEFAULTS_ANTISPAM_FAVOR_PGP_KNOWN))
 		ui.antiSpam_perms_CB->setCurrentIndex(2) ;
         else if(mDefaultsFlags & GXS_GROUP_DEFAULTS_ANTISPAM_FAVOR_PGP)
@@ -656,9 +654,6 @@ uint32_t GxsGroupDialog::getGroupSignFlags()
 	    break ;
     }
 
-    if (ui.antiSpam_trackMessages->isChecked()) 
-	    signFlags |= GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES;
-
     return signFlags;
 }
 
@@ -680,8 +675,6 @@ void GxsGroupDialog::setGroupSignFlags(uint32_t signFlags)
 	if (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_IFNOPUBSIGN) 
 		ui.personal_ifnopub->setChecked(true);
     
-		ui.antiSpam_trackMessages  ->setChecked((bool)(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES) );
-        
         		if( (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN) && (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG))
                     ui.antiSpam_perms_CB->setCurrentIndex(2) ;
                 else if(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG)

retroshare-gui/src/gui/gxs/GxsGroupDialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>860</width>
+    <width>1237</width>
-    <height>775</height>
+    <height>790</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -582,16 +582,6 @@
             </item>
            </widget>
           </item>
-          <item>
-           <widget class="QRadioButton" name="antiSpam_trackMessages">
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;This feature allows Retroshare to locally keep a record of who forwarded each message to you, for the last 10 days. Although useless if alone (and already available whatsoever) this information can be used by a group of teamed-up friends to easily locate a source of spams. To be used with care, since it significantly decreases the anonymity of message posts.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Keep track of posts</string>
-            </property>
-           </widget>
-          </item>
           <item>
            <spacer name="horizontalSpacer_8">
             <property name="orientation">

retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp

@@ -577,17 +577,6 @@ void GxsForumThreadWidget::changedThread()
 		mThreadId = RsGxsMessageId(item->data(COLUMN_THREAD_DATA, ROLE_THREAD_MSGID).toString().toStdString());
 	}
 
-    	// Show info about who passed on this message.
-    	if(mForumGroup.mMeta.mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES) 
-        {
-            RsPeerId providerId ;
-	    std::string msgId = item->data(COLUMN_THREAD_DATA, ROLE_THREAD_MSGID).toString().toStdString();
-        	RsGxsMessageId mid(msgId) ;
-            
-            if(rsGRouter->getTrackingInfo(mid,providerId) && !providerId.isNull() )
-		item->setToolTip(COLUMN_THREAD_TITLE,tr("This message was obtained from %1").arg(QString::fromUtf8(rsPeers->getPeerName(providerId).c_str())));
-        }
-        
 	if (mFillThread) {
 		return;
 	}