[GCM] Minimum change for periodic checkin

google_apis/gcm/gcm_client_impl.cc

 // Copyright 2013 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/gcm_client_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 56 matching lines @@
   SEND_ERROR,        // Error sending a message.
 };
 
 // MCS endpoints. SSL Key pinning is done automatically due to the *.google.com
 // pinning rule.
 // Note: modifying the endpoints will affect the ability to compare the
 // GCM.CurrentEnpoint histogram across versions.
 const char kMCSEndpointMain[] = "https://mtalk.google.com:5228";
 const char kMCSEndpointFallback[] = "https://mtalk.google.com:443";
 
+const int64 kDefaultCheckinInterval = 172800LL;  // seconds - 2 days.

[Nicolas Zea, 2014/04/02 21:53:55]

nit: prefer 60 * 60 * 24 * 2 for readability

[fgorski, 2014/04/02 22:37:21]

Done.

 const int kMaxRegistrationRetries = 5;
 const char kMessageTypeDataMessage[] = "gcm";
 const char kMessageTypeDeletedMessagesKey[] = "deleted_messages";
 const char kMessageTypeKey[] = "message_type";
 const char kMessageTypeSendErrorKey[] = "send_error";
 const char kSendErrorMessageIdKey[] = "google.message_id";
 const char kSendMessageFromValue[] = "gcm@chrome.com";
 const int64 kDefaultUserSerialNumber = 0LL;
 
 GCMClient::Result ToGCMClientResult(MCSClient::MessageSendStatus status) {
@@ skipping 122 matching lines @@
   }
 
   registrations_ = result->registrations;
 
   device_checkin_info_.android_id = result->device_android_id;
   device_checkin_info_.secret = result->device_security_token;
   InitializeMCSClient(result.Pass());
   if (!device_checkin_info_.IsValid()) {
     device_checkin_info_.Reset();
     state_ = INITIAL_DEVICE_CHECKIN;
-    StartCheckin(device_checkin_info_);
+    StartCheckin();
     return;
+  } else {

[jianli, 2014/04/02 22:00:18]

nit: revert these two parts

[fgorski, 2014/04/02 22:37:21]

Done.

+    SchedulePeriodicCheckin(result->last_checkin_time);
   }
 
   OnReady();
 }
 
 void GCMClientImpl::InitializeMCSClient(
     scoped_ptr<GCMStore::LoadResult> result) {
   std::vector<GURL> endpoints;
   endpoints.push_back(GURL(kMCSEndpointMain));
   endpoints.push_back(GURL(kMCSEndpointFallback));
@@ skipping 43 matching lines @@
   DCHECK(device_checkin_info_.IsValid());
   mcs_client_->Login(device_checkin_info_.android_id,
                      device_checkin_info_.secret);
 }
 
 void GCMClientImpl::ResetState() {
   state_ = UNINITIALIZED;
   // TODO(fgorski): reset all of the necessart objects and start over.
 }
 
-void GCMClientImpl::StartCheckin(const CheckinInfo& checkin_info) {
+void GCMClientImpl::StartCheckin() {
   checkin_request_.reset(
       new CheckinRequest(base::Bind(&GCMClientImpl::OnCheckinCompleted,
                                     weak_ptr_factory_.GetWeakPtr()),
                          kDefaultBackoffPolicy,
                          chrome_build_proto_,
-                         checkin_info.android_id,
-                         checkin_info.secret,
+                         device_checkin_info_.android_id,
+                         device_checkin_info_.secret,
                          account_ids_,
                          url_request_context_getter_));
   checkin_request_->Start();
 }
 
 void GCMClientImpl::OnCheckinCompleted(uint64 android_id,
                                        uint64 security_token) {
   checkin_request_.reset();
 
   CheckinInfo checkin_info;
   checkin_info.android_id = android_id;
   checkin_info.secret = security_token;
 
   if (!checkin_info.IsValid()) {
     // TODO(fgorski): I don't think a retry here will help, we should probalby
     // start over. By checking in with (0, 0).
     return;
   }
 
   if (state_ == INITIAL_DEVICE_CHECKIN) {
     OnFirstTimeDeviceCheckinCompleted(checkin_info);
   } else {
     DCHECK_EQ(READY, state_);
     if (device_checkin_info_.android_id != checkin_info.android_id ||
         device_checkin_info_.secret != checkin_info.secret) {
       ResetState();

[jianli, 2014/04/02 22:00:18]

When the updated checkin info is different, we call ResetState which seems not
to be implemented.

[fgorski, 2014/04/02 22:37:21]

Done.

-    } else {
-      // TODO(fgorski): Reset the checkin timer.
     }
   }
+
+  if (device_checkin_info_.IsValid()) {
+    base::Time last_checkin_time = clock_->Now();
+    gcm_store_->SetLastCheckinTime(
+        last_checkin_time,
+        base::Bind(&GCMClientImpl::SetLastCheckinTimeCallback,
+                   weak_ptr_factory_.GetWeakPtr()));
+    SchedulePeriodicCheckin(last_checkin_time);
+  }
 }
 
+void GCMClientImpl::SchedulePeriodicCheckin(
+    const base::Time& last_checkin_time) {
+  base::TimeDelta time_to_next_checkin = last_checkin_time
+      + base::TimeDelta::FromSeconds(kDefaultCheckinInterval)

[jianli, 2014/04/02 22:00:18]

nit: + and - should be placed at the end of previous line.

[fgorski, 2014/04/02 22:37:21]

Done.

+      - clock_->Now();
+  if (time_to_next_checkin < base::TimeDelta::FromSeconds(0L))
+    time_to_next_checkin = base::TimeDelta::FromSeconds(0L);
+  // TODO(fgorski): Make sure that once dynamic events (like accounts list
+  // change) trigger checkin we reset the timer.
+  base::MessageLoop::current()->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&GCMClientImpl::StartCheckin,
+                 weak_ptr_factory_.GetWeakPtr()),
+      time_to_next_checkin);
+}
+
+void GCMClientImpl::SetLastCheckinTimeCallback(bool success) {
+  // TODO(fgorski): This is one of the signals that store needs a rebuild.
+  DCHECK(success);
+}
+
 void GCMClientImpl::SetDeviceCredentialsCallback(bool success) {
   // TODO(fgorski): This is one of the signals that store needs a rebuild.
   DCHECK(success);
 }
 
 void GCMClientImpl::UpdateRegistrationCallback(bool success) {
   // TODO(fgorski): This is one of the signals that store needs a rebuild.
   DCHECK(success);
 }
 
@@ skipping 324 matching lines @@
   if (iter != send_error_details.additional_data.end()) {
     send_error_details.message_id = iter->second;
     send_error_details.additional_data.erase(iter);
   }
 
   delegate_->OnMessageSendError(data_message_stanza.category(),
                                 send_error_details);
 }
 
 }  // namespace gcm