caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix merge conflict

Browse source
This commit is contained in:
Milos Kozak 2017-06-10 13:43:02 +02:00
commit e6f173f305
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
View file

@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.Overview;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.graphics.Color; import android.graphics.Color;
@ -605,6 +606,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
@Override @Override
public void run() { public void run() {
hideTempRecommendation(); hideTempRecommendation();
clearNotification();
PumpEnactResult applyResult = MainApp.getConfigBuilder().applyAPSRequest(finalLastRun.constraintsProcessed); PumpEnactResult applyResult = MainApp.getConfigBuilder().applyAPSRequest(finalLastRun.constraintsProcessed);
if (applyResult.enacted) { if (applyResult.enacted) {
finalLastRun.setByPump = applyResult; finalLastRun.setByPump = applyResult;
@ -838,6 +840,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
}); });
} }
private void clearNotification() {
NotificationManager notificationManager =
(NotificationManager) MainApp.instance().getSystemService(Context.NOTIFICATION_SERVICE);
notificationManager.cancel(Constants.notificationID);
}
private void updatePumpStatus(String status) { private void updatePumpStatus(String status) {
if (!status.equals("")) { if (!status.equals("")) {
pumpStatusView.setText(status); pumpStatusView.setText(status);
@ -1454,7 +1462,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
addSeriesWithoutInvalidate(new PointsWithLabelGraphSeries<>(bg), bgGraph); addSeriesWithoutInvalidate(new PointsWithLabelGraphSeries<>(bg), bgGraph);
} }
// Treatments // Treatments
List<DataPointWithLabelInterface> filteredTreatments = new ArrayList<>(); List<DataPointWithLabelInterface> filteredTreatments = new ArrayList<>();
List<Treatment> treatments = MainApp.getConfigBuilder().getTreatmentsFromHistory(); List<Treatment> treatments = MainApp.getConfigBuilder().getTreatmentsFromHistory();