narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

untested pgp support for http upload

Browse source
This commit is contained in:
Daniel Gultsch 2015-06-29 15:38:16 +02:00
parent fdd46f1c91
commit 0030bbf472
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
View file

@ -143,11 +143,15 @@ public class PgpEngine {
params.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, message params.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, message
.getConversation().getAccount().getJid().toBareJid().toString()); .getConversation().getAccount().getJid().toBareJid().toString());
if (message.getType() == Message.TYPE_TEXT) { if (!message.needsUploading()) {
params.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true); params.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
String body;
InputStream is = new ByteArrayInputStream(message.getBody() if (message.hasFileOnRemoteHost()) {
.getBytes()); body = message.getImageParams().url.toString();
} else {
body = message.getBody();
}
InputStream is = new ByteArrayInputStream(body.getBytes());
final OutputStream os = new ByteArrayOutputStream(); final OutputStream os = new ByteArrayOutputStream();
api.executeApiAsync(params, is, os, new IOpenPgpCallback() { api.executeApiAsync(params, is, os, new IOpenPgpCallback() {
@ -184,7 +188,7 @@ public class PgpEngine {
} }
} }
}); });
} else if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) { } else {
try { try {
DownloadableFile inputFile = this.mXmppConnectionService DownloadableFile inputFile = this.mXmppConnectionService
.getFileBackend().getFile(message, true); .getFileBackend().getFile(message, true);

23
src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
View file

@ -1,5 +1,6 @@
package eu.siacs.conversations.http; package eu.siacs.conversations.http;
import android.app.PendingIntent;
import android.util.Log; import android.util.Log;
import java.io.IOException; import java.io.IOException;
@ -16,6 +17,7 @@ import eu.siacs.conversations.entities.DownloadableFile;
import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.persistance.FileBackend; import eu.siacs.conversations.persistance.FileBackend;
import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.ui.UiCallback;
import eu.siacs.conversations.utils.CryptoHelper; import eu.siacs.conversations.utils.CryptoHelper;
import eu.siacs.conversations.utils.Xmlns; import eu.siacs.conversations.utils.Xmlns;
import eu.siacs.conversations.xml.Element; import eu.siacs.conversations.xml.Element;
@ -159,7 +161,26 @@ public class HttpUploadConnection implements Downloadable {
message.setBody(mGetUrl.toString()+"|"+String.valueOf(params.size)+"|"+String.valueOf(params.width)+"|"+String.valueOf(params.height)); message.setBody(mGetUrl.toString()+"|"+String.valueOf(params.size)+"|"+String.valueOf(params.width)+"|"+String.valueOf(params.height));
message.setDownloadable(null); message.setDownloadable(null);
message.setCounterpart(message.getConversation().getJid().toBareJid()); message.setCounterpart(message.getConversation().getJid().toBareJid());
mXmppConnectionService.resendMessage(message); if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
mXmppConnectionService.getPgpEngine().encrypt(message, new UiCallback<Message>() {
@Override
public void success(Message message) {
mXmppConnectionService.resendMessage(message);
}
@Override
public void error(int errorCode, Message object) {
fail();
}
@Override
public void userInputRequried(PendingIntent pi, Message object) {
fail();
}
});
} else {
mXmppConnectionService.resendMessage(message);
}
} else { } else {
fail(); fail();
} }