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

Handle file transmission properly in axolotl

This commit is contained in:
Andreas Straub 2015-07-17 19:44:05 +02:00
parent 43703870e8
commit 2045a71262
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -755,10 +755,18 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
} }
break; break;
case Message.ENCRYPTION_AXOLOTL: case Message.ENCRYPTION_AXOLOTL:
packet = account.getAxolotlService().fetchPacketFromCache(message); if (message.needsUploading()) {
if (packet == null) { if (account.httpUploadAvailable() || message.fixCounterpart()) {
account.getAxolotlService().prepareMessage(message); this.sendFileMessage(message);
message.setAxolotlFingerprint(account.getAxolotlService().getOwnPublicKey().getFingerprint().replaceAll("\\s", "")); } else {
break;
}
} else {
packet = account.getAxolotlService().fetchPacketFromCache(message);
if (packet == null) {
account.getAxolotlService().prepareMessage(message);
message.setAxolotlFingerprint(account.getAxolotlService().getOwnPublicKey().getFingerprint().replaceAll("\\s", ""));
}
} }
break; break;