Preventing hash colisions in identifier of operations

[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 a9fac0c..fd0849e 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -114,12 +114,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     private static final String KEY_PASSWORD_EXPOSED = "PASSWORD_VISIBLE";\r
     private static final String KEY_AUTH_STATUS_TEXT = "AUTH_STATUS_TEXT";\r
     private static final String KEY_AUTH_STATUS_ICON = "AUTH_STATUS_ICON";\r
-    private static final String KEY_REFRESH_BUTTON_ENABLED = "REFRESH_BUTTON_ENABLED";\r
     private static final String KEY_SERVER_AUTH_METHOD = "SERVER_AUTH_METHOD";\r
-    private static final String KEY_GET_SERVER_INFO_OP_ID = "DETECT_AUTH_OP_ID";\r
-    private static final String KEY_EXISTENCE_CHECK_OP_ID = "EXISTENCE_CHECK_OP_ID";\r
-    private static final String KEY_OAUTH2_GET_ACCESS_TOKEN_OP_ID = "OAUTH2_GET_ACCESS_TOKEN";\r
-    private static final String KEY_GET_USER_NAME_OP_ID = "GET_USER_NAME";\r
+    private static final String KEY_WAITING_FOR_OP_ID = "DETECT_AUTH_OP_ID";\r
     private static final String KEY_AUTH_TOKEN = "AUTH_TOKEN";\r
 \r
     private static final String AUTH_ON = "on";\r
@@ -177,11 +173,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     private String mAuthToken = "";\r
 \r
     \r
-    /// Operation-in-progress identifiers - TODO improve pull-interface with OperationsService \r
-    private int mGetServerInfoOpId = -1;\r
-    private int mOauth2GetAccessTokenOpId = -1;\r
-    private int mExistenceCheckOpId = -1;\r
-    private int mGetUserNameOpId = -1;\r
+    /// Identifier of operation in progress which result shouldn't be lost \r
+    private long mWaitingForOpId = Long.MAX_VALUE;\r
     \r
     \r
     /**\r
@@ -218,6 +211,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             initAuthTokenType();\r
         } else {\r
             mAuthTokenType = savedInstanceState.getString(KEY_AUTH_TOKEN_TYPE);\r
+            mWaitingForOpId = savedInstanceState.getLong(KEY_WAITING_FOR_OP_ID);\r
         }\r
         \r
         /// load user interface\r
@@ -345,9 +339,6 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             mServerInfo.mAuthMethod = AuthenticationMethod.valueOf(\r
                     savedInstanceState.getString(KEY_SERVER_AUTH_METHOD));\r
             \r
-            // TODO save and recover any operation in progress, in a reasonable way\r
-            mGetServerInfoOpId = savedInstanceState.getInt(KEY_GET_SERVER_INFO_OP_ID);\r
-            \r
         }\r
         \r
         /// step 2 - set properties of UI elements (text, visibility, enabled...)\r
@@ -364,7 +355,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             findViewById(R.id.hostUrlFrame).setVisibility(View.GONE);\r
             mRefreshButton = findViewById(R.id.centeredRefreshButton);\r
         }\r
-        showRefreshButton(mServerIsChecked && !mServerIsValid && mGetServerInfoOpId == -1);\r
+        showRefreshButton(mServerIsChecked && !mServerIsValid && \r
+                mWaitingForOpId > Integer.MAX_VALUE);\r
         mServerStatusView = (TextView) findViewById(R.id.server_status_text);\r
         showServerStatus();\r
         \r
@@ -452,9 +444,6 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             mAuthStatusText = savedInstanceState.getInt(KEY_AUTH_STATUS_TEXT);\r
             mAuthStatusIcon = savedInstanceState.getInt(KEY_AUTH_STATUS_ICON);\r
             mAuthToken = savedInstanceState.getString(KEY_AUTH_TOKEN);\r
-            mExistenceCheckOpId = savedInstanceState.getInt(KEY_EXISTENCE_CHECK_OP_ID);\r
-            mOauth2GetAccessTokenOpId = savedInstanceState.getInt(KEY_OAUTH2_GET_ACCESS_TOKEN_OP_ID);\r
-            mGetUserNameOpId = savedInstanceState.getInt(KEY_GET_USER_NAME_OP_ID);\r
         }\r
         \r
         /// step 2 - set properties of UI elements (text, visibility, enabled...)\r
@@ -553,14 +542,12 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 \r
         /// global state\r
         outState.putString(KEY_AUTH_TOKEN_TYPE, mAuthTokenType);\r
+        outState.putLong(KEY_WAITING_FOR_OP_ID, mWaitingForOpId);\r
 \r
         /// Server PRE-fragment state\r
-        //outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, (mRefreshButton.getVisibility() == View.VISIBLE));\r
         outState.putInt(KEY_SERVER_STATUS_TEXT, mServerStatusText);\r
         outState.putInt(KEY_SERVER_STATUS_ICON, mServerStatusIcon);\r
         outState.putBoolean(KEY_SERVER_CHECKED, mServerIsChecked);\r
-        //outState.putBoolean(KEY_SERVER_CHECK_IN_PROGRESS, (!mServerIsValid && mServerInfoOperation != null));\r
-        outState.putInt(KEY_GET_SERVER_INFO_OP_ID, mGetServerInfoOpId);\r
         outState.putBoolean(KEY_SERVER_VALID, mServerIsValid);\r
         outState.putBoolean(KEY_IS_SSL_CONN, mServerInfo.mIsSslConn);\r
         outState.putString(KEY_HOST_URL_TEXT, mServerInfo.mBaseUrl);\r
@@ -574,9 +561,6 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         outState.putInt(KEY_AUTH_STATUS_ICON, mAuthStatusIcon);\r
         outState.putInt(KEY_AUTH_STATUS_TEXT, mAuthStatusText);\r
         outState.putString(KEY_AUTH_TOKEN, mAuthToken);\r
-        outState.putInt(KEY_EXISTENCE_CHECK_OP_ID, mExistenceCheckOpId);\r
-        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
     }\r
@@ -679,8 +663,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
                 queryParameters);\r
         \r
         if (mOperationsServiceBinder != null) {\r
-            Log.wtf(TAG, "getting access token..." );\r
-            mOauth2GetAccessTokenOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
+            //Log_OC.wtf(TAG, "getting access token..." );\r
+            mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
         }\r
     }\r
 \r
@@ -745,8 +729,8 @@ 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
-                mGetServerInfoOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
+                //Log_OC.wtf(TAG, "checking server..." );\r
+                mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
             }\r
             \r
         } else {\r
@@ -883,7 +867,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         \r
         if (mOperationsServiceBinder != null) {\r
             Log_OC.wtf(TAG, "starting existenceCheckRemoteOperation..." );\r
-            mExistenceCheckOpId = mOperationsServiceBinder.newOperation(existenceCheckIntent);\r
+            mWaitingForOpId = mOperationsServiceBinder.newOperation(existenceCheckIntent);\r
         }\r
     }\r
 \r
@@ -946,7 +930,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {\r
 \r
         if (operation instanceof GetServerInfoOperation) {\r
-            if (operation.hashCode() == mGetServerInfoOpId) {\r
+            if (operation.hashCode() == mWaitingForOpId) {\r
                 onGetServerInfoFinish(result);\r
             }   // else nothing ; only the last check operation is considered; \r
                 // multiple can be started if the user amends a URL quickly\r
@@ -969,7 +953,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     }\r
 \r
     private void onGetUserNameFinish(RemoteOperationResult result) {\r
-        mGetUserNameOpId = -1;\r
+        mWaitingForOpId = Long.MAX_VALUE;\r
         if (result.isSuccess()) {\r
             boolean success = false;\r
             String username = (String) result.getData().get(0);\r
@@ -1002,7 +986,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     }\r
 \r
     private void onSamlBasedFederatedSingleSignOnAuthorizationStart(RemoteOperationResult result) {\r
-        mExistenceCheckOpId = -1;\r
+        mWaitingForOpId = Long.MAX_VALUE;\r
         dismissDialog(WAIT_DIALOG_TAG);\r
 
         //if (result.isTemporalRedirection() && result.isIdPRedirection()) {\r
@@ -1037,7 +1021,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     private void onGetServerInfoFinish(RemoteOperationResult result) {\r
         /// update activity state\r
         mServerIsChecked = true;\r
-        mGetServerInfoOpId = -1;\r
+        mWaitingForOpId = Long.MAX_VALUE;\r
         \r
         // update server status, but don't show it yet\r
         updateServerStatusIconAndText(result);\r
@@ -1304,7 +1288,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      * @param result        Result of the operation.\r
      */\r
     private void onGetOAuthAccessTokenFinish(RemoteOperationResult result) {\r
-        mOauth2GetAccessTokenOpId = -1;\r
+        mWaitingForOpId = Long.MAX_VALUE;\r
         dismissDialog(WAIT_DIALOG_TAG);\r
 \r
         String webdav_path = AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType);\r
@@ -1343,9 +1327,10 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      * @param result        Result of the operation.\r
      */\r
     private void onAuthorizationCheckFinish(RemoteOperationResult result) {\r
-        mExistenceCheckOpId = -1;\r
+        mWaitingForOpId = Long.MAX_VALUE;\r
         dismissDialog(WAIT_DIALOG_TAG);\r
 \r
+        result = new RemoteOperationResult(new RuntimeException("FAKE"));\r
         if (result.isSuccess()) {\r
             Log_OC.d(TAG, "Successful access - time to save the account");\r
 \r
@@ -1674,8 +1659,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         getUserNameIntent.putExtra(OperationsService.EXTRA_FOLLOW_REDIRECTS, followRedirects);\r
         \r
         if (mOperationsServiceBinder != null) {\r
-            Log_OC.wtf(TAG, "starting getRemoteUserNameOperation..." );\r
-            mGetUserNameOpId = mOperationsServiceBinder.newOperation(getUserNameIntent);\r
+            //Log_OC.wtf(TAG, "starting getRemoteUserNameOperation..." );\r
+            mWaitingForOpId = mOperationsServiceBinder.newOperation(getUserNameIntent);\r
         }\r
     }\r
 \r
@@ -1771,49 +1756,9 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     private void doOnResumeAndBound() {\r
         Log.wtf(TAG, "registering to listen for operation callbacks" );\r
         mOperationsServiceBinder.addOperationListener(AuthenticatorActivity.this, mHandler);\r
-        \r
-        \r
-        \r
-        if (mGetServerInfoOpId != -1) {\r
-            RemoteOperationResult result = \r
-                    mOperationsServiceBinder.getOperationResultIfFinished(mGetServerInfoOpId);\r
-            if (result != null) {\r
-                Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
-                onGetServerInfoFinish(result);\r
-            }\r
-            \r
-        } else if (mOauth2GetAccessTokenOpId != -1) {\r
-            RemoteOperationResult result = \r
-                    mOperationsServiceBinder.getOperationResultIfFinished(\r
-                            mOauth2GetAccessTokenOpId);\r
-            if (result != null) {\r
-                Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
-                onGetOAuthAccessTokenFinish(result);\r
-            }\r
-            \r
-        } else if (mExistenceCheckOpId != -1) {\r
-            RemoteOperationResult result = \r
-                    mOperationsServiceBinder.getOperationResultIfFinished(mExistenceCheckOpId);\r
-            if (result != null) {\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
-\r
-                } else {\r
-                    onAuthorizationCheckFinish(result);\r
-                }\r
-            }\r
-        }if (mGetUserNameOpId != -1) {\r
-            RemoteOperationResult result = \r
-                    mOperationsServiceBinder.getOperationResultIfFinished(mGetUserNameOpId);\r
-            if (result != null) {\r
-                Log_OC.wtf(TAG, "found result of operation finished while rotating");\r
-                onGetUserNameFinish(result);\r
-            }\r
-            \r
-        } \r
-        \r
+        if (mWaitingForOpId <= Integer.MAX_VALUE) {\r
+            mOperationsServiceBinder.dispatchResultIfFinished((int)mWaitingForOpId, this);\r
+        }\r
     }\r
 \r
     \r