From 5b3c2ed1a85b49fce3b69281e84121c7428c7c6e Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Sun, 19 Jan 2014 22:42:50 +0100
Subject: [PATCH] TileCache: dont use ParcelFileDescriptor for now, cleanups
---
.../org/oscim/android/cache/TileCache.java | 20 +++++++++----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/vtm-android/src/org/oscim/android/cache/TileCache.java b/vtm-android/src/org/oscim/android/cache/TileCache.java
index 8a8451c3..dc8ff5c1 100644
--- a/vtm-android/src/org/oscim/android/cache/TileCache.java
+++ b/vtm-android/src/org/oscim/android/cache/TileCache.java
@@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory;
import android.annotation.TargetApi;
import android.content.Context;
import android.database.Cursor;
-import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDoneException;
import android.database.sqlite.SQLiteOpenHelper;
@@ -108,9 +107,14 @@ public class TileCache implements ITileCache {
mDatabase.close();
}
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
public TileCache(Context context, String cacheDirectory, String dbName) {
dbHelper = new SQLiteHelper(context);
+
+ if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN)
+ dbHelper.setWriteAheadLoggingEnabled(true);
+
mDatabase = dbHelper.getWritableDatabase();
mStmtGetTile = mDatabase.compileStatement("" +
@@ -154,7 +158,7 @@ public class TileCache implements ITileCache {
class SQLiteHelper extends SQLiteOpenHelper {
private static final String DATABASE_NAME = "tile.db";
- private static final int DATABASE_VERSION = 3;
+ private static final int DATABASE_VERSION = 8;
private static final String DATABASE_CREATE =
"CREATE TABLE "
@@ -209,13 +213,12 @@ public class TileCache implements ITileCache {
mStmtPutTile.bindBlob(6, bytes);
mStmtPutTile.execute();
-
mStmtPutTile.clearBindings();
}
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
- public synchronized TileReader getTileApi11(Tile tile) {
+ public TileReader getTileApi11(Tile tile) {
InputStream in = null;
mStmtGetTile.bindLong(1, tile.tileX);
@@ -242,8 +245,8 @@ public class TileCache implements ITileCache {
@Override
public synchronized TileReader getTile(Tile tile) {
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB)
- return getTileApi11(tile);
+ //if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB)
+ // return getTileApi11(tile);
mQueryVals[0] = String.valueOf(tile.zoomLevel);
mQueryVals[1] = String.valueOf(tile.tileX);
@@ -268,12 +271,7 @@ public class TileCache implements ITileCache {
return new CacheTileReader(tile, in, Integer.MAX_VALUE);
}
- public SQLiteDatabase open() throws SQLException {
- return dbHelper.getWritableDatabase();
- }
-
@Override
public void setCacheSize(long size) {
- // TODO Auto-generated method stub
}
}