diff options
Diffstat (limited to '')
5 files changed, 110 insertions, 177 deletions
diff --git a/src/main/java/de/pixart/messenger/crypto/PgpEngine.java b/src/main/java/de/pixart/messenger/crypto/PgpEngine.java index 5f8233807..9228c1c84 100644 --- a/src/main/java/de/pixart/messenger/crypto/PgpEngine.java +++ b/src/main/java/de/pixart/messenger/crypto/PgpEngine.java @@ -37,6 +37,14 @@ public class PgpEngine { this.mXmppConnectionService = service; } + private static void logError(Account account, OpenPgpError error) { + if (error != null) { + Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": OpenKeychain error '" + error.getMessage() + "' code=" + error.getErrorId()); + } else { + Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": OpenKeychain error with no message"); + } + } + public void encrypt(final Message message, final UiCallback<Message> callback) { Intent params = new Intent(); params.setAction(OpenPgpApi.ACTION_ENCRYPT); @@ -61,40 +69,33 @@ public class PgpEngine { } InputStream is = new ByteArrayInputStream(body.getBytes()); final OutputStream os = new ByteArrayOutputStream(); - api.executeApiAsync(params, is, os, new IOpenPgpCallback() { - - @Override - public void onReturn(Intent result) { - switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, - OpenPgpApi.RESULT_CODE_ERROR)) { - case OpenPgpApi.RESULT_CODE_SUCCESS: - try { - os.flush(); - StringBuilder encryptedMessageBody = new StringBuilder(); - String[] lines = os.toString().split("\n"); - for (int i = 2; i < lines.length - 1; ++i) { - if (!lines[i].contains("Version")) { - encryptedMessageBody.append(lines[i].trim()); - } + api.executeApiAsync(params, is, os, result -> { + switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) { + case OpenPgpApi.RESULT_CODE_SUCCESS: + try { + os.flush(); + StringBuilder encryptedMessageBody = new StringBuilder(); + String[] lines = os.toString().split("\n"); + for (int i = 2; i < lines.length - 1; ++i) { + if (!lines[i].contains("Version")) { + encryptedMessageBody.append(lines[i].trim()); } - message.setEncryptedBody(encryptedMessageBody - .toString()); - callback.success(message); - } catch (IOException e) { - callback.error(R.string.openpgp_error, message); } - - break; - case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: - callback.userInputRequried((PendingIntent) result - .getParcelableExtra(OpenPgpApi.RESULT_INTENT), - message); - break; - case OpenPgpApi.RESULT_CODE_ERROR: - logError(conversation.getAccount(), (OpenPgpError) result.getParcelableExtra(OpenPgpApi.RESULT_ERROR)); + message.setEncryptedBody(encryptedMessageBody.toString()); + message.setEncryption(Message.ENCRYPTION_DECRYPTED); + mXmppConnectionService.sendMessage(message); + callback.success(message); + } catch (IOException e) { callback.error(R.string.openpgp_error, message); - break; - } + } + break; + case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: + callback.userInputRequried(result.getParcelableExtra(OpenPgpApi.RESULT_INTENT), message); + break; + case OpenPgpApi.RESULT_CODE_ERROR: + logError(conversation.getAccount(), result.getParcelableExtra(OpenPgpApi.RESULT_ERROR)); + callback.error(R.string.openpgp_error, message); + break; } }); } else { @@ -107,32 +108,25 @@ public class PgpEngine { outputFile.createNewFile(); final InputStream is = new FileInputStream(inputFile); final OutputStream os = new FileOutputStream(outputFile); - api.executeApiAsync(params, is, os, new IOpenPgpCallback() { - - @Override - public void onReturn(Intent result) { - switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, - OpenPgpApi.RESULT_CODE_ERROR)) { - case OpenPgpApi.RESULT_CODE_SUCCESS: + api.executeApiAsync(params, is, os, result -> { + switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) { + case OpenPgpApi.RESULT_CODE_SUCCESS: try { os.flush(); } catch (IOException ignored) { //ignored } FileBackend.close(os); + mXmppConnectionService.sendMessage(message); callback.success(message); break; case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: - callback.userInputRequried( - (PendingIntent) result - .getParcelableExtra(OpenPgpApi.RESULT_INTENT), - message); + callback.userInputRequried(result.getParcelableExtra(OpenPgpApi.RESULT_INTENT), message); break; case OpenPgpApi.RESULT_CODE_ERROR: - logError(conversation.getAccount(), (OpenPgpError) result.getParcelableExtra(OpenPgpApi.RESULT_ERROR)); + logError(conversation.getAccount(), result.getParcelableExtra(OpenPgpApi.RESULT_ERROR)); callback.error(R.string.openpgp_error, message); break; - } } }); } catch (final IOException e) { @@ -188,23 +182,17 @@ public class PgpEngine { public void chooseKey(final Account account, final UiCallback<Account> callback) { Intent p = new Intent(); p.setAction(OpenPgpApi.ACTION_GET_SIGN_KEY_ID); - api.executeApiAsync(p, null, null, new IOpenPgpCallback() { - - @Override - public void onReturn(Intent result) { - switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, 0)) { - case OpenPgpApi.RESULT_CODE_SUCCESS: - callback.success(account); - return; - case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: - callback.userInputRequried((PendingIntent) result - .getParcelableExtra(OpenPgpApi.RESULT_INTENT), - account); - return; - case OpenPgpApi.RESULT_CODE_ERROR: - logError(account, (OpenPgpError) result.getParcelableExtra(OpenPgpApi.RESULT_ERROR)); - callback.error(R.string.openpgp_error, account); - } + api.executeApiAsync(p, null, null, result -> { + switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, 0)) { + case OpenPgpApi.RESULT_CODE_SUCCESS: + callback.success(account); + return; + case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: + callback.userInputRequried(result.getParcelableExtra(OpenPgpApi.RESULT_INTENT), account); + return; + case OpenPgpApi.RESULT_CODE_ERROR: + logError(account, result.getParcelableExtra(OpenPgpApi.RESULT_ERROR)); + callback.error(R.string.openpgp_error, account); } }); } @@ -220,52 +208,46 @@ public class PgpEngine { InputStream is = new ByteArrayInputStream(status.getBytes()); final OutputStream os = new ByteArrayOutputStream(); Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": signing status message \"" + status + "\""); - api.executeApiAsync(params, is, os, new IOpenPgpCallback() { - - @Override - public void onReturn(Intent result) { - switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, 0)) { - case OpenPgpApi.RESULT_CODE_SUCCESS: - StringBuilder signatureBuilder = new StringBuilder(); - try { - os.flush(); - String[] lines = os.toString().split("\n"); - boolean sig = false; - for (String line : lines) { - if (sig) { - if (line.contains("END PGP SIGNATURE")) { - sig = false; - } else { - if (!line.contains("Version")) { - signatureBuilder.append(line.trim()); - } + api.executeApiAsync(params, is, os, result -> { + switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, 0)) { + case OpenPgpApi.RESULT_CODE_SUCCESS: + StringBuilder signatureBuilder = new StringBuilder(); + try { + os.flush(); + String[] lines = os.toString().split("\n"); + boolean sig = false; + for (String line : lines) { + if (sig) { + if (line.contains("END PGP SIGNATURE")) { + sig = false; + } else { + if (!line.contains("Version")) { + signatureBuilder.append(line.trim()); } } - if (line.contains("BEGIN PGP SIGNATURE")) { - sig = true; - } } - } catch (IOException e) { - callback.error(R.string.openpgp_error, account); - return; + if (line.contains("BEGIN PGP SIGNATURE")) { + sig = true; + } } - account.setPgpSignature(signatureBuilder.toString()); - callback.success(account); - return; - case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: - callback.userInputRequried((PendingIntent) result - .getParcelableExtra(OpenPgpApi.RESULT_INTENT), - account); + } catch (IOException e) { + callback.error(R.string.openpgp_error, account); return; - case OpenPgpApi.RESULT_CODE_ERROR: - OpenPgpError error = result.getParcelableExtra(OpenPgpApi.RESULT_ERROR); - if (error != null && "signing subkey not found!".equals(error.getMessage())) { - callback.error(0, account); - } else { - logError(account, error); - callback.error(R.string.unable_to_connect_to_keychain, null); - } - } + } + account.setPgpSignature(signatureBuilder.toString()); + callback.success(account); + return; + case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: + callback.userInputRequried(result.getParcelableExtra(OpenPgpApi.RESULT_INTENT), account); + return; + case OpenPgpApi.RESULT_CODE_ERROR: + OpenPgpError error = result.getParcelableExtra(OpenPgpApi.RESULT_ERROR); + if (error != null && "signing subkey not found!".equals(error.getMessage())) { + callback.error(0, account); + } else { + logError(account, error); + callback.error(R.string.unable_to_connect_to_keychain, null); + } } }); } @@ -283,26 +265,16 @@ public class PgpEngine { callback.success(contact); return; case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: - callback.userInputRequried((PendingIntent) result - .getParcelableExtra(OpenPgpApi.RESULT_INTENT), - contact); + callback.userInputRequried(result.getParcelableExtra(OpenPgpApi.RESULT_INTENT), contact); return; case OpenPgpApi.RESULT_CODE_ERROR: - logError(contact.getAccount(), (OpenPgpError) result.getParcelableExtra(OpenPgpApi.RESULT_ERROR)); + logError(contact.getAccount(), result.getParcelableExtra(OpenPgpApi.RESULT_ERROR)); callback.error(R.string.openpgp_error, contact); } } }); } - private static void logError(Account account, OpenPgpError error) { - if (error != null) { - Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": OpenKeychain error '" + error.getMessage() + "' code=" + error.getErrorId()); - } else { - Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": OpenKeychain error with no message"); - } - } - public PendingIntent getIntentForKey(long pgpKeyId) { Intent params = new Intent(); params.setAction(OpenPgpApi.ACTION_GET_KEY); diff --git a/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java b/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java index 038cdb2c9..d85281754 100644 --- a/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java +++ b/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java @@ -63,6 +63,7 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) { mXmppConnectionService.getPgpEngine().encrypt(message, callback); } else { + mXmppConnectionService.sendMessage(message); callback.success(message); } } else { @@ -77,6 +78,7 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod callback.error(R.string.unable_to_connect_to_keychain, null); } } else { + mXmppConnectionService.sendMessage(message); callback.success(message); } } catch (FileBackend.FileCopyException e) { diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 5353e003c..19266764a 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -474,9 +474,7 @@ public class XmppConnectionService extends Service { return this.mAvatarService; } - public void attachLocationToConversation(final Conversation conversation, - final Uri uri, - final UiCallback<Message> callback) { + public void attachLocationToConversation(final Conversation conversation, final Uri uri, final UiCallback<Message> callback) { int encryption = conversation.getNextEncryption(); if (encryption == Message.ENCRYPTION_PGP) { encryption = Message.ENCRYPTION_DECRYPTED; @@ -488,6 +486,7 @@ public class XmppConnectionService extends Service { if (encryption == Message.ENCRYPTION_DECRYPTED) { getPgpEngine().encrypt(message, callback); } else { + sendMessage(message); callback.success(message); } } @@ -553,6 +552,7 @@ public class XmppConnectionService extends Service { callback.error(R.string.unable_to_connect_to_keychain, null); } } else { + sendMessage(message); callback.success(message); } } catch (final FileBackend.FileCopyException e) { diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 68764afae..87228a7e7 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -611,12 +611,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke @Override public void success(Message message) { - activity.xmppConnectionService.sendMessage(message); + } @Override public void error(int errorCode, Message object) { - + //TODO show possible pgp error } @Override @@ -644,7 +644,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke public void success(Message message) { runOnUiThread(() -> activity.hideToast()); hidePrepareFileToast(prepareFileToast); - activity.xmppConnectionService.sendMessage(message); } @Override @@ -661,35 +660,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke }); } - private void attachPhotoToConversation(Conversation conversation, Uri uri) { - if (conversation == null) { - return; - } - final Toast prepareFileToast = Toast.makeText(getActivity(), getText(R.string.preparing_image), Toast.LENGTH_LONG); - prepareFileToast.show(); - activity.delegateUriPermissionsToService(uri); - activity.xmppConnectionService.attachImageToConversation(conversation, uri, - new UiCallback<Message>() { - - @Override - public void userInputRequried(PendingIntent pi, Message object) { - hidePrepareFileToast(prepareFileToast); - } - - @Override - public void success(Message message) { - hidePrepareFileToast(prepareFileToast); - activity.xmppConnectionService.sendMessage(message); - } - - @Override - public void error(final int error, Message message) { - hidePrepareFileToast(prepareFileToast); - runOnUiThread(() -> activity.replaceToast(getString(error))); - } - }); - } - private void attachImagesToConversation(Conversation conversation, Uri uri) { if (conversation == null) { return; @@ -816,7 +786,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke @Override public void success(Message message) { hidePrepareFileToast(prepareFileToast); - activity.xmppConnectionService.sendMessage(message); } @Override @@ -2522,8 +2491,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke @Override public void success(Message message) { //TODO the following two call can be made before the callback - message.setEncryption(Message.ENCRYPTION_DECRYPTED); - activity.xmppConnectionService.sendMessage(message); getActivity().runOnUiThread(() -> messageSent()); } diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java index a061bcded..2d72d3a26 100644 --- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java @@ -72,12 +72,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer @Override public void inform(final String text) { - runOnUiThread(new Runnable() { - @Override - public void run() { - replaceToast(text); - } - }); + runOnUiThread(() -> replaceToast(text)); } @Override @@ -89,24 +84,21 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer @Override public void success(final Message message) { xmppConnectionService.sendMessage(message); - runOnUiThread(new Runnable() { - @Override - public void run() { - if (attachmentCounter.decrementAndGet() <= 0) { - int resId; - if (share.image && share.multiple) { - resId = R.string.shared_images_with_x; - } else if (share.image) { - resId = R.string.shared_image_with_x; - } else { - resId = R.string.shared_file_with_x; - } - replaceToast(getString(resId, message.getConversation().getName())); - if (mReturnToPrevious) { - finish(); - } else { - switchToConversation(message.getConversation()); - } + runOnUiThread(() -> { + if (attachmentCounter.decrementAndGet() <= 0) { + int resId; + if (share.image && share.multiple) { + resId = R.string.shared_images_with_x; + } else if (share.image) { + resId = R.string.shared_image_with_x; + } else { + resId = R.string.shared_file_with_x; + } + replaceToast(getString(resId, message.getConversation().getName())); + if (mReturnToPrevious) { + finish(); + } else { + switchToConversation(message.getConversation()); } } }); @@ -373,7 +365,6 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer if (mReturnToPrevious && this.share.text != null && !this.share.text.isEmpty()) { final PresenceSelector.OnPresenceSelected callback = new PresenceSelector.OnPresenceSelected() { private void finishAndSend(Message message) { - xmppConnectionService.sendMessage(message); replaceToast(getString(R.string.shared_text_with_x, conversation.getName())); finish(); } @@ -415,6 +406,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer if (encryption == Message.ENCRYPTION_OTR) { message.setCounterpart(conversation.getNextCounterpart()); } + xmppConnectionService.sendMessage(message); finishAndSend(message); } }; |