cashew: data plans: used bytes should be optional for unlimited plans

src/data_plan.cc

 // Copyright (c) 2010 The Chromium OS 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 "src/data_plan.h"
 
 #include <time.h>
 
 #include <glog/logging.h>
 
@@ skipping 79 matching lines @@
   plan[kCellularDataPlanName].writer().append_string(name_.c_str());
   plan[kCellularDataPlanType].writer().append_string(
       TypeToLibcrosString(type_));
   plan[kCellularDataPlanUpdateTime].writer().append_int64(
       update_time_.ToInternalValue());
   plan[kCellularDataPlanStartTime].writer().append_int64(
       start_time_.ToInternalValue());
   plan[kCellularDataPlanEndTime].writer().append_int64(
       end_time_.ToInternalValue());
   // omit max bytes field for unlimited plans
-  // can libcros/Chrome deal? if not, can set this to int64 max.
   if (type_ != kTypeUnlimited) {
     plan[kCellularDataPlanDataBytesMax].writer().append_int64(data_bytes_max_);
   }
+  // always send used bytes field, even if we had to assume a value of 0
+  // because this is an unlimited plan and the property was absent in the
+  // usage API replies that we received
+  // TODO(vlaviano): we'll be able to do better when we have local counters
   plan[kCellularDataPlanDataBytesUsed].writer().append_int64(data_bytes_used_);
   return plan;
 }
 
 // static
 DataPlan* DataPlan::FromDictionaryValue(const DictionaryValue *value,
                                         const Policy *policy) {
   CHECK_NOTNULL(value);
   CHECK_NOTNULL(policy);
   std::string last_update_iso8601;
@@ skipping 41 matching lines @@
     }
     if (max_bytes < 0) {
       LOG(WARNING) << "FromDictionaryValue: max bytes is negative";
       return NULL;
     }
     DLOG(INFO) << "FromDictionaryValue: max bytes = " << max_bytes;
   }
 
   int used_bytes = 0;
   if (!value->GetInteger(kCrosUsageDataPlanUsedBytesProperty, &used_bytes)) {
-    LOG(WARNING) << "FromDictionaryValue: no used bytes property";
-    return NULL;
+    // used bytes is required for metered plans, optional for unlimited plans
+    if (plan_type != kTypeUnlimited) {
+      LOG(WARNING) << "FromDictionaryValue: no used bytes property";
+      return NULL;
+    } else {
+      DLOG(INFO)
+          << "FromDictionaryValue: no used bytes property (using default of 0)";
+    }
   }
   if (used_bytes < 0) {
     LOG(WARNING) << "FromDictionaryValue: used bytes is negative";
     return NULL;
   }
   DLOG(INFO) << "FromDictionaryValue: used bytes = " << used_bytes;
 
   std::string start_time_iso8601;
   if (!value->GetString(kCrosUsageDataPlanStartTimeProperty,
                         &start_time_iso8601)) {
@@ skipping 105 matching lines @@
     *type_out = kTypeMeteredFree;
   } else if (type_string == kCrosUsageDataPlanTypeMeteredPaid) {
     *type_out = kTypeMeteredPaid;
   } else {
     return false;
   }
   return true;
 }
 
 }  // namespace cashew