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

Fix rotation issue in contacts

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-12-13 22:38:29 +01:00
parent 734b217f73
commit 0427713fae
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View File

@ -200,7 +200,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
if (isNewConversationView) { if (isNewConversationView) {
toggleNewCallHeaderVisibility(!isPublicCall); toggleNewCallHeaderVisibility(!isPublicCall);
checkAndHandleDoneMenuItem(); //checkAndHandleDoneMenuItem();
} }
} }
@ -241,6 +241,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
@Override @Override
public void onChanged() { public void onChanged() {
super.onChanged(); super.onChanged();
checkAndHandleDoneMenuItem();
adapter.filterItems(); adapter.filterItems();
adapter.onLoadMoreComplete(null); adapter.onLoadMoreComplete(null);
} }
@ -381,11 +382,11 @@ public class ContactsController extends BaseController implements SearchView.OnQ
public void onPrepareOptionsMenu(Menu menu) { public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu); super.onPrepareOptionsMenu(menu);
searchItem.setVisible(contactItems.size() > 0); searchItem.setVisible(contactItems.size() > 0);
checkAndHandleDoneMenuItem();
if (adapter.hasFilter()) { if (adapter.hasFilter()) {
searchItem.expandActionView(); searchItem.expandActionView();
searchView.setQuery((CharSequence) adapter.getFilter(String.class), false); searchView.setQuery((CharSequence) adapter.getFilter(String.class), false);
} }
} }
private void fetchData(boolean startFromScratch) { private void fetchData(boolean startFromScratch) {
@ -686,7 +687,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
if (isNewConversationView) { if (isNewConversationView) {
conversationPrivacyToogleLayout.setVisibility(View.VISIBLE); conversationPrivacyToogleLayout.setVisibility(View.VISIBLE);
joinConversationViaLinkLayout.setVisibility(View.VISIBLE); joinConversationViaLinkLayout.setVisibility(View.VISIBLE);
checkAndHandleDoneMenuItem(); //checkAndHandleDoneMenuItem();
} }
} }
} }
@ -766,9 +767,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
private void checkAndHandleDoneMenuItem() { private void checkAndHandleDoneMenuItem() {
if (adapter != null && doneMenuItem != null) { if (adapter != null && doneMenuItem != null) {
if (adapter.getSelectedItemCount() > 0 || isPublicCall) { if (adapter.getSelectedItemCount() > 0 || isPublicCall) {
if (!doneMenuItem.isVisible()) { doneMenuItem.setVisible(true);
doneMenuItem.setVisible(true);
}
} else { } else {
doneMenuItem.setVisible(false); doneMenuItem.setVisible(false);
} }
@ -971,7 +970,6 @@ public class ContactsController extends BaseController implements SearchView.OnQ
} }
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
checkAndHandleDoneMenuItem();
} }
private void toggleNewCallHeaderVisibility(boolean showInitialLayout) { private void toggleNewCallHeaderVisibility(boolean showInitialLayout) {