Merge pull request #1346 from vector-im/riot_1344

Bug Fix - Chat screen: the search icon is missing after switching in …

Riot/Base.lproj/Main.storyboard

@@ -81,7 +81,6 @@
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
-                        <barButtonItem key="rightBarButtonItem" image="search_icon.png" id="Koy-mU-PTG" userLabel="Menu Bar Button Item"/>
                     </navigationItem>
                     <connections>
                         <outlet property="roomTitleViewContainer" destination="djN-zB-Vni" id="VQG-Mp-hSa"/>

Riot/ViewController/RoomViewController.m

@@ -162,6 +162,9 @@
     
     // Tell whether the view controller is appeared or not.
     BOOL isAppeared;
+    
+    // The search bar buttom item back up.
+    UIBarButtonItem *searchBarButtonItem;
 }
 
 @end
@@ -970,6 +973,7 @@
 
 - (void)destroy
 {
+    searchBarButtonItem = nil;
     self.navigationItem.rightBarButtonItem.enabled = NO;
     
     if (currentAlert)
@@ -1067,6 +1071,12 @@
 
 - (void)refreshRoomTitle
 {
+    if (searchBarButtonItem && !self.navigationItem.rightBarButtonItem)
+    {
+        // Restore by default the search bar button.
+        self.navigationItem.rightBarButtonItem = searchBarButtonItem;
+    }
+    
     // Set the right room title view
     if (self.isRoomPreview)
     {
@@ -1101,7 +1111,8 @@
         }
         else
         {
-            // Hide the search button
+            // Remove the search button temporarily
+            searchBarButtonItem = self.navigationItem.rightBarButtonItem;
             self.navigationItem.rightBarButtonItem = nil;
             
             [self setRoomTitleViewClass:SimpleRoomTitleView.class];