summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-11-15 15:11:15 +0400
committerAndrew Dolgov <[email protected]>2013-11-15 15:11:15 +0400
commitd7c69cf59171a58b48143d10a4f161ffcad59b98 (patch)
tree68ff6a04e1a575441873b08bc8f4e8af5dd25644 /src
parentf2dde1362b07a21d5778cf8d704bd44460977683 (diff)
do not mark article as read before opening it in offline mode which
screwed up the cursor (closes #800)
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/offline/OfflineArticlePager.java5
-rw-r--r--src/org/fox/ttrss/offline/OfflineFeedsActivity.java17
-rw-r--r--src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java17
3 files changed, 24 insertions, 15 deletions
diff --git a/src/org/fox/ttrss/offline/OfflineArticlePager.java b/src/org/fox/ttrss/offline/OfflineArticlePager.java
index 96c816b7..510ab97b 100644
--- a/src/org/fox/ttrss/offline/OfflineArticlePager.java
+++ b/src/org/fox/ttrss/offline/OfflineArticlePager.java
@@ -170,13 +170,16 @@ public class OfflineArticlePager extends Fragment {
}
m_cursor.moveToNext();
}
+
+ Log.d(TAG, "(1)maId=" + m_articleId);
+ m_listener.onArticleSelected(m_articleId, false);
}
} else {
if (m_cursor.moveToFirst()) {
m_articleId = m_cursor.getInt(m_cursor.getColumnIndex(BaseColumns._ID));
m_listener.onArticleSelected(m_articleId, false);
- Log.d(TAG, "maId=" + m_articleId);
+ Log.d(TAG, "(2)maId=" + m_articleId);
}
}
diff --git a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
index a6c8b349..cc14bded 100644
--- a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
@@ -279,13 +279,16 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead
@Override
public void onArticleSelected(int articleId, boolean open) {
- SQLiteStatement stmt = getWritableDb().compileStatement(
- "UPDATE articles SET modified = 1, unread = 0 " + "WHERE " + BaseColumns._ID
- + " = ?");
-
- stmt.bindLong(1, articleId);
- stmt.execute();
- stmt.close();
+
+ if (!open) {
+ SQLiteStatement stmt = getWritableDb().compileStatement(
+ "UPDATE articles SET modified = 1, unread = 0 " + "WHERE " + BaseColumns._ID
+ + " = ?");
+
+ stmt.bindLong(1, articleId);
+ stmt.execute();
+ stmt.close();
+ }
initMenu();
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java
index b40f3983..d3883879 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java
@@ -107,13 +107,16 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline
@Override
public void onArticleSelected(int articleId, boolean open) {
- SQLiteStatement stmt = getWritableDb().compileStatement(
- "UPDATE articles SET modified = 1, unread = 0 " + "WHERE " + BaseColumns._ID
- + " = ?");
-
- stmt.bindLong(1, articleId);
- stmt.execute();
- stmt.close();
+
+ if (!open) {
+ SQLiteStatement stmt = getWritableDb().compileStatement(
+ "UPDATE articles SET modified = 1, unread = 0 " + "WHERE " + BaseColumns._ID
+ + " = ?");
+
+ stmt.bindLong(1, articleId);
+ stmt.execute();
+ stmt.close();
+ }
if (open) {
OfflineArticlePager af = (OfflineArticlePager) getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE);