Index: google_apis/gcm/gcm_client_impl.cc |
diff --git a/google_apis/gcm/gcm_client_impl.cc b/google_apis/gcm/gcm_client_impl.cc |
index 4cc0fdd38b0acf28280c6df8b7cef754703a3db2..38daee275b92cfd2bb63886e58f391d646a542eb 100644 |
--- a/google_apis/gcm/gcm_client_impl.cc |
+++ b/google_apis/gcm/gcm_client_impl.cc |
@@ -11,6 +11,7 @@ |
#include "base/message_loop/message_loop.h" |
#include "base/metrics/histogram.h" |
#include "base/sequenced_task_runner.h" |
+#include "base/strings/string_number_conversions.h" |
#include "base/time/default_clock.h" |
#include "google_apis/gcm/base/mcs_message.h" |
#include "google_apis/gcm/base/mcs_util.h" |
@@ -74,6 +75,9 @@ enum MessageType { |
const char kMCSEndpointMain[] = "https://mtalk.google.com:5228"; |
const char kMCSEndpointFallback[] = "https://mtalk.google.com:443"; |
+const char kCheckinIntervalKey[] = "checkin_interval"; |
+const int64 kDefaultCheckinInterval = 172800LL; // seconds = 2 days. |
+const char kDeleteSettingPrefix[] = "delete_"; |
const int kMaxRegistrationRetries = 5; |
const char kMessageTypeDataMessage[] = "gcm"; |
const char kMessageTypeDeletedMessagesKey[] = "deleted_messages"; |
@@ -212,12 +216,15 @@ void GCMClientImpl::OnLoadCompleted(scoped_ptr<GCMStore::LoadResult> result) { |
device_checkin_info_.android_id = result->device_android_id; |
device_checkin_info_.secret = result->device_security_token; |
+ gservices_settings_ = result->gservices_settings; |
InitializeMCSClient(result.Pass()); |
if (!device_checkin_info_.IsValid()) { |
device_checkin_info_.Reset(); |
state_ = INITIAL_DEVICE_CHECKIN; |
- StartCheckin(device_checkin_info_); |
+ StartCheckin(); |
return; |
+ } else { |
+ SchedulePeriodicCheckin(result->last_checkin_time); |
} |
OnReady(); |
@@ -281,33 +288,56 @@ void GCMClientImpl::ResetState() { |
// 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(); |
+void GCMClientImpl::SchedulePeriodicCheckin( |
+ const base::Time& last_checkin_time) { |
+ base::TimeDelta time_to_next_checkin = |
+ last_checkin_time + GetCheckinInterval() - clock_->Now(); |
+ if (time_to_next_checkin < base::TimeDelta::FromSeconds(0LL)) |
+ time_to_next_checkin = base::TimeDelta::FromSeconds(0LL); |
+ base::MessageLoop::current()->PostDelayedTask( |
+ FROM_HERE, |
+ base::Bind(&GCMClientImpl::StartCheckin, |
+ weak_ptr_factory_.GetWeakPtr()), |
+ time_to_next_checkin); |
+} |
- CheckinInfo checkin_info; |
- checkin_info.android_id = android_id; |
- checkin_info.secret = security_token; |
+base::TimeDelta GCMClientImpl::GetCheckinInterval() { |
+ GServicesSettingsMap::const_iterator iter = |
+ gservices_settings_.find(kCheckinIntervalKey); |
+ int64 checkin_interval_sec = kDefaultCheckinInterval; |
+ if (iter != gservices_settings_.end()) |
+ base::StringToInt64(iter->second, &checkin_interval_sec); |
+ return base::TimeDelta::FromSeconds(checkin_interval_sec); |
+} |
+ |
+void GCMClientImpl::OnCheckinCompleted( |
+ const checkin_proto::AndroidCheckinResponse& checkin_response) { |
+ checkin_request_.reset(); |
- if (!checkin_info.IsValid()) { |
- // TODO(fgorski): I don't think a retry here will help, we should probalby |
+ if (!checkin_response.has_android_id() || |
+ !checkin_response.has_security_token()) { |
+ // TODO(fgorski): I don't think a retry here will help, we should probably |
// start over. By checking in with (0, 0). |
return; |
} |
+ CheckinInfo checkin_info; |
+ checkin_info.android_id = checkin_response.android_id(); |
+ checkin_info.secret = checkin_response.security_token(); |
+ |
if (state_ == INITIAL_DEVICE_CHECKIN) { |
OnFirstTimeDeviceCheckinCompleted(checkin_info); |
} else { |
@@ -315,10 +345,13 @@ void GCMClientImpl::OnCheckinCompleted(uint64 android_id, |
if (device_checkin_info_.android_id != checkin_info.android_id || |
device_checkin_info_.secret != checkin_info.secret) { |
ResetState(); |
- } else { |
- // TODO(fgorski): Reset the checkin timer. |
} |
} |
+ |
+ if (device_checkin_info_.IsValid()) { |
+ UpdateGServicesSettings(checkin_response); |
+ SchedulePeriodicCheckin(clock_->Now()); |
+ } |
} |
void GCMClientImpl::SetDeviceCredentialsCallback(bool success) { |
@@ -664,4 +697,54 @@ void GCMClientImpl::HandleIncomingSendError( |
send_error_details); |
} |
+void GCMClientImpl::UpdateGServicesSettings( |
+ const checkin_proto::AndroidCheckinResponse& checkin_response) { |
+ std::vector<std::string> settings_to_remove; |
+ std::map<std::string, std::string> settings_to_add; |
+ |
+ // Check if we are only dealing with a diff of settings or full update. |
jianli
2014/03/31 17:45:35
Per the comment in checkin.proto:
// 2. If 'set
fgorski
2014/03/31 21:50:08
In v2 of the protocol settings_diff is not used an
|
+ bool settings_diff = false; |
+ if (checkin_response.has_settings_diff()) { |
+ if (checkin_response.settings_diff()) { |
+ settings_diff = true; |
+ } else { |
+ for (GServicesSettingsMap::const_iterator it = |
+ gservices_settings_.begin(); |
+ it != gservices_settings_.end(); ++it) { |
+ settings_to_remove.push_back(it->first); |
+ } |
+ gservices_settings_.clear(); |
+ } |
+ } |
+ |
+ for (int i = 0; i < checkin_response.setting_size(); ++i) { |
+ std::string name = checkin_response.setting(i).name(); |
+ // When the settings_diff is set to true in the protobuf, the entries that |
+ // start from "delete_" are meant to be removing the settings. |
+ if (settings_diff && name.find(kDeleteSettingPrefix) == 0) { |
+ name = name.substr(arraysize(kDeleteSettingPrefix) - 1); |
+ GServicesSettingsMap::iterator iter = gservices_settings_.find(name); |
+ if (iter != gservices_settings_.end()) { |
+ settings_to_remove.push_back(name); |
+ gservices_settings_.erase(iter); |
+ } |
+ } else { |
+ std::string value = checkin_response.setting(i).value(); |
+ gservices_settings_[name] = value; |
+ settings_to_add[name] = value; |
+ } |
+ } |
+ |
+ gcm_store_->UpdateGServicesSettings( |
+ settings_to_remove, |
+ settings_to_add, |
+ clock_->Now(), |
+ base::Bind(&GCMClientImpl::UpdateGServicesSettingsCallback, |
+ weak_ptr_factory_.GetWeakPtr())); |
+} |
+ |
+void GCMClientImpl::UpdateGServicesSettingsCallback(bool success) { |
+ DCHECK(success); |
+} |
+ |
} // namespace gcm |