Use published field from API (#49)

#fix #33
FreshRSS/FreshRSS#2773 (comment)
Use advertised `published` date instead of crawl time.

Author: Alkarex

app/src/main/java/org/freshrss/easyrss/FeedViewCtrl.java

@@ -205,7 +205,7 @@ public void run() {
 
     final private static String INTENT_KEY_ID = "id";
     final private static String ITEM_PROJECTION[] = new String[] { Item._UID, Item._TITLE, ItemState._ISREAD,
-            ItemState._ISSTARRED, Item._TIMESTAMP, Item._SOURCETITLE };
+            ItemState._ISSTARRED, Item._TIMESTAMP, Item._UPDATETIME, Item._SOURCETITLE };
 
     final private static int MSG_DISMISS_DIALOG = 1;
     final private static int MSG_ITEM_LONG_CLICK = 0;

app/src/main/java/org/freshrss/easyrss/ItemListWrapper.java

@@ -85,7 +85,7 @@ public void setListener(final ItemListWrapperListener listener) {
 
     public void updateItem(final Item item) {
         adapter.updateItem(new ListItemItem(item.getUid(), item.getTitle(), item.getSourceTitle(), item.getState()
-                .isRead(), item.getState().isStarred(), item.getTimestamp()));
+                .isRead(), item.getState().isStarred(), item.getUpdateTime()));
     }
 
     public void updateItemEndDisabled() {

app/src/main/java/org/freshrss/easyrss/VerticalSingleItemView.java

@@ -62,7 +62,7 @@
 
 public class VerticalSingleItemView implements OnScrollChangedListener, OnTouchListener {
     final private static String ITEM_PROJECTION[] = new String[] { Item._UID, Item._TITLE, ItemState._ISCACHED,
-            ItemState._ISREAD, ItemState._ISSTARRED, Item._TIMESTAMP, Item._SOURCETITLE, Item._AUTHOR, Item._HREF };
+            ItemState._ISREAD, ItemState._ISSTARRED, Item._TIMESTAMP, Item._UPDATETIME, Item._SOURCETITLE, Item._AUTHOR, Item._HREF };
 
     final private DataMgr dataMgr;
     final private Context context;
@@ -240,7 +240,7 @@ public void onClick(final View view) {
         final StringBuilder infoText = new StringBuilder();
         final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         sdf.setTimeZone(TimeZone.getDefault());
-        infoText.append(sdf.format(Utils.timestampToDate(item.getTimestamp())));
+        infoText.append(sdf.format(Utils.timestampToDate(item.getUpdateTime())));
         if (item.getAuthor() != null && item.getAuthor().length() > 0) {
             infoText.append(" | By ");
             infoText.append(item.getAuthor());

app/src/main/java/org/freshrss/easyrss/WebpageItemViewCtrl.java

@@ -65,7 +65,7 @@ public void handleMessage(final Message msg) {
             }
         }
     };
-    final private static String ITEM_PROJECTION[] = new String[] { Item._UID, Item._TITLE, Item._TIMESTAMP,
+    final private static String ITEM_PROJECTION[] = new String[] { Item._UID, Item._TITLE, Item._TIMESTAMP, Item._UPDATETIME,
             Item._SOURCETITLE, Item._AUTHOR, Item._HREF };
     final private static int MSG_LOADING_FINISHED = 0;
 
@@ -208,7 +208,7 @@ private void showMobilizedPage() {
         final StringBuilder infoText = new StringBuilder();
         final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         sdf.setTimeZone(TimeZone.getDefault());
-        infoText.append(sdf.format(Utils.timestampToDate(item.getTimestamp())));
+        infoText.append(sdf.format(Utils.timestampToDate(item.getUpdateTime())));
         if (item.getAuthor() != null && item.getAuthor().length() > 0) {
             infoText.append(" | By ");
             infoText.append(item.getAuthor());

app/src/main/java/org/freshrss/easyrss/data/DataMgr.java

@@ -565,7 +565,7 @@ public int removeOutdatedItemsWithLimit(final int limit) {
         int ret = 0;
         final ContentResolver resolver = context.getContentResolver();
         final Cursor cur = resolver.query(Uri.withAppendedPath(Item.CONTENT_URI, "offset/" + limit),
-                new String[] { Item._UID }, null, null, Item._UPDATETIME + " DESC");
+                new String[] { Item._UID }, null, null, Item._TIMESTAMP + " DESC");
         for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) {
             ret += removeItemByUid(Item.fromCursor(cur).getUid());
         }

app/src/main/java/org/freshrss/easyrss/data/Item.java

@@ -160,7 +160,10 @@ public String getUid() {
     }
 
     public long getUpdateTime() {
-        return updateTime;
+        return updateTime > 0 ? updateTime : timestamp;
+    }
+    public long getUpdateTime(final boolean raw) {
+        return raw ? updateTime : getUpdateTime();
     }
 
     private void init(final String author, final String uid, final String content, final String href,
@@ -174,7 +177,7 @@ private void init(final String author, final String uid, final String content, f
         this.sourceTitle = (sourceTitle == null) ? "" : sourceTitle;
         this.title = (title == null) ? "" : title;
         this.tags = (tags == null) ? new LinkedList<String>() : tags;
-        this.updateTime = (updateTime == null) ? System.currentTimeMillis() : updateTime;
+        this.updateTime = (updateTime == null) ? 0 : updateTime;
         this.timestamp = (timestamp == null) ? 0 : timestamp;
         this.state = (state == null) ? new ItemState() : state;
     }

app/src/main/java/org/freshrss/easyrss/data/parser/ItemJSONParser.java

@@ -80,6 +80,17 @@ private void parse() throws JsonParseException, IOException {
                     item.setHref(parser.getText());
                 }
                 break;
+            case VALUE_NUMBER_INT:
+                if (level == 3) {
+                    if ("updated".equals(name)) {
+                        item.setUpdateTime(parser.getLongValue() * 1000000);
+                    } else if ("published".equals(name)) {
+                        if (item.getUpdateTime(true) <= 0) {
+                            item.setUpdateTime(parser.getLongValue() * 1000000);
+                        }
+                    }
+                }
+                break;
             case FIELD_NAME:
                 if (level == 1 && "items".equals(name)) {
                     found = true;