Add back all media button to conversation settings

Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m

@@ -387,6 +387,10 @@ const CGFloat kIconViewLength = 24;
                                      [strongSelf presentAddToContactViewControllerWithRecipientId:recipientId];
                                  }]];
     }
+     
+     if (SSKFeatureFlags.conversationSearch) {
+     * ========
+     */
 
     [mainSection addItem:[OWSTableItem
                              itemWithCustomCellBlock:^{
@@ -399,24 +403,21 @@ const CGFloat kIconViewLength = 24;
                              actionBlock:^{
                                  [weakSelf showMediaGallery];
                              }]];
-     
+
-     if (SSKFeatureFlags.conversationSearch) {
+    [mainSection addItem:[OWSTableItem
-     * ========
+                             itemWithCustomCellBlock:^{
-     */
+                                 NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_SEARCH",
-        [mainSection addItem:[OWSTableItem
+                                     @"Table cell label in conversation settings which returns the user to the "
-                                 itemWithCustomCellBlock:^{
+                                     @"conversation with 'search mode' activated");
-                                     NSString *title = NSLocalizedString(@"CONVERSATION_SETTINGS_SEARCH",
+                                 return [weakSelf
-                                         @"Table cell label in conversation settings which returns the user to the "
+                                      disclosureCellWithName:title
-                                         @"conversation with 'search mode' activated");
+                                                    iconName:@"conversation_settings_search"
-                                     return [weakSelf
+                                     accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
-                                          disclosureCellWithName:title
+                                                                 OWSConversationSettingsViewController, @"search")];
-                                                        iconName:@"conversation_settings_search"
+                             }
-                                         accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
+                             actionBlock:^{
-                                                                     OWSConversationSettingsViewController, @"search")];
+                                 [weakSelf tappedConversationSearch];
-                                 }
+                             }]];
-                                 actionBlock:^{
-                                     [weakSelf tappedConversationSearch];
-                                 }]];
     /*
     }