Fix /issues/6004 - Reset home filters when switching tabs.

Author: stefanceriu

Riot/Modules/Favorites/FavouritesViewController.m

@@ -64,10 +64,14 @@ - (void)viewWillAppear:(BOOL)animated
     [super viewWillAppear:animated];
     [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;
 
-    if (recentsDataSource)
+    if (recentsDataSource.recentsDataSourceMode != RecentsDataSourceModeFavourites)
     {
         // Take the lead on the shared data source.
         [recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModeFavourites];
+        
+        // Reset filtering on the shared data source when switching tabs
+        [recentsDataSource searchWithPatterns:nil];
+        [self.recentsSearchBar setText:nil];
     }
 }
 

Riot/Modules/Home/HomeViewController.m

@@ -112,6 +112,10 @@ - (void)viewWillAppear:(BOOL)animated
     {
         // Take the lead on the shared data source.
         [recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModeHome];
+        
+        // Reset filtering on the shared data source when switching tabs
+        [self searchBarCancelButtonClicked:self.recentsSearchBar];
+        [self.recentsSearchBar setText:nil];
     }
 }
 

Riot/Modules/People/PeopleViewController.m

@@ -90,7 +90,16 @@ - (void)viewWillAppear:(BOOL)animated
     {
         // Take the lead on the shared data source.
         recentsDataSource = (RecentsDataSource*)self.dataSource;
-        [recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModePeople];
+        
+        if (recentsDataSource.recentsDataSourceMode != RecentsDataSourceModePeople)
+        {
+            // Take the lead on the shared data source.
+            [recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModePeople];
+            
+            // Reset filtering on the shared data source when switching tabs
+            [recentsDataSource searchWithPatterns:nil];
+            [self.recentsSearchBar setText:nil];
+        }
     }
 }
 

Riot/Modules/Rooms/RoomsViewController.m

@@ -72,7 +72,16 @@ - (void)viewWillAppear:(BOOL)animated
     {
         // Take the lead on the shared data source.
         recentsDataSource = (RecentsDataSource*)self.dataSource;
-        [recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModeRooms];
+        
+        if (recentsDataSource.recentsDataSourceMode != RecentsDataSourceModeRooms)
+        {
+            // Take the lead on the shared data source.
+            [recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModeRooms];
+            
+            // Reset filtering on the shared data source when switching tabs
+            [recentsDataSource searchWithPatterns:nil];
+            [self.recentsSearchBar setText:nil];
+        }
     }
 }
 

changelog.d/6004.bugfix

@@ -0,0 +1 @@
+Reset home filters when switching tabs.