gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-12 10:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #548

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-05-30 20:56:11 +02:00
parent 80eaf71388
commit 75e3722ad1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -136,8 +136,8 @@ dependencies {
implementation fileTree(include: ['*'], dir: 'libs') implementation fileTree(include: ['*'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.google.android.material:material:1.0.0' implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha4' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1'
implementation 'com.github.vanniktech:Emoji:746caa4623' implementation 'com.github.vanniktech:Emoji:0.6.0'
implementation 'org.michaelevans.colorart:library:0.0.3' implementation 'org.michaelevans.colorart:library:0.0.3'
implementation "android.arch.work:work-runtime:${workVersion}" implementation "android.arch.work:work-runtime:${workVersion}"
implementation "android.arch.work:work-rxjava2:${workVersion}" implementation "android.arch.work:work-rxjava2:${workVersion}"

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

@ -550,10 +550,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
} }
}).build(messageInput); }).build(messageInput);
if (mentionAutocomplete != null && mentionAutocomplete.isPopupShowing()) {
mentionAutocomplete.dismissPopup();
}
if (getActivity() != null) { if (getActivity() != null) {
new KeyboardUtils(getActivity(), getView(), false); new KeyboardUtils(getActivity(), getView(), false);
} }
@ -587,6 +583,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
wasDetached = true; wasDetached = true;
leaveRoom(); leaveRoom();
} }
if (mentionAutocomplete != null && mentionAutocomplete.isPopupShowing()) {
mentionAutocomplete.dismissPopup();
}
} }
@Override @Override