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

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

Browse Source 
# Conflicts:
#	Riot/Constants/RiotDesignValues.m
#	Riot/Modules/Authentication/AuthenticationViewController.m
This commit is contained in:
manuroe
2019-01-10 11:50:57 +01:00
parent 43f870209a f4f5bdd906
commit 63ee0e14be
31 changed files with 240 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Authentication/Views/AuthInputsView.m
+2 -2
View File
@@ -1281,11 +1281,11 @@
// Retrieve the site key
NSString *siteKey;
id recaptchaParams = [currentSession.params objectForKey:kMXLoginFlowTypeRecaptcha];
id recaptchaParams = currentSession.params[kMXLoginFlowTypeRecaptcha];
if (recaptchaParams && [recaptchaParams isKindOfClass:NSDictionary.class])
{
NSDictionary *recaptchaParamsDict = (NSDictionary*)recaptchaParams;
siteKey = [recaptchaParamsDict objectForKey:@"public_key"];
siteKey = recaptchaParamsDict[@"public_key"];
}
// Retrieve the REST client from delegate