From 32bd2bb7a56bfd7734b4ddbfd01d769637971505 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 13 Oct 2016 20:23:57 +0200 Subject: put closeProgress() and showProgress() to the correct place --- src/main/java/de/pixart/messenger/ui/ShareWithActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java index 884516923..8dfea2179 100644 --- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java @@ -83,11 +83,11 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer } else if (share.image) { resId = R.string.shared_image_with_x; } else if (share.video) { + closeProgress(); resId = R.string.shared_video_with_x; } else { resId = R.string.shared_file_with_x; } - closeProgress(); replaceToast(getString(resId, message.getConversation().getName())); if (mReturnToPrevious) { finish(); @@ -312,8 +312,8 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer attachFileCallback); } } else if (share.video) { - showProgress(); replaceToast(getString(R.string.preparing_video)); + showProgress(); ShareWithActivity.this.xmppConnectionService .attachVideoToConversation(conversation, share.uris.get(0), attachFileCallback); -- cgit v1.2.3