mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed wrong reload of SAML web dialog after rotation when the SSL-error dialog is visible over it

Browse source
This commit is contained in:
David A. Velasco 2014-03-12 10:25:54 +01:00
parent 41efad3804
commit 5338b93604
4 changed files with 60 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/layout/sso_dialog.xml
View file

@ -21,13 +21,13 @@
android:layout_height="wrap_content"
>
<com.owncloud.android.ui.dialog.SsoWebView
<!-- com.owncloud.android.ui.dialog.SsoWebView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/sso_webview"
android:focusable="true"
android:focusableInTouchMode="true"
android:clickable="true"
/>
/-->
</RelativeLayout>

9
src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -1665,6 +1665,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
}
FragmentManager fm = getSupportFragmentManager();
FragmentTransaction ft = fm.beginTransaction();
ft.addToBackStack(null);
dialog.show(ft, DIALOG_UNTRUSTED_CERT);
}
@ -1676,6 +1677,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException)result.getException());
FragmentManager fm = getSupportFragmentManager();
FragmentTransaction ft = fm.beginTransaction();
ft.addToBackStack(null);
dialog.show(ft, DIALOG_UNTRUSTED_CERT);
}
@ -1730,11 +1732,4 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
}
public void reloadWebView() {
Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);
if (fd != null && fd instanceof SamlWebViewDialog) {
((SamlWebViewDialog) fd).reloadWebView();
}
}
}

121
src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
View file

@ -1,5 +1,5 @@
/* ownCloud Android client application
* Copyright (C) 2012-2013 ownCloud Inc.
* Copyright (C) 2012-2014 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,
@ -30,9 +30,9 @@ import android.view.View;
import android.view.ViewGroup;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
import android.webkit.WebBackForwardList;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.RelativeLayout;
import com.actionbarsherlock.app.SherlockDialogFragment;
import com.owncloud.android.R;
@ -56,7 +56,6 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
private static final String ARG_INITIAL_URL = "INITIAL_URL";
private static final String ARG_TARGET_URL = "TARGET_URL";
private static final String KEY_WEBVIEW_STATE = "WEBVIEW_STATE";
private WebView mSsoWebView;
private SsoWebViewClient mWebViewClient;
@ -68,9 +67,6 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
private SsoWebViewClientListener mSsoWebViewClientListener;
//private View mSsoRootView;
/**
* Public factory method to get dialog instances.
*
@ -114,10 +110,12 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
@SuppressLint("SetJavaScriptEnabled")
@Override
public void onCreate(Bundle savedInstanceState) {
Log_OC.d(TAG, "onCreate");
Log_OC.d(TAG, "onCreate, savedInstanceState is " + savedInstanceState);
super.onCreate(savedInstanceState);
CookieSyncManager.createInstance(getActivity());
setRetainInstance(true);
CookieSyncManager.createInstance(getSherlockActivity().getApplicationContext());
if (savedInstanceState == null) {
mInitialUrl = getArguments().getString(ARG_INITIAL_URL);
@ -130,82 +128,68 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
setStyle(SherlockDialogFragment.STYLE_NO_TITLE, R.style.Theme_ownCloud_Dialog);
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
Log_OC.d(TAG, "onCreateDialog");
/*
// build the dialog
AlertDialog.Builder builder = new AlertDialog.Builder(getSherlockActivity());
if (mSsoRootView.getParent() != null) {
((ViewGroup)(mSsoRootView.getParent())).removeView(mSsoRootView);
}
builder.setView(mSsoRootView);
//builder.setView(mSsoWebView);
Dialog dialog = builder.create();
*/
return super.onCreateDialog(savedInstanceState);
}
@SuppressWarnings("deprecation")
@SuppressLint("SetJavaScriptEnabled")
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
Log_OC.d(TAG, "onCreateView");
Log_OC.d(TAG, "onCreateView, savedInsanceState is " + savedInstanceState);
// Inflate layout of the dialog
View rootView = inflater.inflate(R.layout.sso_dialog, container, false); // null parent view because it will go in the dialog layout
mSsoWebView = (WebView) rootView.findViewById(R.id.sso_webview);
mWebViewClient.setTargetUrl(mTargetUrl);
mSsoWebView.setWebViewClient(mWebViewClient);
RelativeLayout ssoRootView = (RelativeLayout) inflater.inflate(R.layout.sso_dialog, container, false); // null parent view because it will go in the dialog layout
if (savedInstanceState == null) {
Log_OC.d(TAG, " initWebView start");
if (mSsoWebView == null) {
// initialize the WebView
mSsoWebView = new SsoWebView(getSherlockActivity().getApplicationContext());
mSsoWebView.setFocusable(true);
mSsoWebView.setFocusableInTouchMode(true);
mSsoWebView.setClickable(true);
CookieManager cookieManager = CookieManager.getInstance();
cookieManager.setAcceptCookie(true);
cookieManager.removeAllCookie();
mSsoWebView.loadUrl(mInitialUrl);
} else {
Log_OC.d(TAG, " restoreWebView start");
WebBackForwardList history = mSsoWebView.restoreState(savedInstanceState.getBundle(KEY_WEBVIEW_STATE));
if (history == null) {
Log_OC.e(TAG, "Error restoring WebView state ; back to starting URL");
mSsoWebView.loadUrl(mInitialUrl);
}
WebSettings webSettings = mSsoWebView.getSettings();
webSettings.setJavaScriptEnabled(true);
webSettings.setBuiltInZoomControls(false);
webSettings.setLoadWithOverviewMode(false);
webSettings.setSavePassword(false);
webSettings.setUserAgentString(OwnCloudClient.USER_AGENT);
webSettings.setSaveFormData(false);
}
WebSettings webSettings = mSsoWebView.getSettings();
webSettings.setJavaScriptEnabled(true);
webSettings.setBuiltInZoomControls(true);
webSettings.setLoadWithOverviewMode(false);
webSettings.setSavePassword(false);
webSettings.setUserAgentString(OwnCloudClient.USER_AGENT);
webSettings.setSaveFormData(false);
return rootView;
mWebViewClient.setTargetUrl(mTargetUrl);
mSsoWebView.setWebViewClient(mWebViewClient);
// add the webview into the layout
RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
RelativeLayout.LayoutParams.WRAP_CONTENT,
RelativeLayout.LayoutParams.WRAP_CONTENT
);
ssoRootView.addView(mSsoWebView, layoutParams);
ssoRootView.requestLayout();
return ssoRootView;
}
@Override
public void onSaveInstanceState(Bundle outState) {
Log_OC.d(SAML_DIALOG_TAG, "onSaveInstanceState being CALLED");
Log_OC.d(TAG, "onSaveInstanceState being CALLED");
super.onSaveInstanceState(outState);
// save URLs
outState.putString(ARG_INITIAL_URL, mInitialUrl);
outState.putString(ARG_TARGET_URL, mTargetUrl);
// Save the state of the WebView
Bundle webviewState = new Bundle();
mSsoWebView.saveState(webviewState);
outState.putBundle(KEY_WEBVIEW_STATE, webviewState);
}
@Override
public void onDestroyView() {
Log_OC.d(TAG, "onDestroyView");
if ((ViewGroup)mSsoWebView.getParent() != null) {
((ViewGroup)mSsoWebView.getParent()).removeView(mSsoWebView);
}
mSsoWebView.setWebViewClient(null);
// Work around bug: http://code.google.com/p/android/issues/detail?id=17423
@ -235,55 +219,52 @@ public class SamlWebViewDialog extends SherlockDialogFragment {
@Override
public void onCancel (DialogInterface dialog) {
Log_OC.d(SAML_DIALOG_TAG, "onCancel");
Log_OC.d(TAG, "onCancel");
super.onCancel(dialog);
}
@Override
public void onDismiss (DialogInterface dialog) {
Log_OC.d(SAML_DIALOG_TAG, "onDismiss");
Log_OC.d(TAG, "onDismiss");
super.onDismiss(dialog);
}
@Override
public void onStart() {
Log_OC.d(SAML_DIALOG_TAG, "onStart");
Log_OC.d(TAG, "onStart");
super.onStart();
}
@Override
public void onStop() {
Log_OC.d(SAML_DIALOG_TAG, "onStop");
Log_OC.d(TAG, "onStop");
super.onStop();
}
@Override
public void onResume() {
Log_OC.d(SAML_DIALOG_TAG, "onResume");
Log_OC.d(TAG, "onResume");
super.onResume();
mSsoWebView.onResume();
}
@Override
public void onPause() {
Log_OC.d(SAML_DIALOG_TAG, "onPause");
Log_OC.d(TAG, "onPause");
mSsoWebView.onPause();
super.onPause();
}
@Override
public int show (FragmentTransaction transaction, String tag) {
Log_OC.d(SAML_DIALOG_TAG, "show (transaction)");
Log_OC.d(TAG, "show (transaction)");
return super.show(transaction, tag);
}
@Override
public void show (FragmentManager manager, String tag) {
Log_OC.d(SAML_DIALOG_TAG, "show (manager)");
Log_OC.d(TAG, "show (manager)");
super.show(manager, tag);
}
public void reloadWebView() {
mSsoWebView.reload();
}
}

5
src/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java
View file

@ -109,6 +109,7 @@ public class SslUntrustedCertDialog extends SherlockDialogFragment {
@Override
public void onAttach(Activity activity) {
Log_OC.d(TAG, "onAttach");
super.onAttach(activity);
if (!(activity instanceof OnSslUntrustedCertListener)) {
throw new IllegalArgumentException("The host activity must implement " + OnSslUntrustedCertListener.class.getCanonicalName());
@ -118,6 +119,7 @@ public class SslUntrustedCertDialog extends SherlockDialogFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
Log_OC.d(TAG, "onCreate, savedInstanceState is " + savedInstanceState);
super.onCreate(savedInstanceState);
setRetainInstance(true); // force to keep the state of the fragment on configuration changes (such as device rotations)
setCancelable(false);
@ -126,6 +128,7 @@ public class SslUntrustedCertDialog extends SherlockDialogFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
Log_OC.d(TAG, "onCreateView, savedInsanceState is " + savedInstanceState);
// Create a view by inflating desired layout
if (mView == null) {
mView = inflater.inflate(R.layout.ssl_untrusted_cert_layout, container, false);
@ -166,6 +169,7 @@ public class SslUntrustedCertDialog extends SherlockDialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
Log_OC.d(TAG, "onCreateDialog, savedInstanceState is " + savedInstanceState);
final Dialog dialog = super.onCreateDialog(savedInstanceState);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
return dialog;
@ -173,6 +177,7 @@ public class SslUntrustedCertDialog extends SherlockDialogFragment {
@Override
public void onDestroyView() {
Log_OC.d(TAG, "onDestroyView");
if (getDialog() != null && getRetainInstance())
getDialog().setDismissMessage(null);
super.onDestroyView();