sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

encrypt muc PM only to actual recipient

This commit is contained in:
Daniel Gultsch 2018-01-27 20:55:43 +01:00
parent be70eb5650
commit a33984acc5
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
View File

@ -1234,6 +1234,23 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
return true; return true;
} }
//this is being used for private muc messages only
private boolean buildHeader(XmppAxolotlMessage axolotlMessage, Jid jid) {
if (jid == null) {
return false;
}
HashSet<XmppAxolotlSession> sessions = new HashSet<>();
sessions.addAll(this.sessions.getAll(getAddressForJid(jid).getName()).values());
if (sessions.isEmpty()) {
return false;
}
sessions.addAll(findOwnSessions());
for(XmppAxolotlSession session : sessions) {
axolotlMessage.addDevice(session);
}
return true;
}
@Nullable @Nullable
public XmppAxolotlMessage encrypt(Message message) { public XmppAxolotlMessage encrypt(Message message) {
final XmppAxolotlMessage axolotlMessage = new XmppAxolotlMessage(account.getJid().toBareJid(), getOwnDeviceId()); final XmppAxolotlMessage axolotlMessage = new XmppAxolotlMessage(account.getJid().toBareJid(), getOwnDeviceId());
@ -1249,12 +1266,14 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
Log.w(Config.LOGTAG, getLogprefix(account) + "Failed to encrypt message: " + e.getMessage()); Log.w(Config.LOGTAG, getLogprefix(account) + "Failed to encrypt message: " + e.getMessage());
return null; return null;
} }
//TODO: fix this for MUC PMs - Don't encrypt to all participants
if (!buildHeader(axolotlMessage, message.getConversation())) {
return null;
}
return axolotlMessage; final boolean success;
if (message.getType() == Message.TYPE_PRIVATE) {
success = buildHeader(axolotlMessage, message.getTrueCounterpart());
} else {
success = buildHeader(axolotlMessage, message.getConversation());
}
return success ? axolotlMessage : null;
} }
public void preparePayloadMessage(final Message message, final boolean delay) { public void preparePayloadMessage(final Message message, final boolean delay) {

6
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -469,8 +469,10 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
if (conversation.getCorrectingMessage() == null) { if (conversation.getCorrectingMessage() == null) {
message = new Message(conversation, body, conversation.getNextEncryption()); message = new Message(conversation, body, conversation.getNextEncryption());
if (conversation.getMode() == Conversation.MODE_MULTI) { if (conversation.getMode() == Conversation.MODE_MULTI) {
if (conversation.getNextCounterpart() != null) { final Jid nextCounterpart = conversation.getNextCounterpart();
message.setCounterpart(conversation.getNextCounterpart()); if (nextCounterpart != null) {
message.setCounterpart(nextCounterpart);
message.setTrueCounterpart(conversation.getMucOptions().getTrueCounterpart(nextCounterpart));
message.setType(Message.TYPE_PRIVATE); message.setType(Message.TYPE_PRIVATE);
} }
} }