CMFileManager: protect code path for access mSdBookmarks

FATAL EXCEPTION: main

AndroidRuntime: Process: com.cyanogenmod.filemanager, PID: 2587

AndroidRuntime: java.lang.NullPointerException: Attempt to invoke interface method 'java.util.Iterator java.util.List.iterator()' on a null object reference

AndroidRuntime: 	at com.cyanogenmod.filemanager.activities.NavigationActivity.applyInitialDir(NavigationActivity.java:1626)

AndroidRuntime: 	at com.cyanogenmod.filemanager.activities.NavigationActivity$15.run(NavigationActivity.java:1521)

AndroidRuntime: 	at android.os.Handler.handleCallback(Handler.java:739)

Change-Id: I2aec4fd6a5b8fcd31cd128f8f46cc9f88bca191e

diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index b4bb0b6..23bd34b 100644 (file)
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -1624,10 +1624,12 @@ public class NavigationActivity extends Activity
         }
 
         boolean needsEasyMode = false;
-        for (Bookmark bookmark :mSdBookmarks) {
-            if (bookmark.mPath.equalsIgnoreCase(initialDir)) {
-                needsEasyMode = true;
-                break;
+        if (mSdBookmarks != null ) {
+            for (Bookmark bookmark :mSdBookmarks) {
+                if (bookmark.mPath.equalsIgnoreCase(initialDir)) {
+                    needsEasyMode = true;
+                    break;
+                }
             }
         }