Move xml.Encoder to session struct

The encoderDecoder sub-struct of the session struct should be removed in
little steps. This is the first one.

1 files changed, 3 insertions, 9 deletions

diff --git a/xmpp/xml.go b/xmpp/xml.go
index b0ea77b..f547210 100644
--- a/xmpp/xml.go
+++ b/xmpp/xml.go
@@ -9,7 +9,6 @@ import (
 
 type encoderDecoder struct {
 	session    *session
-	tx         *xml.Encoder
 	rx         *xml.Decoder
 	terminator chan bool
 }
@@ -19,11 +18,6 @@ func newEncoderDecoder(s *session) encoderDecoder {
 
 	ed.session = s
 
-	lw := logger{"[TX] "}
-	w := io.MultiWriter(s.transport, lw)
-	ed.tx = xml.NewEncoder(w)
-	ed.tx.Indent("", "")
-
 	lr := logger{"[RX] "}
 	r := io.TeeReader(s.transport, lr)
 	ed.rx = xml.NewDecoder(r)
@@ -31,7 +25,7 @@ func newEncoderDecoder(s *session) encoderDecoder {
 	return ed
 }
 
-func (ed *encoderDecoder) encodeToken(t xml.Token) error {
+func (s *session) encodeToken(t xml.Token) error {
 	var err error
 	defer func() {
 		if err != nil {
@@ -39,11 +33,11 @@ func (ed *encoderDecoder) encodeToken(t xml.Token) error {
 		}
 	}()
 
-	err = ed.tx.EncodeToken(t)
+	err = s.tx.EncodeToken(t)
 	if err != nil {
 		return err
 	}
-	err = ed.tx.Flush()
+	err = s.tx.Flush()
 	if err != nil {
 		return err
 	}