gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 14:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protect against action bar

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-21 08:29:14 +01:00
parent 08f959c060
commit cb55e32355
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,9 @@ public class CallsListController extends BaseController implements SearchView.On
super.onViewBound(view); super.onViewBound(view);
NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this); NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this);
getActionBar().show(); if (getActionBar() != null) {
getActionBar().show();
}
userEntity = userUtils.getCurrentUser(); userEntity = userUtils.getCurrentUser();

5
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

@ -234,7 +234,10 @@ public class SettingsController extends BaseController {
@Override @Override
protected void onAttach(@NonNull View view) { protected void onAttach(@NonNull View view) {
super.onAttach(view); super.onAttach(view);
getActionBar().show();
if (getActionBar() != null) {
getActionBar().show();
}
dispose(null); dispose(null);
userEntity = userUtils.getCurrentUser(); userEntity = userUtils.getCurrentUser();

4
app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java
View File

@ -179,7 +179,9 @@ public class SwitchAccountController extends BaseController {
adapter.addListener(onSwitchItemClickListener); adapter.addListener(onSwitchItemClickListener);
adapter.updateDataSet(userItems, false); adapter.updateDataSet(userItems, false);
} else { } else {
getActionBar().show(); if (getActionBar() != null) {
getActionBar().show();
}
Account account; Account account;
ImportAccount importAccount; ImportAccount importAccount;
for (Object accountObject : AccountUtils.findAccounts(userUtils.getUsers())) { for (Object accountObject : AccountUtils.findAccounts(userUtils.getUsers())) {