nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure to always close the database

This commit is contained in:
cpfeiffer 2015-06-04 23:45:46 +02:00
parent 7ad38c5e1a
commit 2f1908e480
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/ActivityDatabaseHandler.java
View File

@ -51,54 +51,53 @@ public class ActivityDatabaseHandler extends SQLiteOpenHelper {
public void addGBActivitySample(GBActivitySample GBActivitySample) { public void addGBActivitySample(GBActivitySample GBActivitySample) {
SQLiteDatabase db = this.getWritableDatabase(); try (SQLiteDatabase db = this.getWritableDatabase()) {
ContentValues values = new ContentValues();
values.put(KEY_TIMESTAMP, GBActivitySample.getTimestamp());
values.put(KEY_PROVIDER, GBActivitySample.getProvider());
values.put(KEY_INTENSITY, GBActivitySample.getIntensity());
values.put(KEY_STEPS, GBActivitySample.getSteps());
values.put(KEY_TYPE, GBActivitySample.getType());
ContentValues values = new ContentValues(); db.insert(TABLE_GBACTIVITYSAMPLES, null, values);
values.put(KEY_TIMESTAMP, GBActivitySample.getTimestamp()); }
values.put(KEY_PROVIDER, GBActivitySample.getProvider());
values.put(KEY_INTENSITY, GBActivitySample.getIntensity());
values.put(KEY_STEPS, GBActivitySample.getSteps());
values.put(KEY_TYPE, GBActivitySample.getType());
db.insert(TABLE_GBACTIVITYSAMPLES, null, values);
db.close();
} }
public void addGBActivitySample(int timestamp, byte provider, short intensity, byte steps, byte type) { public void addGBActivitySample(int timestamp, byte provider, short intensity, byte steps, byte type) {
SQLiteDatabase db = this.getWritableDatabase(); try (SQLiteDatabase db = this.getWritableDatabase()) {
ContentValues values = new ContentValues();
values.put(KEY_TIMESTAMP, timestamp);
values.put(KEY_PROVIDER, provider);
values.put(KEY_INTENSITY, intensity);
values.put(KEY_STEPS, steps);
values.put(KEY_TYPE, type);
ContentValues values = new ContentValues(); db.insert(TABLE_GBACTIVITYSAMPLES, null, values);
values.put(KEY_TIMESTAMP, timestamp); }
values.put(KEY_PROVIDER, provider);
values.put(KEY_INTENSITY, intensity);
values.put(KEY_STEPS, steps);
values.put(KEY_TYPE, type);
db.insert(TABLE_GBACTIVITYSAMPLES, null, values);
db.close();
} }
public ArrayList<GBActivitySample> getGBActivitySamples(int timestamp_from, int timestamp_to, byte provider) { public ArrayList<GBActivitySample> getGBActivitySamples(int timestamp_from, int timestamp_to, byte provider) {
if (timestamp_to == -1) { if (timestamp_to == -1) {
timestamp_to = 2147483647; // dont know what happens when I use more than max of a signed int timestamp_to = Integer.MAX_VALUE; // dont know what happens when I use more than max of a signed int
} }
ArrayList<GBActivitySample> GBActivitySampleList = new ArrayList<GBActivitySample>(); ArrayList<GBActivitySample> GBActivitySampleList = new ArrayList<GBActivitySample>();
String selectQuery = "SELECT * FROM " + TABLE_GBACTIVITYSAMPLES String selectQuery = "SELECT * FROM " + TABLE_GBACTIVITYSAMPLES
+ " where (provider=" + provider + " and timestamp>=" + timestamp_from + " and timestamp<=" + timestamp_to + ") order by timestamp"; + " where (provider=" + provider + " and timestamp>=" + timestamp_from + " and timestamp<=" + timestamp_to + ") order by timestamp";
SQLiteDatabase db = this.getWritableDatabase(); try (SQLiteDatabase db = this.getWritableDatabase()) {
Cursor cursor = db.rawQuery(selectQuery, null); Cursor cursor = db.rawQuery(selectQuery, null);
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
do { do {
GBActivitySample GBActivitySample = new GBActivitySample( GBActivitySample GBActivitySample = new GBActivitySample(
cursor.getInt(cursor.getColumnIndex(KEY_TIMESTAMP)), cursor.getInt(cursor.getColumnIndex(KEY_TIMESTAMP)),
(byte) cursor.getInt(cursor.getColumnIndex(KEY_PROVIDER)), (byte) cursor.getInt(cursor.getColumnIndex(KEY_PROVIDER)),
(short) cursor.getInt(cursor.getColumnIndex(KEY_INTENSITY)), (short) cursor.getInt(cursor.getColumnIndex(KEY_INTENSITY)),
(byte) cursor.getInt(cursor.getColumnIndex(KEY_STEPS)), (byte) cursor.getInt(cursor.getColumnIndex(KEY_STEPS)),
(byte) cursor.getInt(cursor.getColumnIndex(KEY_TYPE))); (byte) cursor.getInt(cursor.getColumnIndex(KEY_TYPE)));
GBActivitySampleList.add(GBActivitySample); GBActivitySampleList.add(GBActivitySample);
} while (cursor.moveToNext()); } while (cursor.moveToNext());
}
} }
return GBActivitySampleList; return GBActivitySampleList;