public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make comment replies locally idempotent. (#828)

Browse source
This commit is contained in:
dosiecki 2015-11-21 02:06:30 -08:00
parent eca82b4f03
commit d9f6c44c93
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
View file

@ -1080,12 +1080,12 @@ public class BlurDatabaseHelper {
return replies;
}
public void replyToComment(String storyId, String feedId, String commentUserId, String replyText) {
public void replyToComment(String storyId, String feedId, String commentUserId, String replyText, long replyCreateTime) {
Reply reply = new Reply();
reply.commentId = Comment.constructId(storyId, feedId, commentUserId);
reply.text = replyText;
reply.userId = PrefsUtils.getUserDetails(context).id;
reply.date = new Date();
reply.date = new Date(replyCreateTime);
reply.id = reply.constructId();
synchronized (RW_MUTEX) {dbRW.insertWithOnConflict(DatabaseConstants.REPLY_TABLE, null, reply.getValues(), SQLiteDatabase.CONFLICT_REPLACE);}
}

16
clients/android/NewsBlur/src/com/newsblur/util/ReadingAction.java
View file

@ -22,6 +22,7 @@ public class ReadingAction {
UNLIKE_COMMENT
};
private final long time;
private ActionType type;
private String storyHash;
private FeedSet feedSet;
@ -34,7 +35,13 @@ public class ReadingAction {
private String commentUserId;
private ReadingAction() {
; // must use helpers
// note: private - must use helpers
this(System.currentTimeMillis());
}
private ReadingAction(long time) {
// note: private - must use helpers
this.time = time;
}
public static ReadingAction markStoryRead(String hash) {
@ -115,7 +122,7 @@ public class ReadingAction {
public ContentValues toContentValues() {
ContentValues values = new ContentValues();
values.put(DatabaseConstants.ACTION_TIME, System.currentTimeMillis());
values.put(DatabaseConstants.ACTION_TIME, time);
switch (type) {
case MARK_READ:
@ -186,7 +193,8 @@ public class ReadingAction {
}
public static ReadingAction fromCursor(Cursor c) {
ReadingAction ra = new ReadingAction();
long time = c.getLong(c.getColumnIndexOrThrow(DatabaseConstants.ACTION_TIME));
ReadingAction ra = new ReadingAction(time);
if (c.getInt(c.getColumnIndexOrThrow(DatabaseConstants.ACTION_MARK_READ)) == 1) {
ra.type = ActionType.MARK_READ;
String hash = c.getString(c.getColumnIndexOrThrow(DatabaseConstants.ACTION_STORY_HASH));
@ -332,7 +340,7 @@ public class ReadingAction {
break;
case REPLY:
dbHelper.replyToComment(storyId, feedId, commentUserId, commentReplyText);
dbHelper.replyToComment(storyId, feedId, commentUserId, commentReplyText, time);
impact |= NbActivity.UPDATE_SOCIAL;
break;