--- /dev/null
+/* ownCloud Android client application
+ * Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.oc_framework.accounts;
+
+import java.lang.ref.WeakReference;
+
+
+import android.graphics.Bitmap;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.View;
+import android.webkit.CookieManager;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+
+/**
+ * Custom {@link WebViewClient} client aimed to catch the end of a single-sign-on process
+ * running in the {@link WebView} that is attached to.
+ *
+ * Assumes that the single-sign-on is kept thanks to a cookie set at the end of the
+ * authentication process.
+ *
+ * @author David A. Velasco
+ */
+public class SsoWebViewClient extends WebViewClient {
+
+ private static final String TAG = SsoWebViewClient.class.getSimpleName();
+
+ public interface SsoWebViewClientListener {
+ public void onSsoFinished(String sessionCookie);
+ }
+
+ private Handler mListenerHandler;
+ private WeakReference<SsoWebViewClientListener> mListenerRef;
+ private String mTargetUrl;
+ private String mLastReloadedUrlAtError;
+
+ public SsoWebViewClient (Handler listenerHandler, SsoWebViewClientListener listener) {
+ mListenerHandler = listenerHandler;
+ mListenerRef = new WeakReference<SsoWebViewClient.SsoWebViewClientListener>(listener);
+ mTargetUrl = "fake://url.to.be.set";
+ mLastReloadedUrlAtError = null;
+ }
+
+ public String getTargetUrl() {
+ return mTargetUrl;
+ }
+
+ public void setTargetUrl(String targetUrl) {
+ mTargetUrl = targetUrl;
+ }
+
+ @Override
+ public void onPageStarted (WebView view, String url, Bitmap favicon) {
+ Log.d(TAG, "onPageStarted : " + url);
+ super.onPageStarted(view, url, favicon);
+ }
+
+ @Override
+ public void onFormResubmission (WebView view, Message dontResend, Message resend) {
+ Log.d(TAG, "onFormResubMission ");
+
+ // necessary to grant reload of last page when device orientation is changed after sending a form
+ resend.sendToTarget();
+ }
+
+ @Override
+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
+ return false;
+ }
+
+ @Override
+ public void onReceivedError (WebView view, int errorCode, String description, String failingUrl) {
+ Log.e(TAG, "onReceivedError : " + failingUrl + ", code " + errorCode + ", description: " + description);
+ if (!failingUrl.equals(mLastReloadedUrlAtError)) {
+ view.reload();
+ mLastReloadedUrlAtError = failingUrl;
+ } else {
+ mLastReloadedUrlAtError = null;
+ super.onReceivedError(view, errorCode, description, failingUrl);
+ }
+ }
+
+ @Override
+ public void onPageFinished (WebView view, String url) {
+ Log.d(TAG, "onPageFinished : " + url);
+ mLastReloadedUrlAtError = null;
+ if (url.startsWith(mTargetUrl)) {
+ view.setVisibility(View.GONE);
+ CookieManager cookieManager = CookieManager.getInstance();
+ final String cookies = cookieManager.getCookie(url);
+ //Log_OC.d(TAG, "Cookies: " + cookies);
+ if (mListenerHandler != null && mListenerRef != null) {
+ // this is good idea because onPageFinished is not running in the UI thread
+ mListenerHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ SsoWebViewClientListener listener = mListenerRef.get();
+ if (listener != null) {
+ listener.onSsoFinished(cookies);
+ }
+ }
+ });
+ }
+ }
+
+ }
+
+ /*
+ @Override
+ public void doUpdateVisitedHistory (WebView view, String url, boolean isReload) {
+ Log.d(TAG, "doUpdateVisitedHistory : " + url);
+ }
+
+ @Override
+ public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) {
+ Log.d(TAG, "onReceivedSslError : " + error);
+ }
+
+ @Override
+ public void onReceivedHttpAuthRequest (WebView view, HttpAuthHandler handler, String host, String realm) {
+ Log.d(TAG, "onReceivedHttpAuthRequest : " + host);
+ }
+
+ @Override
+ public WebResourceResponse shouldInterceptRequest (WebView view, String url) {
+ Log.d(TAG, "shouldInterceptRequest : " + url);
+ return null;
+ }
+
+ @Override
+ public void onLoadResource (WebView view, String url) {
+ Log.d(TAG, "onLoadResource : " + url);
+ }
+
+ @Override
+ public void onReceivedLoginRequest (WebView view, String realm, String account, String args) {
+ Log.d(TAG, "onReceivedLoginRequest : " + realm + ", " + account + ", " + args);
+ }
+
+ @Override
+ public void onScaleChanged (WebView view, float oldScale, float newScale) {
+ Log.d(TAG, "onScaleChanged : " + oldScale + " -> " + newScale);
+ super.onScaleChanged(view, oldScale, newScale);
+ }
+
+ @Override
+ public void onUnhandledKeyEvent (WebView view, KeyEvent event) {
+ Log.d(TAG, "onUnhandledKeyEvent : " + event);
+ }
+
+ @Override
+ public boolean shouldOverrideKeyEvent (WebView view, KeyEvent event) {
+ Log.d(TAG, "shouldOverrideKeyEvent : " + event);
+ return false;
+ }
+ */
+}
import com.actionbarsherlock.app.SherlockDialogFragment;\r
import com.owncloud.android.MainApp;\r
import com.owncloud.android.R;\r
-import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;\r
import com.owncloud.android.oc_framework.accounts.AccountTypeUtils;\r
import com.owncloud.android.oc_framework.accounts.OwnCloudAccount;\r
+import com.owncloud.android.oc_framework.accounts.SsoWebViewClient.SsoWebViewClientListener;\r
import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;\r
import com.owncloud.android.oc_framework.network.webdav.WebdavClient;\r
import com.owncloud.android.operations.OAuth2GetAccessToken;\r
+++ /dev/null
-/* ownCloud Android client application
- * Copyright (C) 2012-2013 ownCloud Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.authentication;
-
-import java.lang.ref.WeakReference;
-
-import com.owncloud.android.utils.Log_OC;
-
-
-import android.graphics.Bitmap;
-import android.os.Handler;
-import android.os.Message;
-import android.view.View;
-import android.webkit.CookieManager;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-
-/**
- * Custom {@link WebViewClient} client aimed to catch the end of a single-sign-on process
- * running in the {@link WebView} that is attached to.
- *
- * Assumes that the single-sign-on is kept thanks to a cookie set at the end of the
- * authentication process.
- *
- * @author David A. Velasco
- */
-public class SsoWebViewClient extends WebViewClient {
-
- private static final String TAG = SsoWebViewClient.class.getSimpleName();
-
- public interface SsoWebViewClientListener {
- public void onSsoFinished(String sessionCookie);
- }
-
- private Handler mListenerHandler;
- private WeakReference<SsoWebViewClientListener> mListenerRef;
- private String mTargetUrl;
- private String mLastReloadedUrlAtError;
-
- public SsoWebViewClient (Handler listenerHandler, SsoWebViewClientListener listener) {
- mListenerHandler = listenerHandler;
- mListenerRef = new WeakReference<SsoWebViewClient.SsoWebViewClientListener>(listener);
- mTargetUrl = "fake://url.to.be.set";
- mLastReloadedUrlAtError = null;
- }
-
- public String getTargetUrl() {
- return mTargetUrl;
- }
-
- public void setTargetUrl(String targetUrl) {
- mTargetUrl = targetUrl;
- }
-
- @Override
- public void onPageStarted (WebView view, String url, Bitmap favicon) {
- Log_OC.d(TAG, "onPageStarted : " + url);
- super.onPageStarted(view, url, favicon);
- }
-
- @Override
- public void onFormResubmission (WebView view, Message dontResend, Message resend) {
- Log_OC.d(TAG, "onFormResubMission ");
-
- // necessary to grant reload of last page when device orientation is changed after sending a form
- resend.sendToTarget();
- }
-
- @Override
- public boolean shouldOverrideUrlLoading(WebView view, String url) {
- return false;
- }
-
- @Override
- public void onReceivedError (WebView view, int errorCode, String description, String failingUrl) {
- Log_OC.e(TAG, "onReceivedError : " + failingUrl + ", code " + errorCode + ", description: " + description);
- if (!failingUrl.equals(mLastReloadedUrlAtError)) {
- view.reload();
- mLastReloadedUrlAtError = failingUrl;
- } else {
- mLastReloadedUrlAtError = null;
- super.onReceivedError(view, errorCode, description, failingUrl);
- }
- }
-
- @Override
- public void onPageFinished (WebView view, String url) {
- Log_OC.d(TAG, "onPageFinished : " + url);
- mLastReloadedUrlAtError = null;
- if (url.startsWith(mTargetUrl)) {
- view.setVisibility(View.GONE);
- CookieManager cookieManager = CookieManager.getInstance();
- final String cookies = cookieManager.getCookie(url);
- //Log_OC.d(TAG, "Cookies: " + cookies);
- if (mListenerHandler != null && mListenerRef != null) {
- // this is good idea because onPageFinished is not running in the UI thread
- mListenerHandler.post(new Runnable() {
- @Override
- public void run() {
- SsoWebViewClientListener listener = mListenerRef.get();
- if (listener != null) {
- listener.onSsoFinished(cookies);
- }
- }
- });
- }
- }
-
- }
-
- /*
- @Override
- public void doUpdateVisitedHistory (WebView view, String url, boolean isReload) {
- Log_OC.d(TAG, "doUpdateVisitedHistory : " + url);
- }
-
- @Override
- public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) {
- Log_OC.d(TAG, "onReceivedSslError : " + error);
- }
-
- @Override
- public void onReceivedHttpAuthRequest (WebView view, HttpAuthHandler handler, String host, String realm) {
- Log_OC.d(TAG, "onReceivedHttpAuthRequest : " + host);
- }
-
- @Override
- public WebResourceResponse shouldInterceptRequest (WebView view, String url) {
- Log_OC.d(TAG, "shouldInterceptRequest : " + url);
- return null;
- }
-
- @Override
- public void onLoadResource (WebView view, String url) {
- Log_OC.d(TAG, "onLoadResource : " + url);
- }
-
- @Override
- public void onReceivedLoginRequest (WebView view, String realm, String account, String args) {
- Log_OC.d(TAG, "onReceivedLoginRequest : " + realm + ", " + account + ", " + args);
- }
-
- @Override
- public void onScaleChanged (WebView view, float oldScale, float newScale) {
- Log_OC.d(TAG, "onScaleChanged : " + oldScale + " -> " + newScale);
- super.onScaleChanged(view, oldScale, newScale);
- }
-
- @Override
- public void onUnhandledKeyEvent (WebView view, KeyEvent event) {
- Log_OC.d(TAG, "onUnhandledKeyEvent : " + event);
- }
-
- @Override
- public boolean shouldOverrideKeyEvent (WebView view, KeyEvent event) {
- Log_OC.d(TAG, "shouldOverrideKeyEvent : " + event);
- return false;
- }
- */
-}
import com.actionbarsherlock.app.SherlockDialogFragment;
import com.owncloud.android.R;
-import com.owncloud.android.authentication.SsoWebViewClient;
-import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
+import com.owncloud.android.oc_framework.accounts.SsoWebViewClient;
+import com.owncloud.android.oc_framework.accounts.SsoWebViewClient.SsoWebViewClientListener;
import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
import com.owncloud.android.utils.Log_OC;
projects / pub / Android / ownCloud.git / commitdiff