Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add WhatsApp protocol support in Xabber #248

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
71102c0
Starting to add WhatsApp protocol stuff.
davidgfnet Aug 15, 2013
5b52c61
Adding whatsapp protocol internals. Translated from libpurple impleme…
davidgfnet Aug 15, 2013
cf5e0fe
Putting aside some files for some time. Seems to build ok and the Wha…
davidgfnet Aug 16, 2013
a759375
More WA protocol classes.
davidgfnet Aug 16, 2013
c58e5d0
Fixing some bugs and adding more functions for WhatsApp protocol func…
davidgfnet Aug 17, 2013
037bd31
Adding WA connection class wrapper.
davidgfnet Aug 17, 2013
288f9f3
Adding message serialization and socket read/write stuff.
davidgfnet Aug 17, 2013
16ef9e1
Fixed many bugs and added integration in the system.
davidgfnet Aug 21, 2013
b4a2ea9
Fixed many bugs. Now we are able to communicate with the servers and …
davidgfnet Aug 21, 2013
ad1aa7c
Fixed many bugs with auth. Now auth works!
davidgfnet Aug 22, 2013
518e6b9
Bit of cleanup.
davidgfnet Aug 22, 2013
db86318
Connect & login working!
davidgfnet Aug 22, 2013
2785d07
Message sending works.
davidgfnet Aug 22, 2013
5749171
Fixed many java related bugs.
davidgfnet Aug 23, 2013
28fdc14
Chat working more or less.
davidgfnet Aug 23, 2013
4cc20d6
Add makefile to remember build commands
davidgfnet Aug 23, 2013
9cd5e65
Added rather simple support for image chats.
davidgfnet Aug 24, 2013
f57034e
Adding permanent contacts using a SQLite table.
davidgfnet Aug 24, 2013
0c8304f
Fixed small issue with contact addition startup :)
davidgfnet Aug 24, 2013
b406df2
Added avatar support.
davidgfnet Aug 25, 2013
e3a3d70
Disabling debug output
davidgfnet Aug 25, 2013
6bdd1e7
Support for timestamp in incoming messages.
davidgfnet Aug 27, 2013
e41b76a
Adding presence sending.
davidgfnet Aug 27, 2013
c57f39f
Adding feature: sending status message along with status.
davidgfnet Aug 27, 2013
015a730
Fix small NullPointerException bug due to presence setting when disco…
davidgfnet Aug 31, 2013
4b7f81c
Adding support for group chats.
davidgfnet Sep 1, 2013
44cf312
Adding "RESOURCE" as nickname for WA accounts.
davidgfnet Sep 1, 2013
fbdb370
Correct small bug which prevented build.
davidgfnet Sep 2, 2013
8c1b0bc
Cleanup of dead code
davidgfnet Sep 15, 2013
2f4f857
More cleanup
davidgfnet Sep 15, 2013
48f113b
Add last seen at the VCard notes field.
davidgfnet Sep 15, 2013
604c9ec
Start adding HTTPS interface for user statuses
davidgfnet Sep 15, 2013
9be0f3c
Update WA protocol to V1.4.
davidgfnet Feb 1, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add last seen at the VCard notes field.
davidgfnet committed Sep 15, 2013
commit 48f113b597d2e6c8407276ce5f523c0037b1a8a4
4 changes: 4 additions & 0 deletions src/net/davidgf/android/WAConnection.java
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
import org.jivesoftware.smack.packet.RosterPacket;
import org.jivesoftware.smack.packet.IQ;
import com.xabber.xmpp.vcard.VCard;
import com.xabber.xmpp.vcard.VCardProperty;
import com.xabber.xmpp.vcard.BinaryPhoto;
import com.xabber.android.data.connection.ConnectionThread;
import com.xabber.android.data.account.AccountItem;
@@ -383,6 +384,9 @@ public void sendPacket(Packet packet) {
// The request for a VCard has been queued, now we should provide the Avatar!
packet.setFrom(packet.getTo());
VCard vc = (VCard)packet;

// Last seen at notes
vc.getProperties().put(VCardProperty.NOTE,waconnection.getNotes(packet.getFrom()));

BinaryPhoto bp = new BinaryPhoto();
bp.setData(waconnection.getUserAvatar(packet.getFrom()));
88 changes: 81 additions & 7 deletions src/net/davidgf/android/WhatsappConnection.java
Original file line number Diff line number Diff line change
@@ -196,6 +196,7 @@ else if (t.getTag().equals("success")) {
for (int i = 0; i < contacts.size(); i++) {
subscribePresence(contacts.get(i).phone);
queryPreview(contacts.get(i).phone);
getLastSeen(contacts.get(i).phone);
}
}
else if (t.getTag().equals("presence")) {
@@ -210,6 +211,9 @@ else if (t.getTag().equals("presence")) {
presp.setFrom(MiscUtil.getUser(t.getAttribute("from")));
presp.setTo(MiscUtil.getUser(phone));
received_packets.add(presp);

// Schedule the last seen querying
getLastSeen(t.getAttribute("from"));
}
}
else if (t.getTag().equals("iq")) {
@@ -225,6 +229,12 @@ else if (t.getTag().equals("iq")) {
if (tb.hasAttributeValue("type","preview"))
this.addPreviewPicture(t.getAttribute("from"),tb.getData());
}
tb = t.getChild("query");
if (tb != null) {
if (tb.hasAttributeValue("xmlns","jabber:iq:last") && tb.hasAttribute("seconds")) {
this.notifyLastSeen(t.getAttribute("from"),tb.getAttribute("seconds"));
}
}
}

// Group stuff
@@ -336,6 +346,48 @@ else if (t.getTag().equals("message")) {
}*/
}

private String last_seen_text(long t) {
if (t < 60)
return String.valueOf(t) + " seconds ago";
else if (t < 60*60)
return String.valueOf(t/60) + " minute(s) ago";
else if (t < 60*60*24)
return String.valueOf(t/60/60) + " hour(s) ago";
else if (t < 48*60*60)
return "yesterday";
else
return String.valueOf(t/60/60/24) + " day(s) ago";
}

private void notifyLastSeen(final String from, final String seconds) {
final String u = MiscUtil.getUser(from);
final long sec = Integer.parseInt(seconds);

// Save last seen time
for (int i = 0; i < contacts.size(); i++) {
if (contacts.get(i).phone.equals(u)) {
contacts.get(i).last_seen = sec;
break;
}
}

requestVCardUpdate(u);
}

public String getNotes(String u) {
u = MiscUtil.getUser(u);

String note = "";
for (int i = 0; i < contacts.size(); i++) {
if (contacts.get(i).phone.equals(u)) {
note = "Last seen: " + last_seen_text(contacts.get(i).last_seen);
break;
}
}

return note;
}

public void pushGroupUpdate() {
for (Map.Entry <String, Group> entry : groups.entrySet()) {
// Create room
@@ -461,13 +513,24 @@ private void addPreviewPicture(String user, byte [] picture) {
}
}

VCardUpdate vc = new VCardUpdate();
vc.setPhotoHash(MiscUtil.getEncodedSha1Sum(picture));
Presence p = new Presence(Presence.Type.subscribed);
p.setTo(phone);
p.setFrom(user);
p.addExtension(vc);
received_packets.add(p);
requestVCardUpdate(user);
}

private void requestVCardUpdate(String user) {
user = MiscUtil.getUser(user);

for (int i = 0; i < contacts.size(); i++) {
if (contacts.get(i).phone.equals(user)) {
VCardUpdate vc = new VCardUpdate();
vc.setPhotoHash(MiscUtil.getEncodedSha1Sum(contacts.get(i).ppprev));
Presence p = new Presence(Presence.Type.subscribed);
p.setTo(phone);
p.setFrom(user);
p.addExtension(vc);
received_packets.add(p);
break;
}
}
}

private void receiveMessage(AbstractMessage msg) {
@@ -641,6 +704,7 @@ public void addContact(String user, boolean user_request) {
if (conn_status == SessionStatus.SessionConnected) {
subscribePresence(user);
queryPreview(user);
getLastSeen(user);
}
}

@@ -660,6 +724,16 @@ public void subscribePresence(String user) {
received_packets.add(presp);
}

private void getLastSeen(final String user) {
final String id = String.valueOf(++iqid);
final String fuser = MiscUtil.getUser(user)+"@"+whatsappserver;
Tree iq = new Tree("iq",
new HashMap < String,String >() {{ put("id",id); put("type","get"); put("to",fuser); }} );
Tree req = new Tree("query", new HashMap < String,String >() {{ put("xmlns","jabber:iq:last"); }} );
iq.addChild(req);

outbuffer = outbuffer.addBuf(new DataBuffer(serialize_tree(iq,true)));
}

public byte [] getWriteData() {
byte [] r = outbuffer.getPtr();