Merge pull request #276 from jolavillette/FixTheWire

TheWire: Add token-free subscribe API for UI simplification

Author: csoler

src/retroshare/rswire.h

@@ -274,6 +274,11 @@ virtual bool getPulseFocus(const RsGxsGroupId &groupId, const RsGxsMessageId &ms
                                       std::vector<RsMsgMetaData>& summaries ) = 0;
 
     virtual bool subscribeToGroup(uint32_t& token, const RsGxsGroupId& groupId, bool subscribe) = 0;
+
+    // Simple subscribe/unsubscribe API without token management (for UI use)
+    // Tokens are handled internally by libretroshare
+    virtual bool subscribe(const RsGxsGroupId& groupId, bool subscribe) = 0;
+
     virtual uint32_t getFollowingCount() = 0;
     virtual bool getSubscribedGroups(std::list<RsGxsGroupId>& groupIds) = 0;
 

src/services/p3wire.cc

@@ -1919,6 +1919,18 @@ bool p3Wire::subscribeToGroup(uint32_t& token, const RsGxsGroupId& groupId, bool
     return response;
 }
 
+bool p3Wire::subscribe(const RsGxsGroupId& groupId, bool subscribe)
+{
+#ifdef WIRE_DEBUG
+    std::cerr << "p3Wire::subscribe() id: " << groupId << " subscribe: " << subscribe;
+    std::cerr << std::endl;
+#endif
+
+    // Token is managed internally - UI doesn't need to handle it
+    uint32_t token;
+    return subscribeToGroup(token, groupId, subscribe);
+}
+
 void p3Wire::refreshSubscribedGroups()
 {
     uint32_t token;

src/services/p3wire.h

@@ -94,6 +94,10 @@ class p3Wire: public RsGenExchange, public RsWire, public p3Config
     void setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read) override;
 
     bool subscribeToGroup(uint32_t& token, const RsGxsGroupId& groupId, bool subscribe) override;
+
+    // Simple subscribe/unsubscribe API without token management (for UI use)
+    bool subscribe(const RsGxsGroupId& groupId, bool subscribe) override;
+
     uint32_t getFollowingCount() override;
     bool getSubscribedGroups(std::list<RsGxsGroupId>& groupIds) override;