From d59cc3b73819c4c0ee2cc1a093345efe53c9acbc Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 18 Jun 2018 17:32:48 +0200
Subject: [PATCH] show toast before finishing publish activity

---
 ...PublishGroupChatProfilePictureActivity.java | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java
index ffb99c00f..4c7b77276 100644
--- a/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java
@@ -37,8 +37,6 @@ import android.os.Bundle;
 import android.support.annotation.StringRes;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
@@ -52,13 +50,8 @@ import eu.siacs.conversations.ui.interfaces.OnAvatarPublication;
 import eu.siacs.conversations.ui.util.PendingItem;
 
 public class PublishGroupChatProfilePictureActivity extends XmppActivity implements OnAvatarPublication {
-
-    private static final int REQUEST_CHOOSE_FILE = 0xac24;
-
-    private ActivityPublishProfilePictureBinding binding;
-
     private final PendingItem<String> pendingConversationUuid = new PendingItem<>();
-
+    private ActivityPublishProfilePictureBinding binding;
     private Conversation conversation;
     private Uri uri;
 
@@ -112,6 +105,8 @@ public class PublishGroupChatProfilePictureActivity extends XmppActivity impleme
 
 
     private void publish(View view) {
+        binding.publishButton.setText(R.string.publishing);
+        binding.publishButton.setEnabled(false);
         xmppConnectionService.publishMucAvatar(conversation, uri, this);
     }
 
@@ -143,13 +138,16 @@ public class PublishGroupChatProfilePictureActivity extends XmppActivity impleme
 
     @Override
     public void onAvatarPublicationSucceeded() {
-        finish();
+        runOnUiThread(() -> {
+            Toast.makeText(this, R.string.avatar_has_been_published, Toast.LENGTH_SHORT).show();
+            finish();
+        });
     }
 
     @Override
     public void onAvatarPublicationFailed(@StringRes int res) {
         runOnUiThread(() -> {
-            Toast.makeText(this,res,Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, res, Toast.LENGTH_SHORT).show();
             this.binding.publishButton.setText(R.string.publish);
             this.binding.publishButton.setEnabled(true);
         });