|
|
@ -17,15 +17,14 @@
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
package com.todoroo.astrid.actfm;
|
|
|
|
package com.todoroo.astrid.taskrabbit;
|
|
|
|
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import android.app.ProgressDialog;
|
|
|
|
import android.app.ProgressDialog;
|
|
|
|
import android.content.Intent;
|
|
|
|
import android.content.Intent;
|
|
|
|
|
|
|
|
import android.net.http.SslError;
|
|
|
|
import android.os.Bundle;
|
|
|
|
import android.os.Bundle;
|
|
|
|
import android.support.v4.app.FragmentActivity;
|
|
|
|
import android.support.v4.app.FragmentActivity;
|
|
|
|
import android.util.Log;
|
|
|
|
import android.webkit.SslErrorHandler;
|
|
|
|
import android.webkit.WebView;
|
|
|
|
import android.webkit.WebView;
|
|
|
|
import android.webkit.WebViewClient;
|
|
|
|
import android.webkit.WebViewClient;
|
|
|
|
|
|
|
|
|
|
|
@ -36,14 +35,14 @@ import com.todoroo.andlib.service.RestClient;
|
|
|
|
import com.todoroo.andlib.utility.DialogUtilities;
|
|
|
|
import com.todoroo.andlib.utility.DialogUtilities;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* This activity displays a <code>WebView</code> that allows users to log in to the
|
|
|
|
* This activity displays a <code>WebView</code> that allows users to log in to
|
|
|
|
* synchronization provider requested. A callback method determines whether
|
|
|
|
* the synchronization provider requested. A callback method determines whether
|
|
|
|
* their login was successful and therefore whether to dismiss the dialog.
|
|
|
|
* their login was successful and therefore whether to dismiss the dialog.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @author timsu
|
|
|
|
* @author timsu
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public class OAuthLoginActivity extends FragmentActivity {
|
|
|
|
public class TaskRabbitOAuthLoginActivity extends FragmentActivity {
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* URL to display
|
|
|
|
* URL to display
|
|
|
@ -55,7 +54,8 @@ public class OAuthLoginActivity extends FragmentActivity {
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public static final String DATA_RESPONSE = "response"; //$NON-NLS-1$
|
|
|
|
public static final String DATA_RESPONSE = "response"; //$NON-NLS-1$
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired RestClient restClient;
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
RestClient restClient;
|
|
|
|
|
|
|
|
|
|
|
|
ProgressDialog pd;
|
|
|
|
ProgressDialog pd;
|
|
|
|
|
|
|
|
|
|
|
@ -82,43 +82,46 @@ public class OAuthLoginActivity extends FragmentActivity {
|
|
|
|
webView.setWebViewClient(new WebViewClient() {
|
|
|
|
webView.setWebViewClient(new WebViewClient() {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void onPageFinished(WebView view, final String url) {
|
|
|
|
public void onReceivedError(WebView view, int errorCode,
|
|
|
|
super.onPageFinished(view, url);
|
|
|
|
String description, String failingUrl) {
|
|
|
|
pd.dismiss();
|
|
|
|
System.err.println("hey error. " + errorCode + ": " + description);
|
|
|
|
new Thread() {
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void run() {
|
|
|
|
public void onReceivedSslError(WebView view,
|
|
|
|
String data;
|
|
|
|
SslErrorHandler handler, SslError error) {
|
|
|
|
try {
|
|
|
|
handler.proceed();
|
|
|
|
data = restClient.get(url);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if(data.startsWith("<!-- success -->")) { //$NON-NLS-1$
|
|
|
|
@Override
|
|
|
|
data = data.substring(data.indexOf('{'), data.lastIndexOf('}') + 1);
|
|
|
|
public boolean shouldOverrideUrlLoading(WebView view, String url) {
|
|
|
|
Intent intent = new Intent();
|
|
|
|
if (url.contains("?client_id=")
|
|
|
|
intent.putExtra(DATA_RESPONSE, data);
|
|
|
|
&& (url.lastIndexOf("?client_id=") != url.indexOf("?client_id="))) {
|
|
|
|
setResult(RESULT_OK, intent);
|
|
|
|
String redirectUrl = url.substring(0,
|
|
|
|
runOnUiThread(new Runnable() {
|
|
|
|
url.lastIndexOf("?client_id="));
|
|
|
|
public void run() {
|
|
|
|
webView.loadUrl(redirectUrl);
|
|
|
|
finish();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
return super.shouldOverrideUrlLoading(view, url);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (url.contains("access_token=")){
|
|
|
|
|
|
|
|
String token = url.substring(url.indexOf("access_token="), url.length());
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public void onLoadResource(WebView view, String url) {
|
|
|
|
|
|
|
|
super.onLoadResource(view, url);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public void onPageFinished(WebView view, final String url) {
|
|
|
|
|
|
|
|
super.onPageFinished(view, url);
|
|
|
|
|
|
|
|
pd.dismiss();
|
|
|
|
|
|
|
|
if (url.contains("access_token=")) {
|
|
|
|
|
|
|
|
String token = url.substring(url.indexOf("access_token="),
|
|
|
|
|
|
|
|
url.length());
|
|
|
|
Intent intent = new Intent();
|
|
|
|
Intent intent = new Intent();
|
|
|
|
intent.putExtra(DATA_RESPONSE, token);
|
|
|
|
intent.putExtra(DATA_RESPONSE, token);
|
|
|
|
setResult(RESULT_OK, intent);
|
|
|
|
setResult(RESULT_OK, intent);
|
|
|
|
runOnUiThread(new Runnable() {
|
|
|
|
|
|
|
|
public void run() {
|
|
|
|
|
|
|
|
finish();
|
|
|
|
finish();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|
|
|
|
Log.e("astrid", "error-load-url", e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}.start();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|