Test

.gitattributes

@@ -1,49 +1,22 @@
-*.doc  diff=astextplain
-*.DOC	diff=astextplain
-*.docx	diff=astextplain
-*.DOCX	diff=astextplain
-*.dot	diff=astextplain
-*.DOT	diff=astextplain
-*.pdf	diff=astextplain
-*.PDF	diff=astextplain
-*.rtf	diff=astextplain
-*.RTF	diff=astextplain
+# Auto detect text files and perform LF normalization
+* text=auto
 
-*.jpg  	binary
-*.png 	binary
-*.gif 	binary
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
 
-*.cs text=auto diff=csharp 
-*.vb text=auto
-*.c text=auto
-*.cpp text=auto
-*.cxx text=auto
-*.h text=auto
-*.hxx text=auto
-*.py text=auto
-*.rb text=auto
-*.java text=auto
-*.html text=auto
-*.htm text=auto
-*.css text=auto
-*.scss text=auto
-*.sass text=auto
-*.less text=auto
-*.js text=auto
-*.lisp text=auto
-*.clj text=auto
-*.sql text=auto
-*.php text=auto
-*.lua text=auto
-*.m text=auto
-*.asm text=auto
-*.erl text=auto
-*.fs text=auto
-*.fsx text=auto
-*.hs text=auto
-
-*.csproj text=auto merge=union 
-*.vbproj text=auto merge=union 
-*.fsproj text=auto merge=union 
-*.dbproj text=auto merge=union 
-*.sln text=auto eol=crlf merge=union 
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.gitignore

@@ -1,18 +1,19 @@
-
 #################
 ## Eclipse
 #################
 
 *.pydevproject
 .project
 .metadata
-bin/**
-tmp/**
-tmp/**/*
+bin/
+obj/
+tmp/
 *.tmp
 *.bak
 *.swp
 *~.nib
+*.pdb
+*.cache
 local.properties
 .classpath
 .settings/
@@ -44,8 +45,8 @@ local.properties
 *.sln.docstates
 
 # Build results
-**/[Dd]ebug/
-**/[Rr]elease/
+[Dd]ebug/
+[Rr]elease/
 *_i.c
 *_p.c
 *.ilk
@@ -63,10 +64,10 @@ local.properties
 *.tmp
 *.vspscc
 .builds
-**/*.dotCover
+*.dotCover
 
 ## TODO: If you have NuGet Package Restore enabled, uncomment this
-#**/packages/ 
+#packages/
 
 # Visual C++ cache files
 ipch/
@@ -82,7 +83,7 @@ ipch/
 # ReSharper is a .NET coding add-in
 _ReSharper*
 
-# Installshield output folder 
+# Installshield output folder
 [Ee]xpress
 
 # DocProject is a documentation generator add-in
@@ -123,7 +124,7 @@ UpgradeLog*.XML
 ############
 
 # Windows image file caches
-Thumbs.db 
+Thumbs.db
 
 # Folder config file
 Desktop.ini

README.md

@@ -0,0 +1,38 @@
+WhatsAPINet
+===========
+
+This is a API written in C# but it can be used in any .NET language. It's a fork from WhatsAPINet, which is based on WhatsAPI.
+The goal of this fork is to make it all work again and refacter the code, add documentation and write documentation
+on how Whatsapp works.
+
+## Documentation
+* FunXMPP Protocol - https://github.com/TheKirk/WhatsAPINet/wiki/FunXMPP
+
+## Protocol
+The WhatsApp protocol is sadly not officially documented. While working on this
+project, I will try to document most of my progress in the docs folder.
+
+The protocol is based on the XML-based XMPP protocol, a heavily documented
+internet messaging protocol. To reduce the XML overhead, the XML structure and a
+lot of common keywords are converted into bytes. See docs/funxmpp.txt for a
+more detailed explanation. Sadly, the XMPP standard is not followed exactly
+everywhere.
+
+* Protocol wrapper: FunXMPP (see Wiki)
+* Main protocol: XMPP (http://xmpp.org/rfcs/rfc6120.html)
+* Authentification: SASL, digest auth (http://tools.ietf.org/html/rfc2831)
+* Blocking: XMPP privacy lists? (http://xmpp.org/extensions/xep-0016.html)
+* Ping (http://xmpp.org/extensions/xep-0199.html)
+
+### Encryption
+
+Following the news that WhatsApp messages were sent in plaintext (and thus
+readable for everyone when on a WiFi hotspot), encryption was added. At least
+the Android client uses this encryption, which seems to be TLS as specified by
+the XMPP RFC. However, I did not really look into this. Also, the mapping of
+keywords to bytes seems to have also changed in the latest version of the
+Android app.
+
+
+### Code request token
+The current implementation for token generation is created by [pastoso](https://github.com/pastoso).

src/WhatsAppApi/Account/WhatsUser.cs → WhatsAppApi/Account/WhatsUser.cs

@@ -21,7 +21,7 @@ public WhatsUser(string jid, string srvUrl, string nickname = "")
 
         public string GetFullJid()
         {
-            return string.Format("{0}@{1}", this.Jid, this.serverUrl);
+            return WhatsAppApi.WhatsApp.GetJID(this.Jid);
         }
 
         internal void SetServerUrl(string srvUrl)

src/WhatsAppApi/Account/WhatsUserManager.cs → WhatsAppApi/Account/WhatsUserManager.cs

@@ -26,7 +26,11 @@ public WhatsUser CreateUser(string jid, string nickname = "")
             if (this.userList.ContainsKey(jid))
                 return this.userList[jid];
 
-            var tmpUser = new WhatsUser(jid, WhatsConstants.WhatsAppServer, nickname);
+            string server = WhatsConstants.WhatsAppServer;
+            if (jid.Contains("-"))
+                server = WhatsConstants.WhatsGroupChat;
+
+            var tmpUser = new WhatsUser(jid, server, nickname);
             this.userList.Add(jid, tmpUser);
             return tmpUser;
         }