felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 23:48:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into reskin

Browse Source
This commit is contained in:
manuroe
2019-01-09 16:38:49 +01:00
parent fa28e4b464 389eb3c8f7
commit a39a47a4e4
32 changed files with 1106 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Riot/Modules/Authentication/Views/AuthInputsView.m
View File

@@ -965,21 +965,10 @@
// Check whether an account may be created without third-party identifiers.
for (MXLoginFlow *loginFlow in currentSession.flows)
{
if ([loginFlow.stages indexOfObject:kMXLoginFlowTypeDummy] != NSNotFound || [loginFlow.type isEqualToString:kMXLoginFlowTypeDummy])
if ([loginFlow.stages indexOfObject:kMXLoginFlowTypeEmailIdentity] == NSNotFound
&& [loginFlow.stages indexOfObject:kMXLoginFlowTypeMSISDN] == NSNotFound)
{
// The dummy flow is supported, the 3pid are then optional.
return NO;
}
if ((loginFlow.stages.count == 1 && [loginFlow.stages[0] isEqualToString:kMXLoginFlowTypeRecaptcha]) || [loginFlow.type isEqualToString:kMXLoginFlowTypeRecaptcha])
{
// The recaptcha flow is supported alone, the 3pids are then optional.
return NO;
}
if ((loginFlow.stages.count == 1 && [loginFlow.stages[0] isEqualToString:kMXLoginFlowTypePassword]) || [loginFlow.type isEqualToString:kMXLoginFlowTypePassword])
{
// The password flow is supported alone, the 3pids are then optional.
// There is a flow with no 3pids
return NO;
}
}