fix local folder chooser menu NPE

src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -206,10 +206,7 @@ public class UploadFilesActivity extends FileActivity implements
         mOptionsMenu = menu;
         getMenuInflater().inflate(R.menu.upload_files_picker, menu);
 
-        if(mLocalFolderPickerMode) {
-            menu.removeItem(R.id.action_select_all);
-            menu.removeItem(R.id.action_search);
-        } else {
+        if(!mLocalFolderPickerMode) {
             MenuItem selectAll = menu.findItem(R.id.action_select_all);
             setSelectAllMenuItem(selectAll, mSelectAll);
         }

src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java

@@ -26,6 +26,8 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
@@ -135,6 +137,19 @@ public class LocalFileListFragment extends ExtendedListFragment {
         
         Log_OC.i(TAG, "onActivityCreated() stop");
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (mContainerActivity.isFolderPickerMode()) {
+            menu.removeItem(R.id.action_select_all);
+            menu.removeItem(R.id.action_search);
+        } else {
+            super.onCreateOptionsMenu(menu, inflater);
+        }
+    }
     
     /**
      * Checks the file clicked over. Browses inside if it is a directory.