From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 7 Apr 2014 08:22:08 +0000 (+0200)
Subject: Preventing hash colisions in identifier of operations
X-Git-Tag: oc-android-1.7.0_signed~345^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/12bbc51dcbb7eccf4189dcc8f7d9c20aa634aad9

Preventing hash colisions in identifier of operations
---

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index ee9d9bc1..fd0849e4 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -174,7 +174,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 
     
     /// Identifier of operation in progress which result shouldn't be lost 
-    private int mWaitingForOpId = -1;
+    private long mWaitingForOpId = Long.MAX_VALUE;
     
     
     /**
@@ -211,7 +211,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             initAuthTokenType();
         } else {
             mAuthTokenType = savedInstanceState.getString(KEY_AUTH_TOKEN_TYPE);
-            mWaitingForOpId = savedInstanceState.getInt(KEY_WAITING_FOR_OP_ID);
+            mWaitingForOpId = savedInstanceState.getLong(KEY_WAITING_FOR_OP_ID);
         }
         
         /// load user interface
@@ -355,7 +355,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
             findViewById(R.id.hostUrlFrame).setVisibility(View.GONE);
             mRefreshButton = findViewById(R.id.centeredRefreshButton);
         }
-        showRefreshButton(mServerIsChecked && !mServerIsValid && mWaitingForOpId == -1);
+        showRefreshButton(mServerIsChecked && !mServerIsValid && 
+                mWaitingForOpId > Integer.MAX_VALUE);
         mServerStatusView = (TextView) findViewById(R.id.server_status_text);
         showServerStatus();
         
@@ -541,7 +542,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
 
         /// global state
         outState.putString(KEY_AUTH_TOKEN_TYPE, mAuthTokenType);
-        outState.putInt(KEY_WAITING_FOR_OP_ID, mWaitingForOpId);
+        outState.putLong(KEY_WAITING_FOR_OP_ID, mWaitingForOpId);
 
         /// Server PRE-fragment state
         outState.putInt(KEY_SERVER_STATUS_TEXT, mServerStatusText);
@@ -952,7 +953,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     }
 
     private void onGetUserNameFinish(RemoteOperationResult result) {
-        mWaitingForOpId = -1;
+        mWaitingForOpId = Long.MAX_VALUE;
         if (result.isSuccess()) {
             boolean success = false;
             String username = (String) result.getData().get(0);
@@ -985,7 +986,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     }
 
     private void onSamlBasedFederatedSingleSignOnAuthorizationStart(RemoteOperationResult result) {
-        mWaitingForOpId = -1;
+        mWaitingForOpId = Long.MAX_VALUE;
         dismissDialog(WAIT_DIALOG_TAG);
 
         //if (result.isTemporalRedirection() && result.isIdPRedirection()) {
@@ -1020,7 +1021,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     private void onGetServerInfoFinish(RemoteOperationResult result) {
         /// update activity state
         mServerIsChecked = true;
-        mWaitingForOpId = -1;
+        mWaitingForOpId = Long.MAX_VALUE;
         
         // update server status, but don't show it yet
         updateServerStatusIconAndText(result);
@@ -1287,7 +1288,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      * @param result        Result of the operation.
      */
     private void onGetOAuthAccessTokenFinish(RemoteOperationResult result) {
-        mWaitingForOpId = -1;
+        mWaitingForOpId = Long.MAX_VALUE;
         dismissDialog(WAIT_DIALOG_TAG);
 
         String webdav_path = AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType);
@@ -1326,7 +1327,7 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
      * @param result        Result of the operation.
      */
     private void onAuthorizationCheckFinish(RemoteOperationResult result) {
-        mWaitingForOpId = -1;
+        mWaitingForOpId = Long.MAX_VALUE;
         dismissDialog(WAIT_DIALOG_TAG);
 
         result = new RemoteOperationResult(new RuntimeException("FAKE"));
@@ -1755,8 +1756,8 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     private void doOnResumeAndBound() {
         Log.wtf(TAG, "registering to listen for operation callbacks" );
         mOperationsServiceBinder.addOperationListener(AuthenticatorActivity.this, mHandler);
-        if (mWaitingForOpId != -1) {
-            mOperationsServiceBinder.dispatchResultIfFinished(mWaitingForOpId, this);
+        if (mWaitingForOpId <= Integer.MAX_VALUE) {
+            mOperationsServiceBinder.dispatchResultIfFinished((int)mWaitingForOpId, this);
         }
     }
 
diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java
index a9f92ed6..bbecf21a 100644
--- a/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@ -261,9 +261,9 @@ public class OperationsService extends Service {
          * Creates and adds to the queue a new operation, as described by operationIntent
          * 
          * @param operationIntent       Intent describing a new operation to queue and execute.
-         * @return                      Identifier of the operation created, or -1 if failed.
+         * @return                      Identifier of the operation created, or null if failed.
          */
-        public int newOperation(Intent operationIntent) {
+        public long newOperation(Intent operationIntent) {
             RemoteOperation operation = null;
             Target target = null;
             try {
@@ -347,24 +347,15 @@ public class OperationsService extends Service {
                 mPendingOperations.add(new Pair<Target , RemoteOperation>(target, operation));
                 startService(new Intent(OperationsService.this, OperationsService.class));
                 Log_OC.wtf(TAG, "New operation added, opId: " + operation.hashCode());
+                // better id than hash? ; should be good enough by the time being
                 return operation.hashCode();
                 
             } else {
-                Log_OC.wtf(TAG, "New operation failed, returned -1");
-                return -1;
+                Log_OC.wtf(TAG, "New operation failed, returned Long.MAX_VALUE");
+                return Long.MAX_VALUE;
             }
         }
 
-        public RemoteOperationResult getOperationResultIfFinished(int operationId) {
-            Pair<RemoteOperation, RemoteOperationResult> undispatched = 
-                    mUndispatchedFinishedOperations.remove(operationId);
-            if (undispatched != null) {
-                return undispatched.second;
-            }
-            return null;
-        }
-
-
         public void dispatchResultIfFinished(int operationId, OnRemoteOperationListener listener) {
             Pair<RemoteOperation, RemoteOperationResult> undispatched = 
                     mUndispatchedFinishedOperations.remove(operationId);