Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Public rooms search: Made sure the room is no more selected when leaving the rooom page

Browse source
This commit is contained in:
manuroe 2015-12-22 17:43:25 +01:00
parent 0caeb839c6
commit f2d847ea4d
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Vector/ViewController/DirectoryViewController.m
View file

@ -50,7 +50,12 @@
{
[super viewDidAppear:animated];
if (self.splitViewController && !self.splitViewController.isCollapsed)
// Release the current selected room (if any) except if the Room ViewController is still visible (see splitViewController.isCollapsed condition)
if (self.splitViewController && self.splitViewController.isCollapsed)
{
[[AppDelegate theDelegate].homeViewController closeSelectedRoom];
}
else
{
// In case of split view controller where the primary and secondary view controllers are displayed side-by-side onscreen,
// the selected room (if any) is highlighted.

8
Vector/ViewController/HomeViewController.m
View file

@ -192,8 +192,7 @@
[super viewDidAppear:animated];
// Release the current selected room (if any) except if the Room ViewController is still visible (see splitViewController.isCollapsed condition)
// Note: 'isCollapsed' property is available in UISplitViewController for iOS 8 and later.
if (!self.splitViewController || ([self.splitViewController respondsToSelector:@selector(isCollapsed)] && self.splitViewController.isCollapsed))
if (!self.splitViewController || self.splitViewController.isCollapsed)
{
// Release the current selected room (if any).
[self closeSelectedRoom];
@ -210,9 +209,8 @@
{
[super viewWillDisappear:animated];
// TODO: Check why it was done before
//_selectedRoomId = nil;
//_selectedRoomSession = nil;
_selectedRoomId = nil;
_selectedRoomSession = nil;
}
- (void) viewDidLayoutSubviews

5
Vector/ViewController/RecentsViewController.m
View file

@ -120,11 +120,10 @@
[super viewDidAppear:animated];
// Release the current selected room (if any) except if the Room ViewController is still visible (see splitViewController.isCollapsed condition)
// Note: 'isCollapsed' property is available in UISplitViewController for iOS 8 and later.
if (!self.splitViewController || ([self.splitViewController respondsToSelector:@selector(isCollapsed)] && self.splitViewController.isCollapsed))
if (!self.splitViewController || self.splitViewController.isCollapsed)
{
// Release the current selected room (if any).
//[self closeSelectedRoom];
[homeViewController closeSelectedRoom];
}
else
{