From 3bdb6e86afb68ccebe9aa7fe3126a3d9152d584b Mon Sep 17 00:00:00 2001 From: jan_bar Date: Wed, 24 Apr 2013 15:48:44 +0200 Subject: Support score in online and offline mode Bump database version Fixed bug in database drop order --- src/org/fox/ttrss/util/DatabaseHelper.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/org/fox/ttrss/util/DatabaseHelper.java') diff --git a/src/org/fox/ttrss/util/DatabaseHelper.java b/src/org/fox/ttrss/util/DatabaseHelper.java index cf5380e0..3d64a820 100644 --- a/src/org/fox/ttrss/util/DatabaseHelper.java +++ b/src/org/fox/ttrss/util/DatabaseHelper.java @@ -10,7 +10,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { @SuppressWarnings("unused") private final String TAG = this.getClass().getSimpleName(); public static final String DATABASE_NAME = "OfflineStorage.db"; - public static final int DATABASE_VERSION = 3; + public static final int DATABASE_VERSION = 4; public DatabaseHelper(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); @@ -18,11 +18,12 @@ public class DatabaseHelper extends SQLiteOpenHelper { @Override public void onCreate(SQLiteDatabase db) { + db.execSQL("DROP VIEW IF EXISTS cats_unread;"); + db.execSQL("DROP VIEW IF EXISTS feeds_unread;"); + db.execSQL("DROP TRIGGER IF EXISTS articles_set_modified;"); db.execSQL("DROP TABLE IF EXISTS categories;"); db.execSQL("DROP TABLE IF EXISTS feeds;"); db.execSQL("DROP TABLE IF EXISTS articles;"); - db.execSQL("DROP VIEW IF EXISTS feeds_unread;"); - db.execSQL("DROP TRIGGER IF EXISTS articles_set_modified;"); db.execSQL("CREATE TABLE IF NOT EXISTS feeds (" + BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + @@ -42,6 +43,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { "unread BOOLEAN, " + "marked BOOLEAN, " + "published BOOLEAN, " + + "score INTEGER, " + "updated INTEGER, " + "is_updated BOOLEAN, " + "title TEXT, " + -- cgit v1.2.3-54-g00ecf From 08220587127d97ad9dcddab16df2a83f75b9ffef Mon Sep 17 00:00:00 2001 From: jan_bar Date: Wed, 24 Apr 2013 16:07:51 +0200 Subject: Show author in offline mode --- src/org/fox/ttrss/offline/OfflineArticleFragment.java | 6 +++++- src/org/fox/ttrss/offline/OfflineDownloadService.java | 7 +++---- src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 8 ++++++++ src/org/fox/ttrss/util/DatabaseHelper.java | 1 + 4 files changed, 17 insertions(+), 5 deletions(-) (limited to 'src/org/fox/ttrss/util/DatabaseHelper.java') diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index cdbbdc55..2c51f033 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -284,7 +284,11 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector. TextView author = (TextView)view.findViewById(R.id.author); if (author != null) { - author.setVisibility(View.GONE); + int authorIndex = m_cursor.getColumnIndex("author"); + if(authorIndex >= 0) + author.setText(m_cursor.getString(authorIndex)); + else + author.setVisibility(View.GONE); } } diff --git a/src/org/fox/ttrss/offline/OfflineDownloadService.java b/src/org/fox/ttrss/offline/OfflineDownloadService.java index 78ae6693..410c339a 100644 --- a/src/org/fox/ttrss/offline/OfflineDownloadService.java +++ b/src/org/fox/ttrss/offline/OfflineDownloadService.java @@ -367,10 +367,8 @@ public class OfflineDownloadService extends Service { m_articles = new Gson().fromJson(content, listType); SQLiteStatement stmtInsert = getWritableDb().compileStatement("INSERT INTO articles " + - "(" + - BaseColumns._ID + - ", unread, marked, published, score, updated, is_updated, title, link, feed_id, tags, content) " + - "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"); + "("+BaseColumns._ID+", unread, marked, published, score, updated, is_updated, title, link, feed_id, tags, content, author) " + + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"); for (Article article : m_articles) { @@ -395,6 +393,7 @@ public class OfflineDownloadService extends Service { stmtInsert.bindLong(index++, article.feed_id); stmtInsert.bindString(index++, tagsString); // comma-separated tags stmtInsert.bindString(index++, article.content); + stmtInsert.bindString(index++, article.author); if (m_downloadImages) { Document doc = Jsoup.parse(article.content); diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 41297a8a..8c9d41c1 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -532,6 +532,14 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis te.setText(excerpt); } + TextView ta = (TextView)v.findViewById(R.id.author); + + if (ta != null) { + int authorIndex = article.getColumnIndex("author"); + if(authorIndex >= 0) + ta.setText(article.getString(authorIndex)); + } + /* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator); if (separator != null && m_offlineServices.isSmallScreen()) { diff --git a/src/org/fox/ttrss/util/DatabaseHelper.java b/src/org/fox/ttrss/util/DatabaseHelper.java index 3d64a820..572ff62e 100644 --- a/src/org/fox/ttrss/util/DatabaseHelper.java +++ b/src/org/fox/ttrss/util/DatabaseHelper.java @@ -51,6 +51,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { "feed_id INTEGER, " + "tags TEXT, " + "content TEXT, " + + "author TEXT, " + "selected BOOLEAN, " + "modified BOOLEAN" + ");"); -- cgit v1.2.3-54-g00ecf