aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/ui/EditAccountActivity.java14
-rw-r--r--src/main/res/menu/editaccount.xml3
2 files changed, 17 insertions, 0 deletions
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");
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 5841524e6..5541470d8 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -67,6 +67,9 @@
android:showAsAction="never"
android:title="@string/mgmt_account_reconnect" />
<item
+ android:id="@+id/mgmt_account_announce_pgp"
+ android:title="@string/mgmt_account_publish_pgp" />
+ <item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"