Set timeout correctly for creating an account.

mozilla-services · Jan 9, 2012 · 9485f50 · 9485f50
1 parent 2c46a46
commit 9485f50
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/mozilla/gecko/sync/jpake/JPakeClient.java b/src/main/java/org/mozilla/gecko/sync/jpake/JPakeClient.java
@@ -676,7 +676,7 @@ public void onRequestFailure(HttpResponse res) {
       case 304:
         Log.d(LOG_TAG, "Channel hasn't been updated yet. Will try again later");
         if (pollTries >= jpakeMaxTries) {
-          Log.e(LOG_TAG, "Tried for " + pollTries + " times, aborting");
+          Log.e(LOG_TAG, "Tried for " + pollTries + " times, maxTries " + jpakeMaxTries + ", aborting");
           abort(Constants.JPAKE_ERROR_TIMEOUT);
           return;
         }
@@ -807,7 +807,6 @@ public void onRequestSuccess(HttpResponse res) {
       } else if (this.state == State.RCVR_STEP_TWO) {
         computeFinal();
       } else if (this.state == State.VERIFY_KEY) {
-        jpakeMaxTries = MAX_TRIES_LAST_MSG;
         decryptData(myKeyBundle);
       } else if (this.state == State.VERIFY_PAIRING) {
         try {
@@ -835,6 +834,7 @@ public void onRequestSuccess(HttpResponse res) {
 
       state = stateContext;
       if (state == State.VERIFY_KEY) {
+        jpakeMaxTries = MAX_TRIES_LAST_MSG;
         ssActivity.onPaired();
       }
       if (state == State.SNDR_STEP_ONE) {