Merge pull request #3 from hoppler/master

Fix for "Nullable object must have a value"
smiziara · Oct 25, 2012 · b1eee32 · b1eee32
2 parents 58d73a3 + a59e78c
commit b1eee32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/WhatsAppApi/Parser/FMessage.cs b/src/WhatsAppApi/Parser/FMessage.cs
@@ -296,7 +296,7 @@ public bool Instantiated()
 
             public FMessage.Key Key()
             {
-                return new FMessage.Key(this.remote_jid, this.from_me.Value, this.id);
+                return new FMessage.Key(this.remote_jid, (!this.from_me.HasValue && this.from_me.Value), this.id);
             }
 
             public FMessage.Builder Key(FMessage.Key key)

diff --git a/src/WhatsAppApi/Response/MessageRecvResponse.cs b/src/WhatsAppApi/Response/MessageRecvResponse.cs
@@ -247,7 +247,12 @@ private void TypeChat(ProtocolTreeNode messageNode, string tmpAttrFrom, string t
                 {
                     var tmpAttrName = itemNode.GetAttribute("name");
                     if (tmpAttrName != null)
+                    {
+                        builder.from_me = false;
+                        builder.id = tmpAttrbId;
+                        builder.remote_jid = tmpAttrFromJid;
                         builder.Key().serverNickname = tmpAttrName;
+                    }
                 }
             }
             if (!builder.Timestamp().HasValue)