Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added saving count of any map downloaded

Browse source
This commit is contained in:
Bars107 2015-01-23 18:44:54 +02:00
parent 8ae99486f7
commit 9392e0418e
2 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
View file

@ -24,6 +24,7 @@ import net.osmand.plus.R;
import net.osmand.plus.Version; import net.osmand.plus.Version;
import net.osmand.plus.base.BasicProgressAsyncTask; import net.osmand.plus.base.BasicProgressAsyncTask;
import net.osmand.plus.download.DownloadFileHelper.DownloadFileShowWarning; import net.osmand.plus.download.DownloadFileHelper.DownloadFileShowWarning;
import net.osmand.plus.helpers.DownloadFrequencyHelper;
import net.osmand.plus.resources.ResourceManager; import net.osmand.plus.resources.ResourceManager;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
@ -57,12 +58,14 @@ public class DownloadIndexesThread {
private java.text.DateFormat dateFormat; private java.text.DateFormat dateFormat;
private List<IndexItem> itemsToUpdate = new ArrayList<IndexItem>(); private List<IndexItem> itemsToUpdate = new ArrayList<IndexItem>();
DownloadFrequencyHelper dbHelper;
public DownloadIndexesThread(Context ctx) { public DownloadIndexesThread(Context ctx) {
this.ctx = ctx; this.ctx = ctx;
app = (OsmandApplication) ctx.getApplicationContext(); app = (OsmandApplication) ctx.getApplicationContext();
downloadFileHelper = new DownloadFileHelper(app); downloadFileHelper = new DownloadFileHelper(app);
dateFormat = app.getResourceManager().getDateFormat(); dateFormat = app.getResourceManager().getDateFormat();
dbHelper = new DownloadFrequencyHelper(app);
} }
public void clear() { public void clear() {
@ -146,12 +149,27 @@ public class DownloadIndexesThread {
if (uiActivity != null) { if (uiActivity != null) {
uiActivity.downloadListUpdated(); uiActivity.downloadListUpdated();
uiActivity.updateDownloadButton(false); uiActivity.updateDownloadButton(false);
DownloadEntry item = (DownloadEntry)o;
String name = item.assetName != null ?
item.assetName.substring(item.assetName.lastIndexOf("/") + 1) :
item.baseName;
long count = dbHelper.getCount(name) + 1;
DownloadFrequencyHelper.HistoryEntry entry = new DownloadFrequencyHelper.HistoryEntry(name,count);
if (count == 1) {
dbHelper.add(entry);
} else {
dbHelper.update(entry);
}
} }
} else if (o instanceof IndexItem) { } else if (o instanceof IndexItem) {
entriesToDownload.remove(o); entriesToDownload.remove(o);
if (uiActivity != null) { if (uiActivity != null) {
uiActivity.downloadListUpdated(); uiActivity.downloadListUpdated();
uiActivity.updateDownloadButton(false); uiActivity.updateDownloadButton(false);
IndexItem item = (IndexItem)o;
long count = dbHelper.getCount(item.fileName) + 1;
dbHelper.add(new DownloadFrequencyHelper.HistoryEntry(item.fileName, count));
} }
} else if (o instanceof String) { } else if (o instanceof String) {
String message = (String) o; String message = (String) o;

50
OsmAnd/src/net/osmand/plus/helpers/DownloadFrequencyHelper.java
View file

@ -1,6 +1,5 @@
package net.osmand.plus.helpers; package net.osmand.plus.helpers;
import android.content.Context;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.api.SQLiteAPI; import net.osmand.plus.api.SQLiteAPI;
@ -13,25 +12,21 @@ import java.util.List;
*/ */
public class DownloadFrequencyHelper { public class DownloadFrequencyHelper {
private static final String DB_NAME = "search_history"; //$NON-NLS-1$ private static final String DB_NAME = "download_history"; //$NON-NLS-1$
private static final int DB_VERSION = 1; private static final int DB_VERSION = 1;
private static final String HISTORY_TABLE_NAME = "history"; //$NON-NLS-1$ private static final String HISTORY_TABLE_NAME = "history"; //$NON-NLS-1$
private static final String HISTORY_COL_NAME = "name"; //$NON-NLS-1$ private static final String HISTORY_COL_NAME = "name"; //$NON-NLS-1$
private static final String HISTORY_COL_TIME = "time"; //$NON-NLS-1$ private static final String HISTORY_COL_COUNT = "count"; //$NON-NLS-1$
private static final String HISTORY_COL_TYPE = "type"; //$NON-NLS-1$
private static final String HISTORY_COL_LAT = "latitude"; //$NON-NLS-1$
private static final String HISTORY_COL_LON = "longitude"; //$NON-NLS-1$
private static final String HISTORY_TABLE_CREATE = "CREATE TABLE " + HISTORY_TABLE_NAME + " (" + //$NON-NLS-1$ //$NON-NLS-2$ private static final String HISTORY_TABLE_CREATE = "CREATE TABLE " + HISTORY_TABLE_NAME + " (" + //$NON-NLS-1$ //$NON-NLS-2$
HISTORY_COL_NAME + " TEXT, " + HISTORY_COL_TIME + " long, " + HISTORY_COL_TYPE + " TEXT, " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ HISTORY_COL_NAME + " TEXT, " + HISTORY_COL_COUNT + " long);"; //$NON-NLS-1$ //$NON-NLS-2$
HISTORY_COL_LAT + " double, " +HISTORY_COL_LON + " double);"; //$NON-NLS-1$ //$NON-NLS-2$
private OsmandApplication app; private OsmandApplication app;
public static class HistoryEntry { public static class HistoryEntry {
int count; long count;
String name; String name;
public HistoryEntry(int count, String name){ public HistoryEntry(String name, long count){
this.count = count; this.count = count;
this.name = name; this.name = name;
@ -41,7 +36,7 @@ public class DownloadFrequencyHelper {
return name; return name;
} }
public int getCount() { public long getCount() {
return count; return count;
} }
} }
@ -55,7 +50,7 @@ public class DownloadFrequencyHelper {
if (conn.getVersion() == 0 || DB_VERSION != conn.getVersion()) { if (conn.getVersion() == 0 || DB_VERSION != conn.getVersion()) {
if (readonly) { if (readonly) {
conn.close(); conn.close();
conn = app.getSQLiteAPI().getOrCreateDatabase(DB_NAME, readonly); conn = app.getSQLiteAPI().getOrCreateDatabase(DB_NAME, true);
} }
if (conn.getVersion() == 0) { if (conn.getVersion() == 0) {
conn.setVersion(DB_VERSION); conn.setVersion(DB_VERSION);
@ -106,7 +101,7 @@ public class DownloadFrequencyHelper {
if(db != null){ if(db != null){
try { try {
db.execSQL( db.execSQL(
"UPDATE " + HISTORY_TABLE_NAME + " SET time = ? WHERE " + HISTORY_COL_NAME + " = ?", new Object[] { System.currentTimeMillis(), e.getName() }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ "UPDATE " + HISTORY_TABLE_NAME + " SET " + HISTORY_COL_COUNT + " = ? WHERE " + HISTORY_COL_NAME + " = ?", new Object[] { e.getCount(), e.getName() }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} finally { } finally {
db.close(); db.close();
} }
@ -120,7 +115,7 @@ public class DownloadFrequencyHelper {
if(db != null){ if(db != null){
try { try {
db.execSQL( db.execSQL(
"INSERT INTO " + HISTORY_TABLE_NAME + " VALUES (?, ?, ?, ?, ?)", new Object[] { e.getName(), System.currentTimeMillis(), null, e.getCount()}); //$NON-NLS-1$ //$NON-NLS-2$ "INSERT INTO " + HISTORY_TABLE_NAME + " VALUES (?, ?)", new Object[] { e.getName(), e.getCount()}); //$NON-NLS-1$ //$NON-NLS-2$
} finally { } finally {
db.close(); db.close();
} }
@ -129,17 +124,38 @@ public class DownloadFrequencyHelper {
return false; return false;
} }
public long getCount(String name) {
SQLiteAPI.SQLiteConnection db = openConnection(true);
long count = 0;
if(db != null){
try {
SQLiteAPI.SQLiteCursor query = db.rawQuery(
"SELECT " + HISTORY_COL_COUNT + " FROM " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
HISTORY_TABLE_NAME + " WHERE " + HISTORY_COL_NAME + "='" + name + "'", null); //$NON-NLS-1$//$NON-NLS-2$
if (query.moveToFirst()) {
do {
count = query.getInt(0);
} while (query.moveToNext());
}
query.close();
} finally {
db.close();
}
}
return count;
}
public List<HistoryEntry> getEntries(){ public List<HistoryEntry> getEntries(){
List<HistoryEntry> entries = new ArrayList<HistoryEntry>(); List<HistoryEntry> entries = new ArrayList<HistoryEntry>();
SQLiteAPI.SQLiteConnection db = openConnection(true); SQLiteAPI.SQLiteConnection db = openConnection(true);
if(db != null){ if(db != null){
try { try {
SQLiteAPI.SQLiteCursor query = db.rawQuery( SQLiteAPI.SQLiteCursor query = db.rawQuery(
"SELECT " + HISTORY_COL_NAME + ", " + HISTORY_COL_LAT + "," + HISTORY_COL_LON + " FROM " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ "SELECT " + HISTORY_COL_NAME + " FROM " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
HISTORY_TABLE_NAME + " ORDER BY " + HISTORY_COL_TIME + " DESC", null); //$NON-NLS-1$//$NON-NLS-2$ HISTORY_TABLE_NAME + " ORDER BY " + HISTORY_COL_COUNT + " DESC", null); //$NON-NLS-1$//$NON-NLS-2$
if (query.moveToFirst()) { if (query.moveToFirst()) {
do { do {
HistoryEntry e = new HistoryEntry((int)query.getInt(1), query.getString(0)); HistoryEntry e = new HistoryEntry(query.getString(0), query.getInt(1));
entries.add(e); entries.add(e);
} while (query.moveToNext()); } while (query.moveToNext());
} }