From e2ef2fe45feb650be610a56fd900b48105214ed3 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 13 Apr 2017 23:04:27 +0200 Subject: integrate OpenPGP (untested) --- .../java/de/pixart/messenger/ui/EditAccountActivity.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/main/java/de/pixart/messenger/ui/EditAccountActivity.java') diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java index 5bd2ae001..ab1cbc836 100644 --- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java @@ -577,6 +577,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat final MenuItem shareBarcode = menu.findItem(R.id.action_share_barcode); final MenuItem shareHttp = menu.findItem(R.id.action_share_http); final MenuItem shareUri = menu.findItem(R.id.action_share_uri); + final MenuItem announcePGP = menu.findItem(R.id.mgmt_account_announce_pgp); renewCertificate.setVisible(mAccount != null && mAccount.getPrivateKeyAlias() != null); if (mAccount != null && mAccount.isOnlineAndConnected()) { @@ -587,9 +588,11 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat changePassword.setVisible(false); } reconnect.setVisible(true); + announcePGP.setVisible(true); mamPrefs.setVisible(mAccount.getXmppConnection().getFeatures().mam()); changePresence.setVisible(manuallyChangePresence()); } else { + announcePGP.setVisible(false); reconnect.setVisible(false); showQrCode.setVisible(false); showBlocklist.setVisible(false); @@ -769,10 +772,21 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat case R.id.action_show_password: showPassword(); break; + case R.id.mgmt_account_announce_pgp: + publishOpenPGPPublicKey(mAccount); + return true; } return super.onOptionsItemSelected(item); } + private void publishOpenPGPPublicKey(Account account) { + if (EditAccountActivity.this.hasPgp()) { + announcePgp(account, null, onOpenPGPKeyPublished); + } else { + this.showInstallPgpDialog(); + } + } + private void shareLink(boolean http) { Intent intent = new Intent(Intent.ACTION_SEND); intent.setType("text/plain"); -- cgit v1.2.3