ricky/osj-forum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed updating of forum_info, topic_info, and thread_info tables

Browse Source 
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
Ricky Barrette
2012-10-05 12:49:52 -04:00
parent 93dfb68e4f
commit 55d3cca08e
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OSJ Forum/AndroidManifest.xml
View File

@@ -1,5 +1,5 @@
<manifest package="org.RickBarrette.osj.forum" <manifest package="org.RickBarrette.osj.forum"
android:versionCode="269" android:versionCode="281"
android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"> android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
<uses-sdk <uses-sdk

21
OSJ Forum/src/org/RickBarrette/osj/forum/database/ForumDatabase.java
View File

@@ -494,12 +494,11 @@ public class ForumDatabase {
ContentValues id = new ContentValues(); ContentValues id = new ContentValues();
id.put(KEY_ID, forumId); id.put(KEY_ID, forumId);
upsertTable(TABLE_FORUMS, KEY_ID +" = "+ forumId, id); upsertTable(TABLE_FORUMS, KEY_ID +" = "+ DatabaseUtils.sqlEscapeString(forumId), id);
for (final ContentValues item : values) { for (final ContentValues item : values) {
item.put(KEY_FORUM_ID, forumId); item.put(KEY_FORUM_ID, forumId);
upsertTable(TABLE_FORUM_INFO, upsertTable(TABLE_FORUM_INFO, KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY) + " AND " + KEY_FORUM_ID + " = " + DatabaseUtils.sqlEscapeString(forumId)), item);
KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY) + " AND " + KEY_FORUM_ID + " = " + DatabaseUtils.sqlEscapeString(forumId)), item);
} }
} }
@@ -535,17 +534,11 @@ public class ForumDatabase {
id.put(KEY_ID, postId); id.put(KEY_ID, postId);
id.put(KEY_FORUM_ID, forumId); id.put(KEY_FORUM_ID, forumId);
id.put(KEY_TOPIC_ID, topicId); id.put(KEY_TOPIC_ID, topicId);
upsertTable(TABLE_THREADS, KEY_ID +" = "+ postId, id); upsertTable(TABLE_THREADS, KEY_ID +" = "+ DatabaseUtils.sqlEscapeString(postId), id);
for (final ContentValues item : values) { for (final ContentValues item : values) {
item.put(KEY_FORUM_ID, forumId);
item.put(KEY_TOPIC_ID, topicId);
item.put(KEY_POST_ID, postId); item.put(KEY_POST_ID, postId);
upsertTable( upsertTable( TABLE_THREAD_INFO, KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY)) + " AND " + KEY_POST_ID + " = " + DatabaseUtils.sqlEscapeString(postId), item);
TABLE_THREAD_INFO,
KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY)) + " AND " + KEY_FORUM_ID + " = " + DatabaseUtils.sqlEscapeString(forumId)
+ " AND " + KEY_TOPIC_ID + " = " + DatabaseUtils.sqlEscapeString(topicId) + " AND " + KEY_POST_ID + " = "
+ DatabaseUtils.sqlEscapeString(postId), item);
} }
} }
@@ -565,14 +558,12 @@ public class ForumDatabase {
ContentValues id = new ContentValues(); ContentValues id = new ContentValues();
id.put(KEY_ID, topicId); id.put(KEY_ID, topicId);
id.put(KEY_FORUM_ID, forumId); id.put(KEY_FORUM_ID, forumId);
upsertTable(TABLE_TOPICS, KEY_ID +" = "+ topicId, id); upsertTable(TABLE_TOPICS, KEY_ID +" = "+ DatabaseUtils.sqlEscapeString(topicId), id);
for (final ContentValues item : values) { for (final ContentValues item : values) {
item.put(KEY_FORUM_ID, forumId);
item.put(KEY_TOPIC_ID, topicId); item.put(KEY_TOPIC_ID, topicId);
upsertTable(TABLE_TOPIC_INFO, upsertTable(TABLE_TOPIC_INFO,
KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY)) + " AND " + KEY_FORUM_ID + " = " + DatabaseUtils.sqlEscapeString(forumId) KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY)) + " AND " + KEY_TOPIC_ID + " = " + DatabaseUtils.sqlEscapeString(topicId), item);
+ " AND " + KEY_TOPIC_ID + " = " + DatabaseUtils.sqlEscapeString(topicId), item);
} }
} }
} }