Merge branch 'develop' into operations_service

[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 99e114d..a9fac0c 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -43,6 +43,7 @@ import android.support.v4.app.FragmentTransaction;
 import android.text.Editable;\r
 import android.text.InputType;\r
 import android.text.TextWatcher;\r
+import android.util.Log;\r
 import android.view.KeyEvent;\r
 import android.view.MotionEvent;\r
 import android.view.View;\r
@@ -547,7 +548,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      */\r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
-        //Log.wtf(TAG, "onSaveInstanceState init" );\r
+        Log.wtf(TAG, "onSaveInstanceState init" );\r
         super.onSaveInstanceState(outState);\r
 \r
         /// global state\r
@@ -577,7 +578,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         outState.putInt(KEY_OAUTH2_GET_ACCESS_TOKEN_OP_ID, mOauth2GetAccessTokenOpId);\r
         outState.putInt(KEY_GET_USER_NAME_OP_ID, mGetUserNameOpId);\r
 \r
-        //Log.wtf(TAG, "onSaveInstanceState end" );\r
+        Log.wtf(TAG, "onSaveInstanceState end" );\r
     }\r
 \r
 \r
@@ -625,9 +626,9 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     \r
     @Override\r
     protected void onPause() {\r
-        //Log.wtf(TAG, "onPause init" );\r
+        Log.wtf(TAG, "onPause init" );\r
         if (mOperationsServiceBinder != null) {\r
-            //Log.wtf(TAG, "unregistering to listen for operation callbacks" );\r
+            Log.wtf(TAG, "unregistering to listen for operation callbacks" );\r
             mOperationsServiceBinder.removeOperationListener(this);\r
         }\r
         \r
@@ -635,7 +636,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         mHostUrlInput.setOnFocusChangeListener(null);\r
         \r
         super.onPause();\r
-        //Log.wtf(TAG, "onPause end" );\r
+        Log.wtf(TAG, "onPause end" );\r
     }\r
     \r
     @Override\r
@@ -678,7 +679,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
                 queryParameters);\r
         \r
         if (mOperationsServiceBinder != null) {\r
-            //Log.wtf(TAG, "getting access token..." );\r
+            Log.wtf(TAG, "getting access token..." );\r
             mOauth2GetAccessTokenOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
         }\r
     }\r
@@ -744,7 +745,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             getServerInfoIntent.putExtra(OperationsService.EXTRA_SERVER_URL, uri);\r
             getServerInfoIntent.putExtra(OperationsService.EXTRA_AUTH_TOKEN_TYPE, mAuthTokenType);\r
             if (mOperationsServiceBinder != null) {\r
-                //Log.wtf(TAG, "checking server..." );\r
+                Log.wtf(TAG, "checking server..." );\r
                 mGetServerInfoOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
             }\r
             \r
@@ -1673,7 +1674,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         getUserNameIntent.putExtra(OperationsService.EXTRA_FOLLOW_REDIRECTS, followRedirects);\r
         \r
         if (mOperationsServiceBinder != null) {\r
-            //Log_OC.wtf(TAG, "starting getRemoteUserNameOperation..." );\r
+            Log_OC.wtf(TAG, "starting getRemoteUserNameOperation..." );\r
             mGetUserNameOpId = mOperationsServiceBinder.newOperation(getUserNameIntent);\r
         }\r
     }\r
@@ -1768,7 +1769,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \r
 \r
     private void doOnResumeAndBound() {\r
-        //Log.wtf(TAG, "registering to listen for operation callbacks" );\r
+        Log.wtf(TAG, "registering to listen for operation callbacks" );\r
         mOperationsServiceBinder.addOperationListener(AuthenticatorActivity.this, mHandler);\r
         \r
         \r
@@ -1777,7 +1778,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             RemoteOperationResult result = \r
                     mOperationsServiceBinder.getOperationResultIfFinished(mGetServerInfoOpId);\r
             if (result != null) {\r
-                //Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
+                Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
                 onGetServerInfoFinish(result);\r
             }\r
             \r
@@ -1786,7 +1787,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
                     mOperationsServiceBinder.getOperationResultIfFinished(\r
                             mOauth2GetAccessTokenOpId);\r
             if (result != null) {\r
-                //Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
+                Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
                 onGetOAuthAccessTokenFinish(result);\r
             }\r
             \r
@@ -1794,7 +1795,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             RemoteOperationResult result = \r
                     mOperationsServiceBinder.getOperationResultIfFinished(mExistenceCheckOpId);\r
             if (result != null) {\r
-                //Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
+                Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
                 if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(\r
                         MainApp.getAccountType()).equals(mAuthTokenType)) {\r
                     onSamlBasedFederatedSingleSignOnAuthorizationStart(result);\r
@@ -1807,7 +1808,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             RemoteOperationResult result = \r
                     mOperationsServiceBinder.getOperationResultIfFinished(mGetUserNameOpId);\r
             if (result != null) {\r
-                //Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
+                Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
                 onGetUserNameFinish(result);\r
             }\r
             \r
@@ -1833,7 +1834,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         @Override\r
         public void onServiceConnected(ComponentName component, IBinder service) {\r
             if (component.equals(new ComponentName(AuthenticatorActivity.this, OperationsService.class))) {\r
-                //Log_OC.wtf(TAG, "Operations service connected");\r
+                Log_OC.wtf(TAG, "Operations service connected");\r
                 mOperationsServiceBinder = (OperationsServiceBinder) service;\r
                 \r
                 doOnResumeAndBound();\r