Client changes for disabled dasher account

sync/engine/syncer_proto_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/syncer_proto_util.h"
 
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
 #include "google_apis/google_api_keys.h"
 #include "sync/engine/net/server_connection_manager.h"
@@ skipping 103 matching lines @@
     case sync_pb::SyncEnums::NOT_MY_BIRTHDAY:
       return NOT_MY_BIRTHDAY;
     case sync_pb::SyncEnums::THROTTLED:
       return THROTTLED;
     case sync_pb::SyncEnums::CLEAR_PENDING:
       return CLEAR_PENDING;
     case sync_pb::SyncEnums::TRANSIENT_ERROR:
       return TRANSIENT_ERROR;
     case sync_pb::SyncEnums::MIGRATION_DONE:
       return MIGRATION_DONE;
+    case sync_pb::SyncEnums::DISABLED_BY_ADMIN:
+      return DISABLED_BY_ADMIN;
     case sync_pb::SyncEnums::UNKNOWN:
       return UNKNOWN_ERROR;
     case sync_pb::SyncEnums::USER_NOT_ACTIVATED:
     case sync_pb::SyncEnums::AUTH_INVALID:
     case sync_pb::SyncEnums::ACCESS_DENIED:
       return INVALID_CREDENTIAL;
     default:
       NOTREACHED();
       return UNKNOWN_ERROR;
   }
@@ skipping 200 matching lines @@
 }
 
 // TODO(lipalani) : Rename these function names as per the CR for issue 7740067.
 SyncProtocolError ConvertLegacyErrorCodeToNewError(
     const sync_pb::SyncEnums::ErrorType& error_type) {
   SyncProtocolError error;
   error.error_type = ConvertSyncProtocolErrorTypePBToLocalType(error_type);
   if (error_type == sync_pb::SyncEnums::CLEAR_PENDING ||
       error_type == sync_pb::SyncEnums::NOT_MY_BIRTHDAY) {
       error.action = DISABLE_SYNC_ON_CLIENT;
+  } else if (error_type == sync_pb::SyncEnums::DISABLED_BY_ADMIN) {
+      error.action = STOP_SYNC_FOR_DISABLED_ACCOUNT;

[tim (not reviewing), 2013/05/13 04:18:58]

nit - indent should be two spaces from 'if' (345 was incorrect).

[pavely, 2013/05/13 22:37:09]

Done.

   }  // There is no other action we can compute for legacy server.
   return error;
 }
 
 }  // namespace
 
 // static
 SyncerError SyncerProtoUtil::PostClientToServerMessage(
     ClientToServerMessage* msg,
     ClientToServerResponse* response,
@@ skipping 40 matching lines @@
   // Birthday mismatch overrides any error that is sent by the server.
   if (!VerifyResponseBirthday(*response, dir)) {
     sync_protocol_error.error_type = NOT_MY_BIRTHDAY;
      sync_protocol_error.action =
          DISABLE_SYNC_ON_CLIENT;
   } else if (response->has_error()) {
     // This is a new server. Just get the error from the protocol.
     sync_protocol_error = ConvertErrorPBToLocalType(response->error());
   } else {
     // Legacy server implementation. Compute the error based on |error_code|.
+    ::sync_pb::SyncEnums_ErrorType error_code = response->error_code();
+    // error_code = sync_pb::SyncEnums::DISABLED_BY_ADMIN;

[tim (not reviewing), 2013/05/13 04:18:58]

This needs to be fixed / cleaned up.

[pavely, 2013/05/13 22:37:09]

Done.

     sync_protocol_error = ConvertLegacyErrorCodeToNewError(
-        response->error_code());
+        /*response->error_code()*/ error_code);
   }
 
   // Now set the error into the status so the layers above us could read it.
   sessions::StatusController* status = session->mutable_status_controller();
   status->set_sync_protocol_error(sync_protocol_error);
 
   // Inform the delegate of the error we got.
   session->delegate()->OnSyncProtocolError(session->TakeSnapshot());
 
   // Update our state for any other commands we've received.
@@ skipping 44 matching lines @@
       LOG_IF(ERROR, 0 >= response->migrated_data_type_id_size())
           << "MIGRATION_DONE but no types specified.";
       // TODO(akalin): This should be a set union.
       session->mutable_status_controller()->
           set_types_needing_local_migration(GetTypesToMigrate(*response));
       return SERVER_RETURN_MIGRATION_DONE;
     case CLEAR_PENDING:
       return SERVER_RETURN_CLEAR_PENDING;
     case NOT_MY_BIRTHDAY:
       return SERVER_RETURN_NOT_MY_BIRTHDAY;
+    case DISABLED_BY_ADMIN:
+      return SERVER_RETURN_DISABLED_BY_ADMIN;
     default:
       NOTREACHED();
       return UNSET;
   }
 }
 
 // static
 bool SyncerProtoUtil::Compare(const syncable::Entry& local_entry,
                               const sync_pb::SyncEntity& server_entry) {
   const std::string name = NameFromSyncEntity(server_entry);
@@ skipping 134 matching lines @@
 std::string SyncerProtoUtil::ClientToServerResponseDebugString(
     const ClientToServerResponse& response) {
   // Add more handlers as needed.
   std::string output;
   if (response.has_get_updates())
     output.append(GetUpdatesResponseString(response.get_updates()));
   return output;
 }
 
 }  // namespace syncer