| Index: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlInfo.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlInfo.java
|
| index f32fb59468603478801ba2abf2c10f84ef11dab2..a90ab3387417b002d76e23dab1081d3959548b67 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlInfo.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlInfo.java
|
| @@ -15,19 +15,19 @@ import java.util.Locale;
|
| class UrlInfo {
|
| private static final String URL_KEY = "url";
|
| private static final String DISTANCE_KEY = "distance";
|
| - private static final String SCAN_TIMESTAMP_KEY = "scan_timestamp";
|
| + private static final String FIRST_SEEN_TIMESTAMP_KEY = "first_seen_timestamp";
|
| private static final String DEVICE_ADDRESS_KEY = "device_address";
|
| private static final String HAS_BEEN_DISPLAYED_KEY = "has_been_displayed";
|
| private final String mUrl;
|
| + private final long mFirstSeenTimestamp;
|
| private double mDistance;
|
| - private long mScanTimestamp;
|
| private String mDeviceAddress;
|
| private boolean mHasBeenDisplayed;
|
|
|
| - public UrlInfo(String url, double distance, long scanTimestamp) {
|
| + public UrlInfo(String url, double distance, long firstSeenTimestamp) {
|
| mUrl = url;
|
| mDistance = distance;
|
| - mScanTimestamp = scanTimestamp;
|
| + mFirstSeenTimestamp = firstSeenTimestamp;
|
| mDeviceAddress = null;
|
| mHasBeenDisplayed = false;
|
| }
|
| @@ -65,22 +65,12 @@ class UrlInfo {
|
| }
|
|
|
| /**
|
| - * Sets the timestamp of when the URL was last scanned.
|
| - * This timestamp should be recorded using System.currentTimeMillis().
|
| - * @param scanTimestamp the new timestamp.
|
| - */
|
| - public UrlInfo setScanTimestamp(long scanTimestamp) {
|
| - mScanTimestamp = scanTimestamp;
|
| - return this;
|
| - }
|
| -
|
| - /**
|
| - * Gets the timestamp of when the URL was last scanned.
|
| + * Gets the timestamp of when the URL was first scanned.
|
| * This timestamp is recorded using System.currentTimeMillis().
|
| - * @return The scan timestamp.
|
| + * @return The first seen timestamp.
|
| */
|
| - public long getScanTimestamp() {
|
| - return mScanTimestamp;
|
| + public long getFirstSeenTimestamp() {
|
| + return mFirstSeenTimestamp;
|
| }
|
|
|
| /**
|
| @@ -126,7 +116,7 @@ class UrlInfo {
|
| return new JSONObject()
|
| .put(URL_KEY, mUrl)
|
| .put(DISTANCE_KEY, mDistance)
|
| - .put(SCAN_TIMESTAMP_KEY, mScanTimestamp)
|
| + .put(FIRST_SEEN_TIMESTAMP_KEY, mFirstSeenTimestamp)
|
| .put(DEVICE_ADDRESS_KEY, mDeviceAddress)
|
| .put(HAS_BEEN_DISPLAYED_KEY, mHasBeenDisplayed);
|
| }
|
| @@ -138,11 +128,9 @@ class UrlInfo {
|
| * @throws JSONException if the values cannot be serialized.
|
| */
|
| public static UrlInfo jsonDeserialize(JSONObject jsonObject) throws JSONException {
|
| - UrlInfo urlInfo = new UrlInfo(
|
| - jsonObject.getString(URL_KEY),
|
| - jsonObject.getDouble(DISTANCE_KEY),
|
| - jsonObject.getLong(SCAN_TIMESTAMP_KEY))
|
| - .setDeviceAddress(jsonObject.optString(DEVICE_ADDRESS_KEY));
|
| + UrlInfo urlInfo = new UrlInfo(jsonObject.getString(URL_KEY),
|
| + jsonObject.getDouble(DISTANCE_KEY), jsonObject.getLong(FIRST_SEEN_TIMESTAMP_KEY))
|
| + .setDeviceAddress(jsonObject.optString(DEVICE_ADDRESS_KEY));
|
| if (jsonObject.optBoolean(HAS_BEEN_DISPLAYED_KEY, false)) {
|
| urlInfo.setHasBeenDisplayed();
|
| }
|
| @@ -154,7 +142,7 @@ class UrlInfo {
|
| */
|
| @Override
|
| public String toString() {
|
| - return String.format(Locale.getDefault(), "%s %f %d %b",
|
| - mUrl, mDistance, mScanTimestamp, mHasBeenDisplayed);
|
| + return String.format(Locale.getDefault(), "%s %f %d %b", mUrl, mDistance,
|
| + mFirstSeenTimestamp, mHasBeenDisplayed);
|
| }
|
| }
|
|
|