caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into koreandanar

Browse source
This commit is contained in:
Milos Kozak 2016-12-08 14:29:38 +01:00
commit 0044b8b41a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
View file

@ -196,8 +196,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
QueryBuilder<BgReading, Long> queryBuilder = daoBgreadings.queryBuilder(); QueryBuilder<BgReading, Long> queryBuilder = daoBgreadings.queryBuilder();
queryBuilder.orderBy("timeIndex", true); queryBuilder.orderBy("timeIndex", true);
Where where = queryBuilder.where(); Where where = queryBuilder.where();
where.ge("timeIndex", mills); where.ge("timeIndex", mills).and().gt("value", 38);
queryBuilder.where().gt("value", 38);
PreparedQuery<BgReading> preparedQuery = queryBuilder.prepare(); PreparedQuery<BgReading> preparedQuery = queryBuilder.prepare();
bgReadings = daoBgreadings.query(preparedQuery); bgReadings = daoBgreadings.query(preparedQuery);
return bgReadings; return bgReadings;

1
app/src/main/java/info/nightscout/androidaps/plugins/Overview/NotificationStore.java
View file

@ -54,6 +54,7 @@ public class NotificationStore {
Notification n = get(i); Notification n = get(i);
if (n.validTo.getTime() != 0 && n.validTo.getTime() < new Date().getTime()) { if (n.validTo.getTime() != 0 && n.validTo.getTime() < new Date().getTime()) {
store.remove(i); store.remove(i);
i--;
} }
} }
} }