4 files changed, 123 insertions, 21 deletions
diff --git a/ui/qt/qwhisper/message.go b/ui/qt/qwhisper/message.go
new file mode 100644
index 000000000..26e72ac93
--- /dev/null
+++ b/ui/qt/qwhisper/message.go
@@ -0,0 +1,23 @@
+package qwhisper
+
+import (
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethutil"
+	"github.com/ethereum/go-ethereum/whisper"
+)
+
+type Message struct {
+	ref     *whisper.Message
+	Flags   int32  `json:"flags"`
+	Payload string `json:"payload"`
+	From    string `json:"from"`
+}
+
+func ToQMessage(msg *whisper.Message) *Message {
+	return &Message{
+		ref:     msg,
+		Flags:   int32(msg.Flags),
+		Payload: "0x" + ethutil.Bytes2Hex(msg.Payload),
+		From:    "0x" + ethutil.Bytes2Hex(crypto.FromECDSAPub(msg.Recover())),
+	}
+}
diff --git a/ui/qt/qwhisper/watch.go b/ui/qt/qwhisper/watch.go
new file mode 100644
index 000000000..0ccedc719
--- /dev/null
+++ b/ui/qt/qwhisper/watch.go
@@ -0,0 +1,13 @@
+package qwhisper
+
+import (
+	"fmt"
+	"unsafe"
+)
+
+type Watch struct {
+}
+
+func (self *Watch) Arrived(v unsafe.Pointer) {
+	fmt.Println(v)
+}
diff --git a/ui/qt/qwhisper/whisper.go b/ui/qt/qwhisper/whisper.go
index bed23c8a7..2bc455b0b 100644
--- a/ui/qt/qwhisper/whisper.go
+++ b/ui/qt/qwhisper/whisper.go
@@ -1,3 +1,4 @@
+// QWhisper package. This package is temporarily on hold until QML DApp dev will reemerge.
 package qwhisper
 
 import (
@@ -5,9 +6,13 @@ import (
 
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethutil"
+	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/whisper"
+	"github.com/obscuren/qml"
 )
 
+var qlogger = logger.NewLogger("QSHH")
+
 func fromHex(s string) []byte {
 	if len(s) > 1 {
 		return ethutil.Hex2Bytes(s[2:])
@@ -18,53 +23,99 @@ func toHex(b []byte) string { return "0x" + ethutil.Bytes2Hex(b) }
 
 type Whisper struct {
 	*whisper.Whisper
+	view qml.Object
+
+	watches map[int]*Watch
 }
 
 func New(w *whisper.Whisper) *Whisper {
-	return &Whisper{w}
+	return &Whisper{w, nil, make(map[int]*Watch)}
+}
+
+func (self *Whisper) SetView(view qml.Object) {
+	self.view = view
 }
 
-func (self *Whisper) Post(data string, pow, ttl uint32, to, from string) {
-	msg := whisper.NewMessage(fromHex(data))
-	envelope, err := msg.Seal(time.Duration(pow), whisper.Opts{
-		Ttl:  time.Duration(ttl),
-		To:   crypto.ToECDSAPub(fromHex(to)),
-		From: crypto.ToECDSA(fromHex(from)),
-	})
-	if err != nil {
-		// handle error
-		return
+func (self *Whisper) Post(payload []string, to, from string, topics []string, priority, ttl uint32) {
+	var data []byte
+	for _, d := range payload {
+		data = append(data, fromHex(d)...)
 	}
 
-	if err := self.Whisper.Send(envelope); err != nil {
-		// handle error
-		return
+	pk := crypto.ToECDSAPub(fromHex(from))
+	if key := self.Whisper.GetIdentity(pk); key != nil {
+		msg := whisper.NewMessage(data)
+		envelope, err := msg.Seal(time.Duration(priority*100000), whisper.Opts{
+			Ttl:    time.Duration(ttl) * time.Second,
+			To:     crypto.ToECDSAPub(fromHex(to)),
+			From:   key,
+			Topics: whisper.TopicsFromString(topics...),
+		})
+
+		if err != nil {
+			qlogger.Infoln(err)
+			// handle error
+			return
+		}
+
+		if err := self.Whisper.Send(envelope); err != nil {
+			qlogger.Infoln(err)
+			// handle error
+			return
+		}
+	} else {
+		qlogger.Infoln("unmatched pub / priv for seal")
 	}
+
 }
 
 func (self *Whisper) NewIdentity() string {
-	return toHex(self.Whisper.NewIdentity().D.Bytes())
+	key := self.Whisper.NewIdentity()
+
+	return toHex(crypto.FromECDSAPub(&key.PublicKey))
 }
 
-func (self *Whisper) HasIdentify(key string) bool {
-	return self.Whisper.HasIdentity(crypto.ToECDSA(fromHex(key)))
+func (self *Whisper) HasIdentity(key string) bool {
+	return self.Whisper.HasIdentity(crypto.ToECDSAPub(fromHex(key)))
 }
 
-func (self *Whisper) Watch(opts map[string]interface{}) {
+func (self *Whisper) Watch(opts map[string]interface{}, view *qml.Common) int {
 	filter := filterFromMap(opts)
+	var i int
 	filter.Fn = func(msg *whisper.Message) {
-		// TODO POST TO QT WINDOW
+		if view != nil {
+			view.Call("onShhMessage", ToQMessage(msg), i)
+		}
 	}
-	self.Whisper.Watch(filter)
+
+	i = self.Whisper.Watch(filter)
+	self.watches[i] = &Watch{}
+
+	return i
+}
+
+func (self *Whisper) Messages(id int) (messages *ethutil.List) {
+	msgs := self.Whisper.Messages(id)
+	messages = ethutil.EmptyList()
+	for _, message := range msgs {
+		messages.Append(ToQMessage(message))
+	}
+
+	return
 }
 
 func filterFromMap(opts map[string]interface{}) (f whisper.Filter) {
 	if to, ok := opts["to"].(string); ok {
-		f.To = crypto.ToECDSA(fromHex(to))
+		f.To = crypto.ToECDSAPub(fromHex(to))
 	}
 	if from, ok := opts["from"].(string); ok {
 		f.From = crypto.ToECDSAPub(fromHex(from))
 	}
+	if topicList, ok := opts["topics"].(*qml.List); ok {
+		var topics []string
+		topicList.Convert(&topics)
+		f.Topics = whisper.TopicsFromString(topics...)
+	}
 
 	return
 }
diff --git a/ui/qt/qwhisper/whisper_test.go b/ui/qt/qwhisper/whisper_test.go
new file mode 100644
index 000000000..efa4e6238
--- /dev/null
+++ b/ui/qt/qwhisper/whisper_test.go
@@ -0,0 +1,15 @@
+package qwhisper
+
+import (
+	"testing"
+
+	"github.com/ethereum/go-ethereum/whisper"
+)
+
+func TestHasIdentity(t *testing.T) {
+	qw := New(whisper.New())
+	id := qw.NewIdentity()
+	if !qw.HasIdentity(id) {
+		t.Error("expected to have identity")
+	}
+}