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 2018-09-11 14:27:51 +02:00
commit 018a5f5e43
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java
View file

@ -99,7 +99,7 @@ public class SourceNSClientPlugin extends PluginBase implements BgSourceInterfac
public void detectSource(String source, long timeStamp) { public void detectSource(String source, long timeStamp) {
if (timeStamp > lastBGTimeStamp) { if (timeStamp > lastBGTimeStamp) {
if (source.contains("G5 Native") || source.contains("AndroidAPS-DexcomG5")) if (source.contains("G5 Native") || source.contains("G6 Native") || source.contains("AndroidAPS-DexcomG5"))
isAdvancedFilteringEnabled = true; isAdvancedFilteringEnabled = true;
else else
isAdvancedFilteringEnabled = false; isAdvancedFilteringEnabled = false;

2
app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java
View file

@ -145,6 +145,8 @@ public class TreatmentsBolusFragment extends SubscriberFragment implements View.
@Override @Override
public void onClick(View v) { public void onClick(View v) {
final Treatment treatment = (Treatment) v.getTag(); final Treatment treatment = (Treatment) v.getTag();
if (treatment == null)
return;
switch (v.getId()) { switch (v.getId()) {
case R.id.treatments_remove: case R.id.treatments_remove:
AlertDialog.Builder builder = new AlertDialog.Builder(context); AlertDialog.Builder builder = new AlertDialog.Builder(context);