Source:
<code>private AuthenticationRequest getAuthenticationRequestFromIntent(Intent callingIntent) { AuthenticationRequest authRequest = null; if (insideBroker()) { String authority = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_AUTHORITY); String resource = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_RESOURCE); String redirect = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_REDIRECT); String loginhint = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_LOGIN_HINT); String accountName = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_NAME); <START> String clientid = callingIntent <END> .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_CLIENTID_KEY); String correlationId = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_CORRELATIONID); mWaitingRequestId = callingIntent.getIntExtra( AuthenticationConstants.Browser.REQUEST_ID, 0); UUID correlationIdParsed = null; if (!StringExtensions.IsNullOrBlank(correlationId)) { try { correlationIdParsed = UUID.fromString(correlationId); } catch (IllegalArgumentException ex) { correlationIdParsed = null; Logger.e(TAG, "CorrelationId is malformed: " + correlationId, "", ADALError.CORRELATION_ID_FORMAT); } } authRequest = new AuthenticationRequest(authority, resource, clientid, redirect, loginhint, correlationIdParsed); authRequest.setBrokerAccountName(accountName); } else { Serializable request = callingIntent .getSerializableExtra(AuthenticationConstants.Browser.REQUEST_MESSAGE); if (request instanceof AuthenticationRequest) { authRequest = (AuthenticationRequest)request; } } return authRequest; }</code><technical_language>nit: clientidKey variable name. ClientId a specific meaning in OAuth</technical_language>

Target:
private AuthenticationRequest getAuthenticationRequestFromIntent(Intent callingIntent) { AuthenticationRequest authRequest = null; if (insideBroker()) { String authority = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_AUTHORITY); String resource = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_RESOURCE); String redirect = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_REDIRECT); String loginhint = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_LOGIN_HINT); String accountName = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_NAME); String clientidKey = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_CLIENTID_KEY); String correlationId = callingIntent .getStringExtra(AuthenticationConstants.Broker.ACCOUNT_CORRELATIONID); mWaitingRequestId = callingIntent.getIntExtra( AuthenticationConstants.Browser.REQUEST_ID, 0); UUID correlationIdParsed = null; if (!StringExtensions.IsNullOrBlank(correlationId)) { try { correlationIdParsed = UUID.fromString(correlationId); } catch (IllegalArgumentException ex) { correlationIdParsed = null; Logger.e(TAG, "CorrelationId is malformed: " + correlationId, "", ADALError.CORRELATION_ID_FORMAT); } } authRequest = new AuthenticationRequest(authority, resource, clientidKey, redirect, loginhint, correlationIdParsed); authRequest.setBrokerAccountName(accountName); } else { Serializable request = callingIntent .getSerializableExtra(AuthenticationConstants.Browser.REQUEST_MESSAGE); if (request instanceof AuthenticationRequest) { authRequest = (AuthenticationRequest)request; } } return authRequest; }