mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-20 12:09:45 +01:00
Merge pull request #1607 from nextcloud/bugfix/noid/shared-text-is-not-cleared
Clear message field after sharing
This commit is contained in:
commit
3e9c16f833
@ -199,14 +199,13 @@ public class ConversationsListController extends BaseController implements Searc
|
||||
private Bundle conversationMenuBundle = null;
|
||||
|
||||
private boolean showShareToScreen = false;
|
||||
private boolean shareToScreenWasShown = false;
|
||||
|
||||
private ArrayList<String> filesToShare;
|
||||
private Conversation selectedConversation;
|
||||
|
||||
private String textToPaste = "";
|
||||
|
||||
private boolean forwardMessage = false;
|
||||
private boolean forwardMessage;
|
||||
|
||||
private SmoothScrollLinearLayoutManager layoutManager;
|
||||
|
||||
@ -347,7 +346,7 @@ public class ConversationsListController extends BaseController implements Searc
|
||||
|
||||
searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
|
||||
|
||||
showShareToScreen = !shareToScreenWasShown && hasActivityActionSendIntent();
|
||||
showShareToScreen = !showShareToScreen && hasActivityActionSendIntent();
|
||||
|
||||
|
||||
if (showShareToScreen) {
|
||||
@ -786,10 +785,11 @@ public class ConversationsListController extends BaseController implements Searc
|
||||
selectedConversation = getConversation(position);
|
||||
if (selectedConversation != null && getActivity() != null) {
|
||||
if (showShareToScreen) {
|
||||
shareToScreenWasShown = true;
|
||||
handleSharedData();
|
||||
showShareToScreen = false;
|
||||
} else if (forwardMessage) {
|
||||
openConversation(bundle.getString(BundleKeys.INSTANCE.getKEY_FORWARD_MSG_TEXT()));
|
||||
forwardMessage = false;
|
||||
} else {
|
||||
openConversation();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user