caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix NPE

Browse source
This commit is contained in:
Milos Kozak 2020-07-21 22:14:46 +02:00
parent 2a8f9bd7d3
commit 74ca36bb6e
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
View file

@ -63,31 +63,31 @@ class MaintenancePlugin @Inject constructor(
} }
//todo replace this with a call on startup of the application, specifically to remove //todo replace this with a call on startup of the application, specifically to remove
// unnecessary garbage from the log exports // unnecessary garbage from the log exports
fun deleteLogs() { fun deleteLogs() {
val logDirectory = LoggerUtils.getLogDirectory() LoggerUtils.getLogDirectory()?.let { logDirectory ->
val logDir = File(logDirectory) val logDir = File(logDirectory)
val files = logDir.listFiles { _: File?, name: String -> val files = logDir.listFiles { _: File?, name: String ->
(name.startsWith("AndroidAPS") (name.startsWith("AndroidAPS") && name.endsWith(".zip"))
&& name.endsWith(".zip"))
}
Arrays.sort(files) { f1: File, f2: File -> f1.name.compareTo(f2.name) }
var delFiles = listOf(*files)
val amount = sp.getInt(R.string.key_logshipper_amount, 2)
val keepIndex = amount - 1
if (keepIndex < delFiles.size) {
delFiles = delFiles.subList(keepIndex, delFiles.size)
for (file in delFiles) {
file.delete()
} }
} Arrays.sort(files) { f1: File, f2: File -> f1.name.compareTo(f2.name) }
val exportDir = File(logDirectory, "exports") var delFiles = listOf(*files)
if (exportDir.exists()) { val amount = sp.getInt(R.string.key_logshipper_amount, 2)
val expFiles = exportDir.listFiles() val keepIndex = amount - 1
for (file in expFiles) { if (keepIndex < delFiles.size) {
file.delete() delFiles = delFiles.subList(keepIndex, delFiles.size)
for (file in delFiles) {
file.delete()
}
}
val exportDir = File(logDirectory, "exports")
if (exportDir.exists()) {
val expFiles = exportDir.listFiles()
for (file in expFiles) {
file.delete()
}
exportDir.delete()
} }
exportDir.delete()
} }
} }

1
core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
View file

@ -88,6 +88,7 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
} }
public CareportalEvent(NSMbg mbg) { public CareportalEvent(NSMbg mbg) {
this();
date = mbg.date; date = mbg.date;
eventType = MBG; eventType = MBG;
json = mbg.json; json = mbg.json;