diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-10-13 20:23:57 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-10-13 20:23:57 +0200 |
| commit | 32bd2bb7a56bfd7734b4ddbfd01d769637971505 (patch) | |
| tree | a04ab41b8ddf93d18323ce2c30d62af691714422 /src/main/java/de/pixart/messenger/ui/ShareWithActivity.java | |
| parent | 075bc05022eccdbba4c1563995d0689a19342d81 (diff) | |
put closeProgress() and showProgress() to the correct place
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ShareWithActivity.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ShareWithActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
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); |