Refresh the navigation view after back from the search view

* Refresh the navigation view after back from the search view
* Clean up

4 files changed, 12 insertions, 8 deletions

diff --git a/src/com/cyanogenmod/explorer/activities/NavigationActivity.java b/src/com/cyanogenmod/explorer/activities/NavigationActivity.java
index af526f7..11c3f8d 100644
--- a/src/com/cyanogenmod/explorer/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/explorer/activities/NavigationActivity.java
@@ -730,6 +730,10 @@ public class NavigationActivity extends Activity
                     if (searchInfo != null && searchInfo.isSuccessNavigation()) {
                         //Navigate to previous history
                         back();
+                    } else {
+                        // I don't know is the search view was changed, so do a refresh
+                        // of the navigation view
+                        getCurrentNavigationView().refresh();
                     }
                 }
                 break;
@@ -1146,7 +1150,7 @@ public class NavigationActivity extends Activity
             if (h.getItem() instanceof NavigationViewInfoParcelable) {
                 // Verify that the path exists
                 String path = ((NavigationViewInfoParcelable)h.getItem()).getCurrentDir();
-                
+
                 try {
                     CommandHelper.getFileInfo(this, path, null);
                     break;
@@ -1242,7 +1246,7 @@ public class NavigationActivity extends Activity
      * Method that remove the {@link FileSystemObject} from the history
      */
     private void removeFromHistory(FileSystemObject fso) {
-        if( this.mHistory != null ) {
+        if (this.mHistory != null) {
             for (int i = this.mHistory.size()-1; i >= 0 ; i--) {
                 History history = this.mHistory.get(i);
                 if (history.getItem() instanceof NavigationViewInfoParcelable) {
diff --git a/src/com/cyanogenmod/explorer/activities/SearchActivity.java b/src/com/cyanogenmod/explorer/activities/SearchActivity.java
index 139d3e2..0b95fb6 100644
--- a/src/com/cyanogenmod/explorer/activities/SearchActivity.java
+++ b/src/com/cyanogenmod/explorer/activities/SearchActivity.java
@@ -962,7 +962,7 @@ public class SearchActivity extends Activity
                     ActionsPolicy.openFileSystemObject(this, fso, false);
                     return;
                 }
-                
+
             } catch (Exception e) {
                 // Capture the exception
                 ExceptionUtil.translateException(this, e);
diff --git a/src/com/cyanogenmod/explorer/ui/dialogs/AssociationsDialog.java b/src/com/cyanogenmod/explorer/ui/dialogs/AssociationsDialog.java
index d586b20..082a92c 100644
--- a/src/com/cyanogenmod/explorer/ui/dialogs/AssociationsDialog.java
+++ b/src/com/cyanogenmod/explorer/ui/dialogs/AssociationsDialog.java
@@ -88,7 +88,7 @@ public class AssociationsDialog implements OnItemClickListener {
      * @param requestIntent The original request
      * @param intents The list of available intents that can handle an action
      * @param preferred The preferred intent. null if no preferred exists
-     * @param allowPreferred If allow the user to mark the selected app as preferred 
+     * @param allowPreferred If allow the user to mark the selected app as preferred
      */
     public AssociationsDialog(
             Context context, int icon, String title, String action,
@@ -408,7 +408,7 @@ public class AssociationsDialog implements OnItemClickListener {
                         }
 
                         // Use reflection to access the hidden replacePreferredActivity method
-                        // FIXME This need to be tested on a CM compilation. Now 
+                        // FIXME This need to be tested on a CM compilation. Now
                         // replacePreferredActivity is not working. Check also
                         // the use of addPreferredActivity.
                         PackageManager pm = this.mContext.getPackageManager();
diff --git a/src/com/cyanogenmod/explorer/ui/widgets/NavigationView.java b/src/com/cyanogenmod/explorer/ui/widgets/NavigationView.java
index 040a5d4..e67b4c0 100644
--- a/src/com/cyanogenmod/explorer/ui/widgets/NavigationView.java
+++ b/src/com/cyanogenmod/explorer/ui/widgets/NavigationView.java
@@ -745,10 +745,10 @@ public class NavigationView extends RelativeLayout implements
 
         return true; //Always consume the event
     }
-    
+
     /**
      * Method that opens or navigates to the {@link FileSystemObject}
-     * 
+     *
      * @param fso The file system object
      */
     public void open(FileSystemObject fso) {
@@ -757,7 +757,7 @@ public class NavigationView extends RelativeLayout implements
 
     /**
      * Method that opens or navigates to the {@link FileSystemObject}
-     * 
+     *
      * @param fso The file system object
      * @param searchInfo The search info
      */