Merge branch 'develop' into groups

This commit is contained in:
Giom Foret
2017-12-22 14:50:40 +01:00
32 changed files with 201 additions and 241 deletions
@@ -243,14 +243,9 @@
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
// Screen tracking (via Google Analytics)
id<GAITracker> tracker = [[GAI sharedInstance] defaultTracker];
if (tracker)
{
[tracker set:kGAIScreenName value:@"RoomParticipants"];
[tracker send:[[GAIDictionaryBuilder createScreenView] build]];
}
// Screen tracking
[[AppDelegate theDelegate] trackScreen:@"RoomParticipants"];
if (memberDetailsViewController)
{