Fix NPE related to changed initialization order in Android 4.2

houston3 · Nov 22, 2012 · b96e7bb · b96e7bb
1 parent f0118ec
commit b96e7bb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/com/fsck/k9/fragment/MessageViewFragment.java b/src/com/fsck/k9/fragment/MessageViewFragment.java
@@ -539,8 +539,10 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     }
 
     private void configureMenu(Menu menu) {
-        // first run displayMessage() gets called before onCreateOptionMenu()
-        if (menu == null) {
+        // In Android versions prior to 4.2 onCreateOptionsMenu() (which calls us) is called before
+        // onActivityCreated() when mAccount isn't initialized yet. In that case we do nothing and
+        // wait for displayMessage() to call us again.
+        if (menu == null || mAccount == null) {
             return;
         }