From 0c9ba838e10d75713c2b51c22fb53a8ceb2f408c Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 1 Apr 2018 22:14:30 +0200
Subject: finished 'Set Status Message' dialog

---
 src/main/java/de/pixart/messenger/ui/XmppActivity.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui/XmppActivity.java')

diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index d38563d04..ba03663f3 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -556,7 +556,7 @@ public abstract class XmppActivity extends AppCompatActivity {
         startActivityForResult(ChooseContactActivity.create(this,conversation), REQUEST_INVITE_TO_CONVERSATION);
     }
 
-    protected void announcePgp(Account account, final Conversation conversation, Intent intent, final Runnable onSuccess) {
+    protected void announcePgp(final Account account, final Conversation conversation, Intent intent, final Runnable onSuccess) {
         if (account.getPgpId() == 0) {
             choosePgpSignId(account);
         } else {
@@ -567,10 +567,10 @@ public abstract class XmppActivity extends AppCompatActivity {
             if (status == null) {
                 status = "";
             }
-            xmppConnectionService.getPgpEngine().generateSignature(intent, account, status, new UiCallback<Account>() {
+            xmppConnectionService.getPgpEngine().generateSignature(intent, account, status, new UiCallback<String>() {
 
                 @Override
-                public void userInputRequried(PendingIntent pi, Account account) {
+                public void userInputRequried(PendingIntent pi, String signature) {
                     try {
                         startIntentSenderForResult(pi.getIntentSender(), REQUEST_ANNOUNCE_PGP, null, 0, 0, 0);
                     } catch (final SendIntentException ignored) {
@@ -578,7 +578,8 @@ public abstract class XmppActivity extends AppCompatActivity {
                 }
 
                 @Override
-                public void success(Account account) {
+                public void success(String signature) {
+                    account.setPgpSignature(signature);
                     xmppConnectionService.databaseBackend.updateAccount(account);
                     xmppConnectionService.sendPresence(account);
                     if (conversation != null) {
@@ -592,8 +593,8 @@ public abstract class XmppActivity extends AppCompatActivity {
                 }
 
                 @Override
-                public void error(int error, Account account) {
-                    if (error == 0 && account != null) {
+                public void error(int error, String signature) {
+                    if (error == 0) {
                         account.setPgpSignId(0);
                         account.unsetPgpSignature();
                         xmppConnectionService.databaseBackend.updateAccount(account);
-- 
cgit v1.2.3