Skip to content

Issue/1668 reader doesnt auto update #1670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxme merged 4 commits into from
Jul 30, 2014
Merged

Issue/1668 reader doesnt auto update #1670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
899c4a9
Fixed bug in ReaderTagTable that caused tbl_tag_updates to always ove…
nbradbury Jul 25, 2014
dc05998
ReaderPostListFragment now auto-updates upon resume
nbradbury Jul 25, 2014
b675c60
Fixed bug in SQL insert
nbradbury Jul 26, 2014
62e5eac
Merge branch "develop"
nbradbury Jul 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 34 additions & 51 deletions WordPress/src/main/java/org/wordpress/android/datasets/ReaderTagTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.wordpress.android.datasets;

import android.content.ContentValues;
import android.database.Cursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
Expand Down Expand Up @@ -237,82 +236,66 @@ public static void deleteTag(ReaderTag tag) {
ReaderDatabase.getWritableDb().delete("tbl_tag_updates", "tag_name=? AND tag_type=?", args);
}


/**
* tbl_tag_updates routines
**/
public static String getTagNewestDate(ReaderTag tag) {
if (tag == null) {
return "";
}
String[] args = {tag.getTagName(), Integer.toString(tag.tagType.toInt())};
return SqlUtils.stringForQuery(ReaderDatabase.getReadableDb(),
"SELECT date_newest FROM tbl_tag_updates WHERE tag_name=? AND tag_type=?",
args);
return getDateColumn(tag, "date_newest");
}
public static void setTagNewestDate(ReaderTag tag, String date) {
if (tag == null) {
return;
}

ContentValues values = new ContentValues();
values.put("tag_name", tag.getTagName());
values.put("tag_type", tag.tagType.toInt());
values.put("date_newest", date);
try {
ReaderDatabase.getWritableDb().insertWithOnConflict("tbl_tag_updates", null, values, SQLiteDatabase.CONFLICT_REPLACE);
} catch (SQLException e) {
AppLog.e(T.READER, e);
}
setDateColumn(tag, "date_newest", date);
}

public static String getTagOldestDate(ReaderTag tag) {
if (tag == null) {
return "";
}
String[] args = {tag.getTagName(), Integer.toString(tag.tagType.toInt())};
return SqlUtils.stringForQuery(ReaderDatabase.getReadableDb(),
"SELECT date_oldest FROM tbl_tag_updates WHERE tag_name=? AND tag_type=?",
args);
return getDateColumn(tag, "date_oldest");
}
public static void setTagOldestDate(ReaderTag tag, String date) {
if (tag == null) {
return;
}

ContentValues values = new ContentValues();
values.put("tag_name", tag.getTagName());
values.put("tag_type", tag.tagType.toInt());
values.put("date_oldest", date);
try {
ReaderDatabase.getWritableDb().insertWithOnConflict("tbl_tag_updates", null, values, SQLiteDatabase.CONFLICT_REPLACE);
} catch (SQLException e) {
AppLog.e(T.READER, e);
}
setDateColumn(tag, "date_oldest", date);
}

private static String getTagLastUpdated(ReaderTag tag) {
return getDateColumn(tag, "date_updated");
}
public static void setTagLastUpdated(ReaderTag tag, String date) {
setDateColumn(tag, "date_updated", date);
}

private static String getDateColumn(ReaderTag tag, String colName) {
if (tag == null) {
return "";
}
String[] args = {tag.getTagName(), Integer.toString(tag.tagType.toInt())};
return SqlUtils.stringForQuery(ReaderDatabase.getReadableDb(),
"SELECT date_updated FROM tbl_tag_updates WHERE tag_name=? AND tag_type=?",
"SELECT " + colName + " FROM tbl_tag_updates WHERE tag_name=? AND tag_type=?",
args);
}

public static void setTagLastUpdated(ReaderTag tag, String date) {
private static void setDateColumn(ReaderTag tag, String colName, String date) {
if (tag == null) {
return;
}

ContentValues values = new ContentValues();
values.put("tag_name", tag.getTagName());
values.put("tag_type", tag.tagType.toInt());
values.put("date_updated", date);
String[] args = {tag.getTagName(), Integer.toString(tag.tagType.toInt())};
boolean rowExists = SqlUtils.boolForQuery(
ReaderDatabase.getReadableDb(),
"SELECT 1 FROM tbl_tag_updates WHERE tag_name=? AND tag_type=?",
args);

final String sql;
if (rowExists) {
sql = "UPDATE tbl_tag_updates SET " + colName + "=?1 WHERE tag_name=?2 AND tag_type=?3";
} else {
sql = "INSERT INTO tbl_tag_updates (" + colName + ", tag_name, tag_type) VALUES (?1,?2,?3)";
}

SQLiteStatement stmt = ReaderDatabase.getWritableDb().compileStatement(sql);
try {
ReaderDatabase.getWritableDb().insertWithOnConflict("tbl_tag_updates", null, values, SQLiteDatabase.CONFLICT_REPLACE);
} catch (SQLException e) {
AppLog.e(T.READER, e);
stmt.bindString(1, date);
stmt.bindString(2, tag.getTagName());
stmt.bindLong (3, tag.tagType.toInt());
stmt.execute();
} finally {
SqlUtils.closeStatement(stmt);
}
}

Expand Down
8 changes: 8 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,14 @@ public void onResume() {

// likewise for tags
refreshTags();

// auto-update the current tag if it's time
if (!isUpdating()
&& getPostListType() == ReaderPostListType.TAG_FOLLOWED
&& ReaderTagTable.shouldAutoUpdateTag(mCurrentTag)) {
AppLog.i(T.READER, "reader post list > auto-updating current tag after resume");
updatePostsWithTag(getCurrentTag(), RequestDataAction.LOAD_NEWER, ReaderTypes.RefreshType.AUTOMATIC);
}
}
}

Expand Down