瀏覽代碼

Concat and pad data

obscuren 11 年之前
父節點
當前提交
e32f7baa0d
共有 3 個文件被更改,包括 11 次插入5 次删除
  1. 3 2
      cmd/mist/assets/qml/browser.qml
  2. 1 1
      cmd/mist/assets/qml/views/whisper.qml
  3. 7 2
      ui/qt/qwhisper/whisper.go

+ 3 - 2
cmd/mist/assets/qml/browser.qml

@@ -59,7 +59,8 @@ Rectangle {
     }
 
     Component.onCompleted: {
-        webview.url = "http://etherian.io"
+        //webview.url = "http://etherian.io"
+	webview.url = "file:///Users/jeffrey/test.html"
     }
 
     signal messages(var messages, int id);
@@ -350,7 +351,7 @@ Rectangle {
 			for(var i = 0; i < fields.length; i++) {
 				params[fields[i]] = params[fields[i]] || "";
 			}
-			if(typeof params.payload === "object") { params.payload = params.payload.join(""); }
+			if(typeof params.payload !== "object") { params.payload = [params.payload]; } //params.payload = params.payload.join(""); }
 			params.topics = params.topics || [];
 			params.priority = params.priority || 1000;
 			params.ttl = params.ttl || 100;

+ 1 - 1
cmd/mist/assets/qml/views/whisper.qml

@@ -52,7 +52,7 @@ Rectangle {
 		Button {
 			text: "Send"
 			onClicked: {
-				shh.post(eth.toHex(data.text), "", identity, topics.text.split(","), 500, 50)
+				shh.post([eth.toHex(data.text)], "", identity, topics.text.split(","), 500, 50)
 			}
 		}
 	}

+ 7 - 2
ui/qt/qwhisper/whisper.go

@@ -33,8 +33,13 @@ func (self *Whisper) SetView(view qml.Object) {
 	self.view = view
 }
 
-func (self *Whisper) Post(data, to, from string, topics []string, priority, ttl uint32) {
-	msg := whisper.NewMessage(fromHex(data))
+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)...)
+	}
+
+	msg := whisper.NewMessage(data)
 	envelope, err := msg.Seal(time.Duration(priority*100000), whisper.Opts{
 		Ttl:    time.Duration(ttl),
 		To:     crypto.ToECDSAPub(fromHex(to)),