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

Reorganization

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-11-28 03:47:53 +01:00
parent 6f641899f1
commit 003a5af33c
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
View File

@ -131,6 +131,14 @@ public class CallsListController extends BaseController implements SearchView.On
userEntity = userUtils.getCurrentUser(); userEntity = userUtils.getCurrentUser();
if (userEntity == null) {
if (getParentController() != null && getParentController().getRouter() != null) {
getParentController().getRouter().setRoot((RouterTransaction.with(new ServerSelectionController())
.pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new HorizontalChangeHandler())));
}
}
if (adapter == null) { if (adapter == null) {
adapter = new FlexibleAdapter<>(callItems, getActivity(), false); adapter = new FlexibleAdapter<>(callItems, getActivity(), false);
if (userEntity != null) { if (userEntity != null) {
@ -141,13 +149,6 @@ public class CallsListController extends BaseController implements SearchView.On
adapter.addListener(new OnItemClickListener()); adapter.addListener(new OnItemClickListener());
prepareViews(); prepareViews();
if (userEntity == null) {
if (getParentController() != null && getParentController().getRouter() != null) {
getParentController().getRouter().setRoot((RouterTransaction.with(new ServerSelectionController())
.pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new HorizontalChangeHandler())));
}
}
} }
@Override @Override

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

@ -120,14 +120,6 @@ public class ContactsController extends BaseController implements SearchView.OnQ
NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this); NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this);
userEntity = userUtils.getCurrentUser(); userEntity = userUtils.getCurrentUser();
if (adapter == null) {
adapter = new FlexibleAdapter<>(contactItems, getActivity(), false);
if (userEntity != null) {
fetchData();
}
}
prepareViews();
if (userEntity == null) { if (userEntity == null) {
if (getParentController().getRouter() != null) { if (getParentController().getRouter() != null) {
@ -137,12 +129,14 @@ public class ContactsController extends BaseController implements SearchView.OnQ
} }
} }
} if (adapter == null) {
adapter = new FlexibleAdapter<>(contactItems, getActivity(), false);
@Override if (userEntity != null) {
protected void onAttach(@NonNull View view) { fetchData();
super.onAttach(view); }
}
prepareViews();
} }
private void initSearchView() { private void initSearchView() {