Browse Source

Protect against action bar

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 years ago
parent
commit
cb55e32355

+ 3 - 1
app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java

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

+ 4 - 1
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java

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

+ 3 - 1
app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java

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