caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev

Browse source
This commit is contained in:
Milos Kozak 2020-07-24 07:48:00 +02:00
parent 0a6cd80257 4ef40c70c5
commit f9806162e1
5 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,6 +1,6 @@
# AndroidAPS # AndroidAPS
* Check the wiki: http://wiki.androidaps.org * Check the wiki: https://androidaps.readthedocs.io
* Everyone who’s been looping with AndroidAPS needs to fill out the form after 3 days of looping https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1 * Everyone who’s been looping with AndroidAPS needs to fill out the form after 3 days of looping https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1
[![Gitter](https://badges.gitter.im/MilosKozak/AndroidAPS.svg)](https://gitter.im/MilosKozak/AndroidAPS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Gitter](https://badges.gitter.im/MilosKozak/AndroidAPS.svg)](https://gitter.im/MilosKozak/AndroidAPS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

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

@ -65,11 +65,10 @@ 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) } Arrays.sort(files) { f1: File, f2: File -> f1.name.compareTo(f2.name) }
var delFiles = listOf(*files) var delFiles = listOf(*files)
@ -90,6 +89,7 @@ class MaintenancePlugin @Inject constructor(
exportDir.delete() exportDir.delete()
} }
} }
}
/** /**
* returns a list of log files. The number of returned logs is given via the amount * returns a list of log files. The number of returned logs is given via the amount

3
app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
View file

@ -20,8 +20,7 @@ abstract class AbstractSensitivityPlugin(
pluginDescription: PluginDescription, pluginDescription: PluginDescription,
injector: HasAndroidInjector, injector: HasAndroidInjector,
aapsLogger: AAPSLogger, aapsLogger: AAPSLogger,
resourceHelper: resourceHelper: ResourceHelper,
ResourceHelper,
val sp: SP val sp: SP
) : PluginBase(pluginDescription, aapsLogger, resourceHelper, injector), SensitivityInterface { ) : PluginBase(pluginDescription, aapsLogger, resourceHelper, injector), SensitivityInterface {

6
app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
View file

@ -36,7 +36,6 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
@Singleton @Singleton
public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin { public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
private SP sp;
private ProfileFunction profileFunction; private ProfileFunction profileFunction;
private DateUtil dateUtil; private DateUtil dateUtil;
@ -57,7 +56,6 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
.description(R.string.description_sensitivity_aaps), .description(R.string.description_sensitivity_aaps),
injector, aapsLogger, resourceHelper, sp injector, aapsLogger, resourceHelper, sp
); );
this.sp = sp;
this.profileFunction = profileFunction; this.profileFunction = profileFunction;
this.dateUtil = dateUtil; this.dateUtil = dateUtil;
} }
@ -66,12 +64,12 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
public AutosensResult detectSensitivity(IobCobCalculatorInterface iobCobCalculatorPlugin, long fromTime, long toTime) { public AutosensResult detectSensitivity(IobCobCalculatorInterface iobCobCalculatorPlugin, long fromTime, long toTime) {
LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable(); LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
String age = sp.getString(R.string.key_age, ""); String age = getSp().getString(R.string.key_age, "");
int defaultHours = 24; int defaultHours = 24;
if (age.equals(getResourceHelper().gs(R.string.key_adult))) defaultHours = 24; if (age.equals(getResourceHelper().gs(R.string.key_adult))) defaultHours = 24;
if (age.equals(getResourceHelper().gs(R.string.key_teenage))) defaultHours = 4; if (age.equals(getResourceHelper().gs(R.string.key_teenage))) defaultHours = 4;
if (age.equals(getResourceHelper().gs(R.string.key_child))) defaultHours = 4; if (age.equals(getResourceHelper().gs(R.string.key_child))) defaultHours = 4;
int hoursForDetection = sp.getInt(R.string.key_openapsama_autosens_period, defaultHours); int hoursForDetection = getSp().getInt(R.string.key_openapsama_autosens_period, defaultHours);
Profile profile = profileFunction.getProfile(); Profile profile = profileFunction.getProfile();

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;