xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: unlock tiles properly onResume

Browse Source
This commit is contained in:
Hannes Janetzek
2012-11-07 23:13:57 +01:00
parent 7dd171dc24
commit dd64d6da26
7 changed files with 61 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/oscim/database/oscimap/MapDatabase.java
View File

@@ -140,12 +140,6 @@ public class MapDatabase implements IMapDatabase {
mLastRequest = SystemClock.elapsedRealtime();
// FIXME remove this stuff
if (!mTile.isLoading) {
Log.d(TAG, "loading canceled " + mTile);
result = QueryResult.FAILED;
}
cacheFinish(tile, f, result == QueryResult.SUCCESS);
return result;

16
src/org/oscim/database/pbmap/MapDatabase.java
View File

@@ -180,12 +180,9 @@ public class MapDatabase implements IMapDatabase {
try {
if (USE_LW_HTTP) {
if (lwHttpSendRequest(tile)) {
if (lwHttpReadHeader() > 0) {
cacheBegin(tile, f);
decode();
}
if (lwHttpSendRequest(tile) && lwHttpReadHeader() > 0) {
cacheBegin(tile, f);
decode();
} else {
result = QueryResult.FAILED;
}
@@ -254,12 +251,6 @@ public class MapDatabase implements IMapDatabase {
if (USE_APACHE_HTTP)
mRequest = null;
// FIXME remove this stuff
if (!mTile.isLoading) {
Log.d(TAG, "loading canceled " + mTile);
result = QueryResult.FAILED;
}
cacheFinish(tile, f, result == QueryResult.SUCCESS);
return result;
@@ -877,6 +868,7 @@ public class MapDatabase implements IMapDatabase {
mBufferSize += len;
}
return read;
}