Merge pull request #718 from nextcloud/fix-search-crash

Fix crashes

Author: AndyScherzinger

AndroidManifest.xml

@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10040202"
-    android:versionName="1.4.2 RC2">
+    android:versionCode="10040203"
+    android:versionName="1.4.2 RC3">
 
     <uses-sdk
         android:minSdkVersion="14"

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -466,12 +466,14 @@ private Fragment chooseInitialSecondFragment(OCFile file) {
      * @param fragment New second Fragment to set.
      */
     private void setSecondFragment(Fragment fragment) {
-        searchView.post(new Runnable() {
-            @Override
-            public void run() {
-                searchView.setQuery("", true);
-            }
-        });
+        if (searchView != null) {
+            searchView.post(new Runnable() {
+                @Override
+                public void run() {
+                    searchView.setQuery("", true);
+                }
+            });
+        }
         setDrawerIndicatorEnabled(false);
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         transaction.replace(R.id.right_fragment_container, fragment, TAG_SECOND_FRAGMENT);

src/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -21,6 +21,7 @@
 package com.owncloud.android.ui.fragment;
 
 import android.animation.LayoutTransition;
+import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.DrawableRes;
@@ -268,8 +269,14 @@ public void run() {
                 searchView.clearFocus();
             }
         } else {
-            if (getActivity() != null) {
-                ((FileDisplayActivity) getActivity()).refreshListOfFilesFragment(true);
+            Activity activity;
+            if ((activity = getActivity()) != null) {
+                if (activity instanceof FileDisplayActivity) {
+                    ((FileDisplayActivity) activity).refreshListOfFilesFragment(true);
+                } else {
+                    LocalFileListAdapter localFileListAdapter = (LocalFileListAdapter) mAdapter;
+                    localFileListAdapter.filter(query);
+                }
 
             }
         }