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 'develop' into enable_cookies
[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
5233e1b
..
ed68614
100644
(file)
--- a/
src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/
src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@
-230,8
+230,6
@@
public class AuthenticatorActivity extends AccountAuthenticatorActivity
mWaitingForOpId = savedInstanceState.getLong(KEY_WAITING_FOR_OP_ID);
\r
mIsFirstAuthAttempt = savedInstanceState.getBoolean(KEY_AUTH_IS_FIRST_ATTEMPT_TAG);
\r
}
\r
mWaitingForOpId = savedInstanceState.getLong(KEY_WAITING_FOR_OP_ID);
\r
mIsFirstAuthAttempt = savedInstanceState.getBoolean(KEY_AUTH_IS_FIRST_ATTEMPT_TAG);
\r
}
\r
-
\r
-
\r
\r
/// load user interface
\r
setContentView(R.layout.account_setup);
\r
\r
/// load user interface
\r
setContentView(R.layout.account_setup);
\r
@@
-1461,9
+1459,9
@@
public class AuthenticatorActivity extends AccountAuthenticatorActivity
*/
\r
private void updateAccountAuthentication() throws AccountNotFoundException {
\r
\r
*/
\r
private void updateAccountAuthentication() throws AccountNotFoundException {
\r
\r
- OwnCloudClientManagerFactory.getDefaultSingleton().removeClientFor(
\r
- new OwnCloudAccount(mAccount, this)
\r
- );
\r
+
//
OwnCloudClientManagerFactory.getDefaultSingleton().removeClientFor(
\r
+
//
new OwnCloudAccount(mAccount, this)
\r
+
//
);
\r
\r
Bundle response = new Bundle();
\r
response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);
\r
\r
Bundle response = new Bundle();
\r
response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);
\r
@@
-1596,6
+1594,7
@@
public class AuthenticatorActivity extends AccountAuthenticatorActivity
/**
\r
* Updates the content and visibility state of the icon and text associated
\r
* to the last check on the ownCloud server.
\r
/**
\r
* Updates the content and visibility state of the icon and text associated
\r
* to the last check on the ownCloud server.
\r
+ *
\r
*/
\r
private void showServerStatus() {
\r
if (mServerStatusIcon == 0 && mServerStatusText == 0) {
\r
*/
\r
private void showServerStatus() {
\r
if (mServerStatusIcon == 0 && mServerStatusText == 0) {
\r