Release 1.2.2

Author: oykmnk

README.md

@@ -7,7 +7,7 @@ It supports next features:
 - devices autodiscovery by `Rendezvous string`
 - topic list exchanging between peers
 - autoconnect group chats by `PubSub`
-- default signing and validating messages (crypto) *[validation is temporary off, due to the incorrect signing messages on Android]*
+- default signing and validating messages (crypto)
 - crossplatform
 
 

cmd/main.go

@@ -237,7 +237,7 @@ MainLoop:
 			break MainLoop
 		case msg := <-incomingMessages:
 			{
-				handler.HandleIncomingMessage(msg, func(textMessage pkg.TextMessage) {
+				handler.HandleIncomingMessage(serviceTopic, msg, func(textMessage pkg.TextMessage) {
 					// Green console colour: 	\x1b[32m
 					// Reset console colour: 	\x1b[0m
 					fmt.Printf("%s > \x1b[32m%s\x1b[0m", textMessage.From, textMessage.Body)

pkg/handler.go

@@ -23,8 +23,9 @@ type Handler struct {
 
 // TextMessage is more end-user model of regular text messages
 type TextMessage struct {
-	Body string
-	From peer.ID
+	Topic string
+	Body  string
+	From  peer.ID
 }
 
 func NewHandler(pb *pubsub.PubSub, serviceTopic string, networkTopics *mapset.Set) Handler {
@@ -35,8 +36,7 @@ func NewHandler(pb *pubsub.PubSub, serviceTopic string, networkTopics *mapset.Se
 	}
 }
 
-func (h *Handler) HandleIncomingMessage(msg pubsub.Message, handleTextMessage func(TextMessage)) {
-	//	var pbMutex sync.Mutex
+func (h *Handler) HandleIncomingMessage(topic string, msg pubsub.Message, handleTextMessage func(TextMessage)) {
 	addr, err := peer.IDFromBytes(msg.From)
 	if err != nil {
 		fmt.Println("Error occurred when reading message From field...")
@@ -51,8 +51,9 @@ func (h *Handler) HandleIncomingMessage(msg pubsub.Message, handleTextMessage fu
 	// Getting regular message
 	case api.FLAG_GENERIC_MESSAGE:
 		textMessage := TextMessage{
-			Body: message.Body,
-			From: addr,
+			Topic: topic,
+			Body:  message.Body,
+			From:  addr,
 		}
 
 		handleTextMessage(textMessage)