| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
private void loadFoodDataForOneDay(UpdateInfo updateInfo, String formattedDate) throws Exception {
updateInfo.setContext("date", formattedDate);
TimeZone utc = TimeZone.getTimeZone("UTC");
final int objectTypes = foodLogEntryOT.value() + foodLogSummaryOT.value();
Date date = new Date(TimeUtils.dateFormatter.withZone(
DateTimeZone.forTimeZone(utc)).parseMillis(formattedDate));
String urlString = "https://api.fitbit.com/1/user/-/foods/log/date/"
+ formattedDate + ".json";
String json = makeRestCall(updateInfo, objectTypes, urlString);
apiDataService.eraseApiData(updateInfo.apiKey, foodLogEntryOT, Arrays.asList(formattedDate));
apiDataService.eraseApiData(updateInfo.apiKey, foodLogSummaryOT, Arrays.asList(formattedDate));
if (json != null) {
apiDataService.cacheApiDataJSON(updateInfo, json,
TimeUtils.fromMidnight(date.getTime(), utc),
TimeUtils.toMidnight(date.getTime(), utc),
objectTypes);
}
}
private String getSleepData(UpdateInfo updateInfo, String formattedDate)
=======
private String getSleepData(UpdateInfo updateInfo, String formattedDate)
>>>>>>> 19d25f07737af3951d4f9687da202f7d75adde75
throws RateLimitReachedException, UnexpectedResponseCodeException, UpdateFailedException, AuthExpiredException {
String urlString = "https://api.fitbit.com/1/user/-/sleep/date/"
+ formattedDate + ".json"; |
| Solution content |
|---|
}
}
private void loadFoodDataForOneDay(UpdateInfo updateInfo, String formattedDate) throws Exception {
updateInfo.setContext("date", formattedDate);
TimeZone utc = TimeZone.getTimeZone("UTC");
final int objectTypes = foodLogEntryOT.value() + foodLogSummaryOT.value();
Date date = new Date(TimeUtils.dateFormatter.withZone(
DateTimeZone.forTimeZone(utc)).parseMillis(formattedDate));
String urlString = "https://api.fitbit.com/1/user/-/foods/log/date/"
+ formattedDate + ".json";
String json = makeRestCall(updateInfo, objectTypes, urlString);
apiDataService.eraseApiData(updateInfo.apiKey, foodLogEntryOT, Arrays.asList(formattedDate));
apiDataService.eraseApiData(updateInfo.apiKey, foodLogSummaryOT, Arrays.asList(formattedDate));
if (json != null) {
apiDataService.cacheApiDataJSON(updateInfo, json,
TimeUtils.fromMidnight(date.getTime(), utc),
TimeUtils.toMidnight(date.getTime(), utc),
objectTypes);
}
}
private String getSleepData(UpdateInfo updateInfo, String formattedDate)
throws RateLimitReachedException, UnexpectedResponseCodeException, UpdateFailedException, AuthExpiredException {
String urlString = "https://api.fitbit.com/1/user/-/sleep/date/"
+ formattedDate + ".json"; |
| File |
|---|
| FitBitTSUpdater.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Method signature |