[GCM] Check-in with signed in accounts associates device to user

google_apis/gcm/engine/gcm_store_impl.cc

 // Copyright 2014 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 "google_apis/gcm/engine/gcm_store_impl.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 45 matching lines @@
 // Used for limiting iteration.
 const char kOutgoingMsgKeyEnd[] = "outgoing2-";
 // Lowest lexicographically ordered G-service settings key.
 // Used for prefixing G-services settings.
 const char kGServiceSettingKeyStart[] = "gservice1-";
 // Key guaranteed to be higher than all G-services settings keys.
 // Used for limiting iteration.
 const char kGServiceSettingKeyEnd[] = "gservice2-";
 // Key for digest of the last G-services settings update.
 const char kGServiceSettingsDigestKey[] = "gservices_digest";
+// Key used to indicate how many accounts were last checked in with this device.
+const char kLastCheckinAccountsKey[] = "last_checkin_accounts_count";
 // Key used to timestamp last checkin (marked with G services settings update).
 const char kLastCheckinTimeKey[] = "last_checkin_time";
 
 std::string MakeRegistrationKey(const std::string& app_id) {
   return kRegistrationKeyStart + app_id;
 }
 
 std::string ParseRegistrationKey(const std::string& key) {
   return key.substr(arraysize(kRegistrationKeyStart) - 1);
 }
@@ skipping 55 matching lines @@
                           const UpdateCallback& callback);
   void RemoveOutgoingMessages(
       const PersistentIdList& persistent_ids,
       const base::Callback<void(bool, const AppIdToMessageCountMap&)>
           callback);
   void AddUserSerialNumber(const std::string& username,
                            int64 serial_number,
                            const UpdateCallback& callback);
   void RemoveUserSerialNumber(const std::string& username,
                               const UpdateCallback& callback);
-  void SetLastCheckinTime(const base::Time& last_checkin_time,
+  void SetLastCheckinInfo(const base::Time& last_checkin_time,
+                          uint64 accounts_count,
                           const UpdateCallback& callback);
   void SetGServicesSettings(
       const std::map<std::string, std::string>& settings,
       const std::string& digest,
       const UpdateCallback& callback);
 
  private:
   friend class base::RefCountedThreadSafe<Backend>;
   ~Backend();
 
   bool LoadDeviceCredentials(uint64* android_id, uint64* security_token);
   bool LoadRegistrations(RegistrationInfoMap* registrations);
   bool LoadIncomingMessages(std::vector<std::string>* incoming_messages);
   bool LoadOutgoingMessages(OutgoingMessageMap* outgoing_messages);
-  bool LoadLastCheckinTime(base::Time* last_checkin_time);
+  bool LoadLastCheckinInfo(base::Time* last_checkin_time,
+                           uint64* accounts_count);
   bool LoadGServicesSettings(std::map<std::string, std::string>* settings,
                              std::string* digest);
 
   const base::FilePath path_;
   scoped_refptr<base::SequencedTaskRunner> foreground_task_runner_;
   scoped_ptr<Encryptor> encryptor_;
 
   scoped_ptr<leveldb::DB> db_;
 };
 
@@ skipping 32 matching lines @@
                                                  base::Passed(&result)));
     return;
   }
   db_.reset(db);
 
   if (!LoadDeviceCredentials(&result->device_android_id,
                              &result->device_security_token) ||
       !LoadRegistrations(&result->registrations) ||
       !LoadIncomingMessages(&result->incoming_messages) ||
       !LoadOutgoingMessages(&result->outgoing_messages) ||
-      !LoadLastCheckinTime(&result->last_checkin_time) ||
+      !LoadLastCheckinInfo(&result->last_checkin_time,
+                           &result->accounts_count) ||
       !LoadGServicesSettings(&result->gservices_settings,
                              &result->gservices_digest)) {
     result->device_android_id = 0;
     result->device_security_token = 0;
     result->registrations.clear();
     result->incoming_messages.clear();
     result->outgoing_messages.clear();
     result->gservices_settings.clear();
     result->gservices_digest.clear();
     result->last_checkin_time = base::Time::FromInternalValue(0LL);
@@ skipping 258 matching lines @@
                                                  removed_message_counts));
     return;
   }
   LOG(ERROR) << "LevelDB remove failed: " << s.ToString();
   foreground_task_runner_->PostTask(FROM_HERE,
                                     base::Bind(callback,
                                                false,
                                                AppIdToMessageCountMap()));
 }
 
-void GCMStoreImpl::Backend::SetLastCheckinTime(
+void GCMStoreImpl::Backend::SetLastCheckinInfo(
     const base::Time& last_checkin_time,
+    uint64 accounts_count,
     const UpdateCallback& callback) {
+  leveldb::WriteBatch write_batch;
+
+  int64 last_checkin_time_internal = last_checkin_time.ToInternalValue();
+  write_batch.Put(MakeSlice(kLastCheckinTimeKey),
+                  MakeSlice(base::Int64ToString(last_checkin_time_internal)));
+
+  write_batch.Put(MakeSlice(kLastCheckinAccountsKey),
+                  MakeSlice(base::Uint64ToString(accounts_count)));
+
   leveldb::WriteOptions write_options;
   write_options.sync = true;
-
-  int64 last_checkin_time_internal = last_checkin_time.ToInternalValue();
-  const leveldb::Status s =
-      db_->Put(write_options,
-               MakeSlice(kLastCheckinTimeKey),
-               MakeSlice(base::Int64ToString(last_checkin_time_internal)));
+  const leveldb::Status s = db_->Write(write_options, &write_batch);
 
   if (!s.ok())
-    LOG(ERROR) << "LevelDB set last checkin time failed: " << s.ToString();
+    LOG(ERROR) << "LevelDB set last checkin info failed: " << s.ToString();
   foreground_task_runner_->PostTask(FROM_HERE, base::Bind(callback, s.ok()));
 }
 
 void GCMStoreImpl::Backend::SetGServicesSettings(
     const std::map<std::string, std::string>& settings,
     const std::string& settings_digest,
     const UpdateCallback& callback) {
   leveldb::WriteBatch write_batch;
 
   // Remove all existing settings.
@@ skipping 136 matching lines @@
       return false;
     }
     DVLOG(1) << "Found outgoing message with id " << id << " of type "
              << base::IntToString(tag);
     (*outgoing_messages)[id] = make_linked_ptr(message.release());
   }
 
   return true;
 }
 
-bool GCMStoreImpl::Backend::LoadLastCheckinTime(
-    base::Time* last_checkin_time) {
+bool GCMStoreImpl::Backend::LoadLastCheckinInfo(base::Time* last_checkin_time,
+                                                uint64* accounts_count) {
   leveldb::ReadOptions read_options;
   read_options.verify_checksums = true;
 
   std::string result;
   leveldb::Status s = db_->Get(read_options,
                                MakeSlice(kLastCheckinTimeKey),
                                &result);
   int64 time_internal = 0LL;
   if (s.ok() && !base::StringToInt64(result, &time_internal))
     LOG(ERROR) << "Failed to restore last checkin time. Using default = 0.";
 
   // In case we cannot read last checkin time, we default it to 0, as we don't
   // want that situation to cause the whole load to fail.
   *last_checkin_time = base::Time::FromInternalValue(time_internal);
 
+  s = db_->Get(read_options, MakeSlice(kLastCheckinAccountsKey), &result);
+  if (s.ok() && !base::StringToUint64(result, accounts_count)) {
+    DVLOG(1) << "Last account count not set. Defaulting to 0.";
+    *accounts_count = 0;
+  }
+
   return true;
 }
 
 bool GCMStoreImpl::Backend::LoadGServicesSettings(
     std::map<std::string, std::string>* settings,
     std::string* digest) {
   leveldb::ReadOptions read_options;
   read_options.verify_checksums = true;
 
   // Load all of the GServices settings.
@@ skipping 185 matching lines @@
   blocking_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&GCMStoreImpl::Backend::RemoveOutgoingMessages,
                  backend_,
                  persistent_ids,
                  base::Bind(&GCMStoreImpl::RemoveOutgoingMessagesContinuation,
                             weak_ptr_factory_.GetWeakPtr(),
                             callback)));
 }
 
-void GCMStoreImpl::SetLastCheckinTime(const base::Time& last_checkin_time,
+void GCMStoreImpl::SetLastCheckinInfo(const base::Time& last_checkin_time,
+                                      uint64 accounts_count,
                                       const UpdateCallback& callback) {
   blocking_task_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&GCMStoreImpl::Backend::SetLastCheckinTime,
+      base::Bind(&GCMStoreImpl::Backend::SetLastCheckinInfo,
                  backend_,
                  last_checkin_time,
+                 accounts_count,
                  callback));
 }
 
 void GCMStoreImpl::SetGServicesSettings(
     const std::map<std::string, std::string>& settings,
     const std::string& digest,
     const UpdateCallback& callback) {
   blocking_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&GCMStoreImpl::Backend::SetGServicesSettings,
@@ skipping 50 matching lines @@
            removed_message_counts.begin();
        iter != removed_message_counts.end(); ++iter) {
     DCHECK_NE(app_message_counts_.count(iter->first), 0U);
     app_message_counts_[iter->first] -= iter->second;
     DCHECK_GE(app_message_counts_[iter->first], 0);
   }
   callback.Run(true);
 }
 
 }  // namespace gcm