From aa59aa9c47b7da6dc6d1bbcf74c7d34d4555dfe9 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 17 Aug 2021 15:56:48 -0400 Subject: [PATCH] fix(core): improve logged error when module is invalid --- UI/MainUI/SOGoUserHomePage.m | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m index 6acd81f9f..2fbbf83dc 100644 --- a/UI/MainUI/SOGoUserHomePage.m +++ b/UI/MainUI/SOGoUserHomePage.m @@ -66,6 +66,7 @@ SOGoSystemDefaults *sd; SOGoDomainDefaults *dd; SOGoUserDefaults *ud; + BOOL moduleIsValid; NSArray *filters; NSURL *moduleURL; @@ -74,13 +75,16 @@ ud = [[context activeUser] userDefaults]; loginModule = [ud loginModule]; - if (!([loginModule isEqualToString: @"Calendar"] - || [loginModule isEqualToString: @"Contacts"] - || [loginModule isEqualToString: @"Mail"]) - || ![[context activeUser] canAccessModule: loginModule]) + moduleIsValid = ([loginModule isEqualToString: @"Calendar"] || + [loginModule isEqualToString: @"Contacts"] || + [loginModule isEqualToString: @"Mail"]); + if (!moduleIsValid) { - [self errorWithFormat: @"login module '%@' not accepted (must be" + [self errorWithFormat: @"login module '%@' not accepted (must be " @"'Calendar', 'Contacts' or 'Mail')", loginModule]; + } + if (!moduleIsValid || ![[context activeUser] canAccessModule: loginModule]) + { loginModule = @"Contacts"; }