|
@@ -466,10 +466,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
}
|
|
}
|
|
|
|
|
|
private void parseAndLoginFromWebView(String dataString) {
|
|
private void parseAndLoginFromWebView(String dataString) {
|
|
- String prefix = getString(R.string.login_data_own_scheme) + PROTOCOL_SUFFIX + "login/";
|
|
|
|
- LoginUrlInfo loginUrlInfo = parseLoginDataUrl(prefix, dataString);
|
|
|
|
-
|
|
|
|
try {
|
|
try {
|
|
|
|
+ String prefix = getString(R.string.login_data_own_scheme) + PROTOCOL_SUFFIX + "login/";
|
|
|
|
+ LoginUrlInfo loginUrlInfo = parseLoginDataUrl(prefix, dataString);
|
|
|
|
+
|
|
if (mHostUrlInput != null) {
|
|
if (mHostUrlInput != null) {
|
|
mHostUrlInput.setText("");
|
|
mHostUrlInput.setText("");
|
|
}
|
|
}
|
|
@@ -1438,10 +1438,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
|
|
|
Uri data = getIntent().getData();
|
|
Uri data = getIntent().getData();
|
|
if (data != null && data.toString().startsWith(getString(R.string.login_data_own_scheme))) {
|
|
if (data != null && data.toString().startsWith(getString(R.string.login_data_own_scheme))) {
|
|
- String prefix = getString(R.string.login_data_own_scheme) + PROTOCOL_SUFFIX + "login/";
|
|
|
|
- LoginUrlInfo loginUrlInfo = parseLoginDataUrl(prefix, data.toString());
|
|
|
|
-
|
|
|
|
try {
|
|
try {
|
|
|
|
+ String prefix = getString(R.string.login_data_own_scheme) + PROTOCOL_SUFFIX + "login/";
|
|
|
|
+ LoginUrlInfo loginUrlInfo = parseLoginDataUrl(prefix, data.toString());
|
|
|
|
+
|
|
mServerInfo.mBaseUrl = AuthenticatorUrlUtils.normalizeUrlSuffix(loginUrlInfo.serverAddress);
|
|
mServerInfo.mBaseUrl = AuthenticatorUrlUtils.normalizeUrlSuffix(loginUrlInfo.serverAddress);
|
|
webViewUser = loginUrlInfo.username;
|
|
webViewUser = loginUrlInfo.username;
|
|
webViewPassword = loginUrlInfo.password;
|
|
webViewPassword = loginUrlInfo.password;
|