Merge pull request #1 from hossinasaadi/hossinasaadi-dev

add getJid method to ResultGetPictureIqProtocolEntity

yowsup/layers/protocol_profiles/protocolentities/iq_picture_get_result.py

@@ -10,12 +10,15 @@ class ResultGetPictureIqProtocolEntity(PictureIqProtocolEntity):
     '''
     def __init__(self, jid, pictureData, pictureId, preview = True, _id = None):
         super(ResultGetPictureIqProtocolEntity, self).__init__(jid, _id, "result")
-        self.setResultPictureProps(pictureData, pictureId, preview)
+        self.setResultPictureProps(jid, pictureData, pictureId, preview)
+
 
-    def setResultPictureProps(self, pictureData, pictureId, preview = True):
+
+    def setResultPictureProps(self,jid , pictureData, pictureId, preview = True ):
         self.preview = preview
         self.pictureData = pictureData
         self.pictureId = pictureId
+        self.jid = jid
 
     def isPreview(self):
         return self.preview
@@ -26,6 +29,9 @@ def getPictureData(self):
     def getPictureId(self):
         return self.pictureId
 
+    def getJid(self):
+        return self.jid
+
     def writeToFile(self, path):
         with open(path, "wb") as outFile:
             outFile.write(self.getPictureData())
@@ -41,5 +47,5 @@ def fromProtocolTreeNode(node):
         entity = PictureIqProtocolEntity.fromProtocolTreeNode(node)
         entity.__class__ = ResultGetPictureIqProtocolEntity
         pictureNode = node.getChild("picture")
-        entity.setResultPictureProps(pictureNode.getData(), pictureNode.getAttributeValue("id"), pictureNode.getAttributeValue("type") == "preview")
-        return entity
+        entity.setResultPictureProps(node.getAttributeValue("from"),pictureNode.getData(), pictureNode.getAttributeValue("id"), pictureNode.getAttributeValue("type") == "preview")
+        return entity