Fixed database update to new version

DrKLO · DrKLO · commit 8b73d93d1a4e · 2014-08-24T00:51:53.000+03:00
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -80,7 +80,7 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 19
-        versionCode 309
+        versionCode 310
         versionName "1.8.0"
     }
 }
diff --git a/TMessagesProj/src/main/java/org/telegram/SQLite/SQLiteDatabase.java b/TMessagesProj/src/main/java/org/telegram/SQLite/SQLiteDatabase.java
@@ -11,13 +11,9 @@
 import org.telegram.messenger.FileLog;
 import org.telegram.ui.ApplicationLoader;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class SQLiteDatabase {
 	private final int sqliteHandle;
 
-	private final Map<String, SQLitePreparedStatement> preparedMap = new HashMap<String, SQLitePreparedStatement>();
 	private boolean isOpen = false;
     private boolean inTransaction = false;
 
@@ -36,23 +32,13 @@ public boolean tableExists(String tableName) throws SQLiteException {
 		return executeInt(s, tableName) != null;
 	}
 
-	public void execute(String sql, Object... args) throws SQLiteException {
-		checkOpened();
-		SQLiteCursor cursor = query(sql, args);
-		try {
-			cursor.next();
-		} finally {
-			cursor.dispose();
-		}
-	}
-
     public SQLitePreparedStatement executeFast(String sql) throws SQLiteException {
         return new SQLitePreparedStatement(this, sql, true);
     }
 
 	public Integer executeInt(String sql, Object... args) throws SQLiteException {
 		checkOpened();
-		SQLiteCursor cursor = query(sql, args);
+		SQLiteCursor cursor = queryFinalized(sql, args);
 		try {
 			if (!cursor.next()) {
 				return null;
@@ -63,18 +49,6 @@ public Integer executeInt(String sql, Object... args) throws SQLiteException {
 		}
 	}
 
-	public SQLiteCursor query(String sql, Object... args) throws SQLiteException {
-		checkOpened();
-		SQLitePreparedStatement stmt = preparedMap.get(sql);
-
-		if (stmt == null) {
-			stmt = new SQLitePreparedStatement(this, sql, false);
-			preparedMap.put(sql, stmt);
-		}
-
-		return stmt.query(args);
-	}
-
 	public SQLiteCursor queryFinalized(String sql, Object... args) throws SQLiteException {
 		checkOpened();
 		return new SQLitePreparedStatement(this, sql, true).query(args);
@@ -83,9 +57,6 @@ public SQLiteCursor queryFinalized(String sql, Object... args) throws SQLiteExce
 	public void close() {
 		if (isOpen) {
 			try {
-				for (SQLitePreparedStatement stmt : preparedMap.values()) {
-					stmt.finalizeQuery();
-				}
                 commitTransaction();
 				closedb(sqliteHandle);
 			} catch (SQLiteException e) {

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ android {`
`80`	`80`	`defaultConfig {`
`81`	`81`	`minSdkVersion 8`
`82`	`82`	`targetSdkVersion 19`
`83`		`- versionCode 309`
	`83`	`+ versionCode 310`
`84`	`84`	`versionName "1.8.0"`
`85`	`85`	`}`
`86`	`86`	`}`