moparisthebest/Yaaic
1
0
Fork 0
mirror of https://github.com/moparisthebest/Yaaic synced 2024-11-22 17:02:21 -05:00
Code Issues Releases Wiki Activity

Database: isTitleUsed(): Escape server title (SQLiteException) - Fixes #53

Browse Source
This commit is contained in:
Sebastian Kaspari 2011-04-12 23:30:00 +02:00
parent b3fd4157dc
commit ded6485f6b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/src/org/yaaic/db/Database.java
View File

@ -31,6 +31,7 @@ import org.yaaic.model.Status;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.DatabaseUtils;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
@ -66,7 +67,7 @@ public class Database extends SQLiteOpenHelper
+ ServerConstants.HOST + " TEXT NOT NULL, " + ServerConstants.HOST + " TEXT NOT NULL, "
+ ServerConstants.PORT + " INTEGER, " + ServerConstants.PORT + " INTEGER, "
+ ServerConstants.PASSWORD + " TEXT, " + ServerConstants.PASSWORD + " TEXT, "
+ ServerConstants.AUTOCONNECT + " BOOLEAN, " // XXX: Does SQLLite support boolean? + ServerConstants.AUTOCONNECT + " BOOLEAN, "
+ ServerConstants.USE_SSL + " BOOLEAN, " + ServerConstants.USE_SSL + " BOOLEAN, "
+ ServerConstants.CHARSET + " TEXT, " + ServerConstants.CHARSET + " TEXT, "
+ ServerConstants.IDENTITY + " INTEGER" + ServerConstants.IDENTITY + " INTEGER"
@ -259,7 +260,7 @@ public class Database extends SQLiteOpenHelper
Cursor cursor = this.getReadableDatabase().query( Cursor cursor = this.getReadableDatabase().query(
CommandConstants.TABLE_NAME, CommandConstants.TABLE_NAME,
CommandConstants.ALL, CommandConstants.ALL,
CommandConstants.SERVER + "=" + serverId, CommandConstants.SERVER + " = " + serverId,
null, null,
null, null,
null, null,
@ -348,7 +349,7 @@ public class Database extends SQLiteOpenHelper
Cursor cursor = this.getReadableDatabase().query( Cursor cursor = this.getReadableDatabase().query(
ServerConstants.TABLE_NAME, ServerConstants.TABLE_NAME,
ServerConstants.ALL, ServerConstants.ALL,
ServerConstants._ID + "=" + serverId, ServerConstants._ID + " = " + serverId,
null, null,
null, null,
null, null,
@ -377,7 +378,7 @@ public class Database extends SQLiteOpenHelper
Cursor cursor = this.getReadableDatabase().query( Cursor cursor = this.getReadableDatabase().query(
ServerConstants.TABLE_NAME, ServerConstants.TABLE_NAME,
ServerConstants.ALL, ServerConstants.ALL,
ServerConstants.TITLE + " = '" + title + "'", ServerConstants.TITLE + " = " + DatabaseUtils.sqlEscapeString(title),
null, null,
null, null,
null, null,
@ -462,7 +463,7 @@ public class Database extends SQLiteOpenHelper
Cursor cursor = this.getReadableDatabase().query( Cursor cursor = this.getReadableDatabase().query(
ChannelConstants.TABLE_NAME, ChannelConstants.TABLE_NAME,
ChannelConstants.ALL, ChannelConstants.ALL,
ChannelConstants.SERVER + "=" + serverId, ChannelConstants.SERVER + " = " + serverId,
null, null,
null, null,
null, null,
@ -507,6 +508,7 @@ public class Database extends SQLiteOpenHelper
deleteAliases(identityId); deleteAliases(identityId);
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
for (String alias : aliases) { for (String alias : aliases) {
values.clear(); values.clear();
values.put(AliasConstants.ALIAS, alias); values.put(AliasConstants.ALIAS, alias);
@ -642,7 +644,7 @@ public class Database extends SQLiteOpenHelper
Cursor cursor = this.getReadableDatabase().query( Cursor cursor = this.getReadableDatabase().query(
ServerConstants.TABLE_NAME, ServerConstants.TABLE_NAME,
ServerConstants.ALL, ServerConstants.ALL,
ServerConstants._ID + "=" + serverId, ServerConstants._ID + " = " + serverId,
null, null,
null, null,
null, null,