caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fix column type.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2018-06-23 00:28:34 +02:00
parent aab171932c
commit 53b9d5cae3
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,7 +122,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
createRowIfNotExists(getDaoBgReadings(), DatabaseHelper.DATABASE_BGREADINGS, createRowIfNotExists(getDaoBgReadings(), DatabaseHelper.DATABASE_BGREADINGS,
"filtered", "integer"); "filtered", "integer");
createRowIfNotExists(getDaoBgReadings(), DatabaseHelper.DATABASE_BGREADINGS, createRowIfNotExists(getDaoBgReadings(), DatabaseHelper.DATABASE_BGREADINGS,
"sourcePlugin", "integer"); "sourcePlugin", "text");
} catch (SQLException e) { } catch (SQLException e) {
log.error("Can't create database", e); log.error("Can't create database", e);
@ -132,7 +132,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
private void createRowIfNotExists(Dao dao, String table, String name, String type) { private void createRowIfNotExists(Dao dao, String table, String name, String type) {
try { try {
dao.executeRaw("ALTER TABLE `" + table + "` ADD CoLUMN `" + name + " " + type); dao.executeRaw("ALTER TABLE `" + table + "` ADD COLUMN `" + name + " " + type);
} catch (SQLException e) { } catch (SQLException e) {
// row already exists // row already exists
} }

2
app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
View file

@ -180,7 +180,7 @@ public class CommandQueue {
if (type == Command.CommandType.SMB_BOLUS) { if (type == Command.CommandType.SMB_BOLUS) {
if (isRunning(Command.CommandType.BOLUS) || bolusInQueue()) { if (isRunning(Command.CommandType.BOLUS) || bolusInQueue()) {
log.debug("Rejecting SMB since a bolus is queue/running"); log.debug("Rejecting SMB since a bolus is queued/running");
return false; return false;
} }
if (detailedBolusInfo.lastKnownBolusTime < TreatmentsPlugin.getPlugin().getLastBolusTime()) { if (detailedBolusInfo.lastKnownBolusTime < TreatmentsPlugin.getPlugin().getLastBolusTime()) {