projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Prevent that full synchronization process browses deeper when already knows...
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
authentication
/
AuthenticatorActivity.java
diff --git
a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index
9b66869
..
9dcddce
100644
(file)
--- a/
src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/
src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@
-1665,6
+1665,7
@@
public class AuthenticatorActivity extends AccountAuthenticatorActivity
}
\r
FragmentManager fm = getSupportFragmentManager();
\r
FragmentTransaction ft = fm.beginTransaction();
\r
}
\r
FragmentManager fm = getSupportFragmentManager();
\r
FragmentTransaction ft = fm.beginTransaction();
\r
+ ft.addToBackStack(null);
\r
dialog.show(ft, DIALOG_UNTRUSTED_CERT);
\r
}
\r
\r
dialog.show(ft, DIALOG_UNTRUSTED_CERT);
\r
}
\r
\r
@@
-1676,6
+1677,7
@@
public class AuthenticatorActivity extends AccountAuthenticatorActivity
SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException)result.getException());
\r
FragmentManager fm = getSupportFragmentManager();
\r
FragmentTransaction ft = fm.beginTransaction();
\r
SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException)result.getException());
\r
FragmentManager fm = getSupportFragmentManager();
\r
FragmentTransaction ft = fm.beginTransaction();
\r
+ ft.addToBackStack(null);
\r
dialog.show(ft, DIALOG_UNTRUSTED_CERT);
\r
\r
}
\r
dialog.show(ft, DIALOG_UNTRUSTED_CERT);
\r
\r
}
\r
@@
-1730,11
+1732,4
@@
public class AuthenticatorActivity extends AccountAuthenticatorActivity
\r
}
\r
\r
\r
}
\r
\r
- public void reloadWebView() {
\r
- Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);
\r
- if (fd != null && fd instanceof SamlWebViewDialog) {
\r
- ((SamlWebViewDialog) fd).reloadWebView();
\r
- }
\r
- }
\r
-
\r
}
\r
}
\r