From: masensio Date: Fri, 28 Mar 2014 14:04:10 +0000 (+0100) Subject: Modify DetectAuthenticationMethodOperation so that , when returning its result throug... X-Git-Tag: oc-android-1.7.0_signed~345^2~19 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2628eceb6b7548d151ab61c42969b42064e586bd?ds=inline Modify DetectAuthenticationMethodOperation so that , when returning its result through the callback, there is no crash if AuthenticatorActivity is not ready (rotating) --- diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index cf768833..074751e6 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -537,6 +537,27 @@ SsoWebViewClientListener, OnSslUntrustedCertListener { } } + + @Override + protected void onStart() { + if (mOperationsServiceBinder != null) { + mOperationsServiceBinder.addOperationListener(AuthenticatorActivity.this, mHandler); + } + + super.onStart(); + } + + + @Override + protected void onStop() { + if (mOperationsServiceBinder != null) { + mOperationsServiceBinder.removeOperationListener(this); + } + super.onStop(); + } + + + /** * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION, and * deferred in {@link #onNewIntent(Intent)}, is processed here. diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index 42b90aec..c4dd28a2 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -150,22 +150,26 @@ public class FileActivity extends SherlockFragmentActivity implements OnRemoteOp @Override protected void onStart() { - super.onStart(); + if (mAccountWasSet) { onAccountSet(mAccountWasRestored); } if (mOperationsServiceBinder != null) { mOperationsServiceBinder.addOperationListener(FileActivity.this, mHandler); } + + super.onStart(); } @Override protected void onStop() { - super.onStop(); + if (mOperationsServiceBinder != null) { mOperationsServiceBinder.removeOperationListener(this); } + + super.onStop(); }