Skip to content
Snippets Groups Projects
Unverified Commit cbe0f32d authored by Johannes Mockenhaupt's avatar Johannes Mockenhaupt
Browse files

Dead code be gone.

parent fa732ff8
No related branches found
No related tags found
No related merge requests found
...@@ -70,7 +70,6 @@ import info.nightscout.android.USB.UsbHidDriver; ...@@ -70,7 +70,6 @@ import info.nightscout.android.USB.UsbHidDriver;
import info.nightscout.android.eula.Eula; import info.nightscout.android.eula.Eula;
import info.nightscout.android.eula.Eula.OnEulaAgreedTo; import info.nightscout.android.eula.Eula.OnEulaAgreedTo;
import info.nightscout.android.medtronic.service.MedtronicCnlAlarmManager; import info.nightscout.android.medtronic.service.MedtronicCnlAlarmManager;
import info.nightscout.android.medtronic.service.MedtronicCnlAlarmReceiver;
import info.nightscout.android.medtronic.service.MedtronicCnlIntentService; import info.nightscout.android.medtronic.service.MedtronicCnlIntentService;
import info.nightscout.android.model.medtronicNg.PumpInfo; import info.nightscout.android.model.medtronicNg.PumpInfo;
import info.nightscout.android.model.medtronicNg.PumpStatusEvent; import info.nightscout.android.model.medtronicNg.PumpStatusEvent;
...@@ -93,7 +92,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc ...@@ -93,7 +92,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
private int chartZoom = 3; private int chartZoom = 3;
private boolean hasZoomedChart = false; private boolean hasZoomedChart = false;
private NumberFormat sgvFormatter;
private boolean mEnableCgmService = true; private boolean mEnableCgmService = true;
private SharedPreferences prefs = null; private SharedPreferences prefs = null;
...@@ -104,7 +102,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc ...@@ -104,7 +102,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
private Runnable mUiRefreshRunnable = new RefreshDisplayRunnable(); private Runnable mUiRefreshRunnable = new RefreshDisplayRunnable();
private Realm mRealm; private Realm mRealm;
private StatusMessageReceiver statusMessageReceiver = new StatusMessageReceiver(); private StatusMessageReceiver statusMessageReceiver = new StatusMessageReceiver();
private MedtronicCnlAlarmReceiver medtronicCnlAlarmReceiver = new MedtronicCnlAlarmReceiver();
/** /**
* calculate the next poll timestamp based on last svg event * calculate the next poll timestamp based on last svg event
...@@ -168,15 +165,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc ...@@ -168,15 +165,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
configurationStore.setMmolxl(prefs.getBoolean("mmolxl", false)); configurationStore.setMmolxl(prefs.getBoolean("mmolxl", false));
configurationStore.setMmolxlDecimals(prefs.getBoolean("mmolDecimals", false)); configurationStore.setMmolxlDecimals(prefs.getBoolean("mmolDecimals", false));
if (configurationStore.isMmolxl()) {
if (configurationStore.isMmolxlDecimals())
sgvFormatter = new DecimalFormat("0.00");
else
sgvFormatter = new DecimalFormat("0.0");
} else {
sgvFormatter = new DecimalFormat("0");
}
// Disable battery optimization to avoid missing values on 6.0+ // Disable battery optimization to avoid missing values on 6.0+
// taken from https://github.com/NightscoutFoundation/xDrip/blob/master/app/src/main/java/com/eveningoutpost/dexdrip/Home.java#L277L298 // taken from https://github.com/NightscoutFoundation/xDrip/blob/master/app/src/main/java/com/eveningoutpost/dexdrip/Home.java#L277L298
...@@ -560,14 +548,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc ...@@ -560,14 +548,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
} else if (key.equals("mmolxl") || key.equals("mmolDecimals")) { } else if (key.equals("mmolxl") || key.equals("mmolDecimals")) {
configurationStore.setMmolxl(sharedPreferences.getBoolean("mmolxl", false)); configurationStore.setMmolxl(sharedPreferences.getBoolean("mmolxl", false));
configurationStore.setMmolxlDecimals(sharedPreferences.getBoolean("mmolDecimals", false)); configurationStore.setMmolxlDecimals(sharedPreferences.getBoolean("mmolDecimals", false));
if (configurationStore.isMmolxl()) {
if (configurationStore.isMmolxlDecimals())
sgvFormatter = new DecimalFormat("0.00");
else
sgvFormatter = new DecimalFormat("0.0");
} else {
sgvFormatter = new DecimalFormat("0");
}
refreshDisplay(); refreshDisplay();
} else if (key.equals("pollInterval")) { } else if (key.equals("pollInterval")) {
configurationStore.setPollInterval(Long.parseLong(sharedPreferences.getString("pollInterval", configurationStore.setPollInterval(Long.parseLong(sharedPreferences.getString("pollInterval",
......
...@@ -16,11 +16,10 @@ import info.nightscout.android.utils.ConfigurationStore; ...@@ -16,11 +16,10 @@ import info.nightscout.android.utils.ConfigurationStore;
*/ */
public class MedtronicCnlAlarmManager { public class MedtronicCnlAlarmManager {
private static final String TAG = MedtronicCnlAlarmManager.class.getSimpleName(); private static final String TAG = MedtronicCnlAlarmManager.class.getSimpleName();
private static final int ALARM_ID = 102; // Alarm id private static final int ALARM_ID = 102;
private static PendingIntent pendingIntent = null; private static PendingIntent pendingIntent = null;
private static AlarmManager alarmManager = null; private static AlarmManager alarmManager = null;
private static long nextAlarm = Long.MAX_VALUE;
public static void setContext(Context context) { public static void setContext(Context context) {
cancelAlarm(); cancelAlarm();
...@@ -30,11 +29,6 @@ public class MedtronicCnlAlarmManager { ...@@ -30,11 +29,6 @@ public class MedtronicCnlAlarmManager {
pendingIntent = PendingIntent.getBroadcast(context, ALARM_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT); pendingIntent = PendingIntent.getBroadcast(context, ALARM_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
} }
// Setting the alarm in 15 seconds from now
public static void setAlarm() {
setAlarm(System.currentTimeMillis());
}
/** /**
* set the alarm in the future * set the alarm in the future
* *
...@@ -44,7 +38,7 @@ public class MedtronicCnlAlarmManager { ...@@ -44,7 +38,7 @@ public class MedtronicCnlAlarmManager {
setAlarm(System.currentTimeMillis() + inFuture); setAlarm(System.currentTimeMillis() + inFuture);
} }
// Setting the alarm to call onRecieve // Setting the alarm to call onReceive
public static void setAlarm(long millis) { public static void setAlarm(long millis) {
if (alarmManager == null || pendingIntent == null) if (alarmManager == null || pendingIntent == null)
return; return;
...@@ -56,21 +50,14 @@ public class MedtronicCnlAlarmManager { ...@@ -56,21 +50,14 @@ public class MedtronicCnlAlarmManager {
if (millis < now) if (millis < now)
millis = now; millis = now;
// only accept alarm nearer than the last one
//if (nextAlarm < millis && nextAlarm > now) {
// return;
//}
cancelAlarm(); cancelAlarm();
nextAlarm = millis;
Log.d(TAG, "Alarm set to fire at " + new Date(millis)); Log.d(TAG, "Alarm set to fire at " + new Date(millis));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
alarmManager.setAlarmClock(new AlarmManager.AlarmClockInfo(millis, null), pendingIntent); alarmManager.setAlarmClock(new AlarmManager.AlarmClockInfo(millis, null), pendingIntent);
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
// Android 5.0.0 + 5.0.1 (e.g. Galaxy S4) has a bug. // Android 5.0.0 + 5.0.1 (e.g. Galaxy S4) has a bug.
// Alarms are not exact. Fixed in 5.0.2 oder CM12 // Alarms are not exact. Fixed in 5.0.2 and CM12
alarmManager.setExact(AlarmManager.RTC_WAKEUP, millis, pendingIntent); alarmManager.setExact(AlarmManager.RTC_WAKEUP, millis, pendingIntent);
} else { } else {
alarmManager.set(AlarmManager.RTC_WAKEUP, millis, pendingIntent); alarmManager.set(AlarmManager.RTC_WAKEUP, millis, pendingIntent);
......
...@@ -39,7 +39,6 @@ import info.nightscout.android.utils.ConfigurationStore; ...@@ -39,7 +39,6 @@ import info.nightscout.android.utils.ConfigurationStore;
import info.nightscout.android.utils.DataStore; import info.nightscout.android.utils.DataStore;
import info.nightscout.android.xdrip_plus.XDripPlusUploadReceiver; import info.nightscout.android.xdrip_plus.XDripPlusUploadReceiver;
import io.realm.Realm; import io.realm.Realm;
import io.realm.RealmResults;
public class MedtronicCnlIntentService extends IntentService { public class MedtronicCnlIntentService extends IntentService {
public final static int USB_VID = 0x1a79; public final static int USB_VID = 0x1a79;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment