From: David A. Velasco Date: Tue, 3 Feb 2015 11:46:23 +0000 (+0100) Subject: Merge branch 'master' into release-1.7.0 X-Git-Tag: oc-android-1.7.0_signed~15 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5116bd99e26954fb83621863ff26e351d0a08cfd?hp=5169261b66eb47a3730c3836199c251a4d5d7286 Merge branch 'master' into release-1.7.0 --- diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fd92d3d6..4acdec0f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,8 +18,8 @@ along with this program. If not, see . --> + android:versionCode="10600301" + android:versionName="1.6.3" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index df4e21b1..8d7182d7 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -1020,12 +1020,11 @@ SsoWebViewClientListener, OnSslUntrustedCertListener { dismissDialog(WAIT_DIALOG_TAG); if (result.isIdPRedirection()) { - String url = result.getRedirectedLocation(); String targetUrl = mServerInfo.mBaseUrl + AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType); // Show dialog - SamlWebViewDialog dialog = SamlWebViewDialog.newInstance(url, targetUrl); + SamlWebViewDialog dialog = SamlWebViewDialog.newInstance(targetUrl, targetUrl); dialog.show(getSupportFragmentManager(), SAML_DIALOG_TAG); mAuthStatusIcon = 0; diff --git a/src/com/owncloud/android/authentication/SsoWebViewClient.java b/src/com/owncloud/android/authentication/SsoWebViewClient.java index b90ab85b..2aaecb43 100644 --- a/src/com/owncloud/android/authentication/SsoWebViewClient.java +++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java @@ -1,5 +1,5 @@ /* ownCloud Android client application - * Copyright (C) 2012-2013 ownCloud Inc. + * Copyright (C) 2012-2015 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, @@ -124,7 +124,7 @@ public class SsoWebViewClient extends WebViewClient { view.setVisibility(View.GONE); CookieManager cookieManager = CookieManager.getInstance(); final String cookies = cookieManager.getCookie(url); - Log_OC.d(TAG, "Cookies: " + cookies); + //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() { @@ -141,22 +141,14 @@ public class SsoWebViewClient extends WebViewClient { } } - - @Override - public void doUpdateVisitedHistory (WebView view, String url, boolean isReload) { - Log_OC.d(TAG, "doUpdateVisitedHistory : " + url); - } - @Override public void onReceivedSslError (final WebView view, final SslErrorHandler handler, SslError error) { - Log_OC.d(TAG, "onReceivedSslError : " + error); + Log_OC.e(TAG, "onReceivedSslError : " + error); // Test 1 X509Certificate x509Certificate = getX509CertificateFromError(error); boolean isKnownServer = false; if (x509Certificate != null) { - Log_OC.d(TAG, "------>>>>> x509Certificate " + x509Certificate.toString()); - try { isKnownServer = NetworkUtils.isCertInKnownServersStore((Certificate) x509Certificate, mContext); } catch (Exception e) { @@ -201,36 +193,4 @@ public class SsoWebViewClient extends WebViewClient { ((AuthenticatorActivity)mContext).createAuthenticationDialog(view, handler); } - @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; - } } diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java index 76243edf..3e8a85f0 100644 --- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java +++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java @@ -76,7 +76,6 @@ public class SamlWebViewDialog extends SherlockDialogFragment { * @return New dialog instance, ready to show. */ public static SamlWebViewDialog newInstance(String url, String targetUrl) { - Log_OC.d(TAG, "New instance"); SamlWebViewDialog fragment = new SamlWebViewDialog(); Bundle args = new Bundle(); args.putString(ARG_INITIAL_URL, url); @@ -88,13 +87,12 @@ public class SamlWebViewDialog extends SherlockDialogFragment { public SamlWebViewDialog() { super(); - Log_OC.d(TAG, "constructor"); } @Override public void onAttach(Activity activity) { - Log_OC.d(TAG, "onAttach"); + Log_OC.v(TAG, "onAttach"); super.onAttach(activity); try { mSsoWebViewClientListener = (SsoWebViewClientListener) activity; @@ -110,7 +108,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment { @SuppressLint("SetJavaScriptEnabled") @Override public void onCreate(Bundle savedInstanceState) { - Log_OC.d(TAG, "onCreate, savedInstanceState is " + savedInstanceState); + Log_OC.v(TAG, "onCreate, savedInstanceState is " + savedInstanceState); super.onCreate(savedInstanceState); setRetainInstance(true); @@ -132,7 +130,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment { @SuppressLint("SetJavaScriptEnabled") @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - Log_OC.d(TAG, "onCreateView, savedInsanceState is " + savedInstanceState); + Log_OC.v(TAG, "onCreateView, savedInsanceState is " + savedInstanceState); // Inflate layout of the dialog RelativeLayout ssoRootView = (RelativeLayout) inflater.inflate(R.layout.sso_dialog, container, false); // null parent view because it will go in the dialog layout @@ -144,11 +142,6 @@ public class SamlWebViewDialog extends SherlockDialogFragment { mSsoWebView.setFocusableInTouchMode(true); mSsoWebView.setClickable(true); - CookieManager cookieManager = CookieManager.getInstance(); - cookieManager.setAcceptCookie(true); - cookieManager.removeAllCookie(); - mSsoWebView.loadUrl(mInitialUrl); - WebSettings webSettings = mSsoWebView.getSettings(); webSettings.setJavaScriptEnabled(true); webSettings.setBuiltInZoomControls(false); @@ -156,6 +149,12 @@ public class SamlWebViewDialog extends SherlockDialogFragment { webSettings.setSavePassword(false); webSettings.setUserAgentString(OwnCloudClient.USER_AGENT); webSettings.setSaveFormData(false); + + CookieManager cookieManager = CookieManager.getInstance(); + cookieManager.setAcceptCookie(true); + cookieManager.removeAllCookie(); + + mSsoWebView.loadUrl(mInitialUrl); } mWebViewClient.setTargetUrl(mTargetUrl); @@ -174,7 +173,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment { @Override public void onSaveInstanceState(Bundle outState) { - Log_OC.d(TAG, "onSaveInstanceState being CALLED"); + Log_OC.v(TAG, "onSaveInstanceState being CALLED"); super.onSaveInstanceState(outState); // save URLs @@ -184,7 +183,7 @@ public class SamlWebViewDialog extends SherlockDialogFragment { @Override public void onDestroyView() { - Log_OC.d(TAG, "onDestroyView"); + Log_OC.v(TAG, "onDestroyView"); if ((ViewGroup)mSsoWebView.getParent() != null) { ((ViewGroup)mSsoWebView.getParent()).removeView(mSsoWebView); @@ -196,8 +195,6 @@ public class SamlWebViewDialog extends SherlockDialogFragment { Dialog dialog = getDialog(); if ((dialog != null)) { dialog.setOnDismissListener(null); - //dialog.dismiss(); - //dialog.setDismissMessage(null); } super.onDestroyView(); @@ -205,13 +202,13 @@ public class SamlWebViewDialog extends SherlockDialogFragment { @Override public void onDestroy() { - Log_OC.d(TAG, "onDestroy"); + Log_OC.v(TAG, "onDestroy"); super.onDestroy(); } @Override public void onDetach() { - Log_OC.d(TAG, "onDetach"); + Log_OC.v(TAG, "onDetach"); mSsoWebViewClientListener = null; mWebViewClient = null; super.onDetach(); @@ -231,39 +228,39 @@ public class SamlWebViewDialog extends SherlockDialogFragment { @Override public void onStart() { - Log_OC.d(TAG, "onStart"); + Log_OC.v(TAG, "onStart"); super.onStart(); } @Override public void onStop() { - Log_OC.d(TAG, "onStop"); + Log_OC.v(TAG, "onStop"); super.onStop(); } @Override public void onResume() { - Log_OC.d(TAG, "onResume"); + Log_OC.v(TAG, "onResume"); super.onResume(); mSsoWebView.onResume(); } @Override public void onPause() { - Log_OC.d(TAG, "onPause"); + Log_OC.v(TAG, "onPause"); mSsoWebView.onPause(); super.onPause(); } @Override public int show (FragmentTransaction transaction, String tag) { - Log_OC.d(TAG, "show (transaction)"); + Log_OC.v(TAG, "show (transaction)"); return super.show(transaction, tag); } @Override public void show (FragmentManager manager, String tag) { - Log_OC.d(TAG, "show (manager)"); + Log_OC.v(TAG, "show (manager)"); super.show(manager, tag); }