Fixed toolbar account selector

4 months ago · 10deff8c7e
parent 662b39d3fd
commit 10deff8c7e
1 changed files with 4 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@ -134,10 +134,12 @@ public class FragmentBase extends Fragment {
        if (actionbar == null)
            return;

-        if ((actionbar.getDisplayOptions() & DISPLAY_SHOW_CUSTOM) == 0)
+        Toolbar toolbar = activity.findViewById(R.id.toolbar);
+
+        if ((actionbar.getDisplayOptions() & DISPLAY_SHOW_CUSTOM) == 0 && toolbar == null)
            return;

-        final View custom = actionbar.getCustomView();
+        View custom = (toolbar == null ? actionbar.getCustomView() : toolbar);
        if (custom == null)
            return;