projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_...
[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
32bcf54
..
f18ff2a
100644
(file)
--- a/
src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/
src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@
-173,7
+173,7
@@
public class AuthenticatorActivity extends AccountAuthenticatorActivity
\r
private boolean mResumed; // Control if activity is resumed
\r
\r
- p
rivate
String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";
\r
+ p
ublic static
String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";
\r
\r
\r
/**
\r