diff options
| author | Roy <roy.mail.net@gmail.com> | 2017-12-26 21:16:15 +0200 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2017-12-26 21:16:15 +0200 |
| commit | 2ea2bb5bcd96045f1bd6cb4c3d8b8416dbaa05dc (patch) | |
| tree | a21ff27fff08876e835df82c5242def1f0d09c17 /Software/Android_Studio/Tango.DAL/src/main/java | |
| parent | 6450fc175114a6f8d0b75cb21386d1bb0c902711 (diff) | |
| download | Tango-2ea2bb5bcd96045f1bd6cb4c3d8b8416dbaa05dc.tar.gz Tango-2ea2bb5bcd96045f1bd6cb4c3d8b8416dbaa05dc.zip | |
MERGE
Diffstat (limited to 'Software/Android_Studio/Tango.DAL/src/main/java')
| -rw-r--r-- | Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java | 4 | ||||
| -rw-r--r-- | Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java index 165d0f161..548b1dd09 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java @@ -21,14 +21,14 @@ public class DateConverter extends TypeConverter<String,DateTime> @Override public String getDBValue(DateTime model) { - DateTimeFormatter dtfOut = DateTimeFormat.forPattern("yyyy-MM-dd hh:mm:ss"); + DateTimeFormatter dtfOut = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS"); return dtfOut.print(model); } @Override public DateTime getModelValue(String data) { - DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyy-MM-dd hh:mm:ss"); + DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS"); DateTime jodatime = dtf.parseDateTime(data); return jodatime; } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java index 367cbc088..53bb6a8e2 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/TangoDB.java @@ -37,7 +37,7 @@ public class TangoDB { database_name = "Tango.db"; database_path = ContextHelper.getApplicationContext().getDatabasePath(database_name).getPath(); - database_backup_path = Environment.getExternalStorageDirectory() + "/BACKUP/" + "backup.db"; + database_backup_path = ContextHelper.getApplicationContext().getDatabasePath("backup").getPath(); try { |