webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-01 20:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

include decoding contact and group attachments. requires more access to the Manager

Browse source
This commit is contained in:
Jack Schmidt 2017-02-28 01:21:12 -05:00
parent 57067db6ae
commit 669801edbe
2 changed files with 71 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
View file

@ -1,6 +1,7 @@
package org.asamk.signal;
import org.asamk.signal.util.Base64;
import org.asamk.signal.util.Util;
import org.json.JSONObject;
import org.json.JSONArray;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
@ -12,6 +13,7 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import java.io.File;
import java.io.IOException;
import java.io.Writer;
import java.nio.file.Files;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@ -267,4 +269,70 @@ public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler
return df.format(date);
}
private final JSONArray jsonGroupsAttachment( SignalServiceAttachment groupsAttachment ) {
final JSONArray groups = new JSONArray();
File tmpFile = null;
try {
tmpFile = Util.createTempFile();
final DeviceGroupsInputStream s = new DeviceGroupsInputStream(
m.retrieveAttachmentAsStream(groupsAttachment.asPointer(), tmpFile ) );
DeviceGroup g;
while ((g = s.read()) != null) {
final JSONObject group = new JSONObject();
group.put("id", Base64.encodeBytes( g.getId() ) );
group.put("isActive", g.isActive() );
group.put("members", jsonListOfStrings( g.getMembers() ) );
if(g.getName().isPresent())
group.put("name", g.getName().get() );
if (g.getAvatar().isPresent()) // group.put("avatar", jsonAttachment( g.getAvatar().get() ) );
m.retrieveGroupAvatarAttachment(g.getAvatar().get(), g.getId() );
groups.put( group );
}
} catch (Exception e) {
e.printStackTrace();
} finally {
if (tmpFile != null) {
try {
Files.delete(tmpFile.toPath());
} catch (IOException e) {
System.out.println("Failed to delete temp file “" + tmpFile + "”: " + e.getMessage());
}
}
}
return groups;
}
private final JSONArray jsonContactsAttachment( SignalServiceAttachment contactsAttachment ) {
final JSONArray contacts = new JSONArray();
File tmpFile = null;
try {
tmpFile = Util.createTempFile();
final DeviceContactsInputStream s = new DeviceContactsInputStream(
m.retrieveAttachmentAsStream(contactsAttachment.asPointer(), tmpFile));
DeviceContact c;
while ((c = s.read()) != null) {
final JSONObject contact = new JSONObject();
contact.put( "number", c.getNumber() );
if( c.getName().isPresent() )
contact.put( "name", c.getName().get() );
if( c.getColor().isPresent() )
contact.put( "color", c.getColor().get() );
if( c.getAvatar().isPresent() ) //contact.put( "avatar", jsonAttachment( c.getAvatar().get() ) );
m.retrieveContactAvatarAttachment(c.getAvatar().get(), c.getNumber() );
contacts.put( contact );
}
} catch (Exception e) {
e.printStackTrace();
} finally {
if (tmpFile != null) {
try {
Files.delete(tmpFile.toPath());
} catch (IOException e) {
System.out.println("Failed to delete temp file “" + tmpFile + "”: " + e.getMessage());
}
}
}
return contacts;
}
}

6
src/main/java/org/asamk/signal/Manager.java
View file

@ -1340,7 +1340,7 @@ class Manager implements Signal {
return new File(avatarsPath, "contact-" + number);
}
private File retrieveContactAvatarAttachment(SignalServiceAttachment attachment, String number) throws IOException, InvalidMessageException {
public File retrieveContactAvatarAttachment(SignalServiceAttachment attachment, String number) throws IOException, InvalidMessageException {
createPrivateDirectories(avatarsPath);
if (attachment.isPointer()) {
SignalServiceAttachmentPointer pointer = attachment.asPointer();
@ -1355,7 +1355,7 @@ class Manager implements Signal {
return new File(avatarsPath, "group-" + Base64.encodeBytes(groupId).replace("/", "_"));
}
private File retrieveGroupAvatarAttachment(SignalServiceAttachment attachment, byte[] groupId) throws IOException, InvalidMessageException {
public File retrieveGroupAvatarAttachment(SignalServiceAttachment attachment, byte[] groupId) throws IOException, InvalidMessageException {
createPrivateDirectories(avatarsPath);
if (attachment.isPointer()) {
SignalServiceAttachmentPointer pointer = attachment.asPointer();
@ -1429,7 +1429,7 @@ class Manager implements Signal {
return outputFile;
}
private InputStream retrieveAttachmentAsStream(SignalServiceAttachmentPointer pointer, File tmpFile) throws IOException, InvalidMessageException {
public InputStream retrieveAttachmentAsStream(SignalServiceAttachmentPointer pointer, File tmpFile) throws IOException, InvalidMessageException {
final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
return messageReceiver.retrieveAttachment(pointer, tmpFile);
}