gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1607 from nextcloud/bugfix/noid/shared-text-is-not-cleared

Browse Source 
Clear message field after sharing
This commit is contained in:
Tim Krueger 2021-09-29 16:15:51 +02:00 committed by GitHub
commit 3e9c16f833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
View File

@ -199,14 +199,13 @@ public class ConversationsListController extends BaseController implements Searc
private Bundle conversationMenuBundle = null; private Bundle conversationMenuBundle = null;
private boolean showShareToScreen = false; private boolean showShareToScreen = false;
private boolean shareToScreenWasShown = false;
private ArrayList<String> filesToShare; private ArrayList<String> filesToShare;
private Conversation selectedConversation; private Conversation selectedConversation;
private String textToPaste = ""; private String textToPaste = "";
private boolean forwardMessage = false; private boolean forwardMessage;
private SmoothScrollLinearLayoutManager layoutManager; private SmoothScrollLinearLayoutManager layoutManager;
@ -347,7 +346,7 @@ public class ConversationsListController extends BaseController implements Searc
searchView = (SearchView) MenuItemCompat.getActionView(searchItem); searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
showShareToScreen = !shareToScreenWasShown && hasActivityActionSendIntent(); showShareToScreen = !showShareToScreen && hasActivityActionSendIntent();
if (showShareToScreen) { if (showShareToScreen) {
@ -786,10 +785,11 @@ public class ConversationsListController extends BaseController implements Searc
selectedConversation = getConversation(position); selectedConversation = getConversation(position);
if (selectedConversation != null && getActivity() != null) { if (selectedConversation != null && getActivity() != null) {
if (showShareToScreen) { if (showShareToScreen) {
shareToScreenWasShown = true;
handleSharedData(); handleSharedData();
showShareToScreen = false;
} else if (forwardMessage) { } else if (forwardMessage) {
openConversation(bundle.getString(BundleKeys.INSTANCE.getKEY_FORWARD_MSG_TEXT())); openConversation(bundle.getString(BundleKeys.INSTANCE.getKEY_FORWARD_MSG_TEXT()));
forwardMessage = false;
} else { } else {
openConversation(); openConversation();
} }