From 8f8ef8f9807dfdd927a2361d7f77a7f7672121b1 Mon Sep 17 00:00:00 2001
From: Pogman <subaziro@gmail.com>
Date: Sun, 5 Mar 2017 16:37:59 +0000
Subject: [PATCH] fix conflict
---
.../android/medtronic/MainActivity.java | 27 ++++++++++---------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
index bc72349..8b29316 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
@@ -114,19 +114,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
private StatusMessageReceiver statusMessageReceiver = new StatusMessageReceiver();
private MedtronicCnlAlarmReceiver medtronicCnlAlarmReceiver = new MedtronicCnlAlarmReceiver();
- public static String strFormatSGV(float sgvValue) {
- if (mmolxl) {
- NumberFormat sgvFormatter;
- if (mmolxlDecimals)
- sgvFormatter = new DecimalFormat("0.00");
- else
- sgvFormatter = new DecimalFormat("0.0");
- return sgvFormatter.format(sgvValue / MMOLXLFACTOR);
- } else {
- return String.valueOf(sgvValue);
- }
- }
-
public static long getNextPoll(PumpStatusEvent pumpStatusData) {
long nextPoll = pumpStatusData.getEventDate().getTime() + pumpStatusData.getPumpTimeOffset()
+ MedtronicCnlIntentService.POLL_GRACE_PERIOD_MS;
@@ -143,6 +130,20 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
return nextPoll;
}
+ public static String strFormatSGV(float sgvValue) {
+ if (mmolxl) {
+ NumberFormat sgvFormatter;
+ if (mmolxlDecimals) {
+ sgvFormatter = new DecimalFormat("0.00");
+ } else {
+ sgvFormatter = new DecimalFormat("0.0");
+ }
+ return sgvFormatter.format(sgvValue / MMOLXLFACTOR);
+ } else {
+ return String.valueOf(sgvValue);
+ }
+ }
+
@Override
public void onCreate(Bundle savedInstanceState) {
Log.i(TAG, "onCreate called");
--
GitLab