From 982a57d7204d71ce8a0152a404757ab7bfba3947 Mon Sep 17 00:00:00 2001
From: Volker Richert <v.richert@addmore.de>
Date: Tue, 29 Nov 2016 13:30:55 +0100
Subject: [PATCH] remove optional setting
---
.../android/medtronic/MainActivity.java | 3 +-
app/src/main/res/xml-v23/preferences.xml | 97 -------------------
2 files changed, 1 insertion(+), 99 deletions(-)
delete mode 100644 app/src/main/res/xml-v23/preferences.xml
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 fa3d8d1..a9d4b1f 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
@@ -118,8 +118,7 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
final String packageName = getPackageName();
//Log.d(TAG, "Maybe ignoring battery optimization");
final PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
- if (!pm.isIgnoringBatteryOptimizations(packageName) &&
- !prefs.getBoolean("requested_ignore_battery_optimizations", false)) {
+ if (!pm.isIgnoringBatteryOptimizations(packageName)) {
Log.d(TAG, "Requesting ignore battery optimization");
try {
// ignoring battery optimizations required for constant connection
diff --git a/app/src/main/res/xml-v23/preferences.xml b/app/src/main/res/xml-v23/preferences.xml
deleted file mode 100644
index 5dd0972..0000000
--- a/app/src/main/res/xml-v23/preferences.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory android:title="Monitor">
- <info.nightscout.android.utils.CustomSwitchPreference
- android:disableDependentsState="false"
- android:key="mmolxl"
- android:summaryOff="Values are shown and set in mg/dL"
- android:summaryOn="Values are shown and set in mmol/L"
- android:switchTextOff="mg/dL"
- android:switchTextOn="mmol/L"
- android:title="BG Unit"/>
- <info.nightscout.android.utils.CustomSwitchPreference
- android:defaultValue="false"
- android:dependency="mmolxl"
- android:key="mmolDecimals"
- android:summaryOff="1 decimal value will be shown"
- android:summaryOn="2 decimal values will be shown"
- android:switchTextOff="1"
- android:switchTextOn="2"
- android:title="Decimals"/>
- </PreferenceCategory>
- <PreferenceCategory android:title="Device setting">
- <info.nightscout.android.utils.CustomSwitchPreference
- android:disableDependentsState="false"
- android:key="requested_ignore_battery_optimizations"
- android:summaryOff="Request to ignore battery optimization"
- android:summaryOn="Don't request to ignore battery optimization"
- android:switchTextOff="off"
- android:switchTextOn="on"
- android:title="Disable to ignore battery optimization"/>
- </PreferenceCategory>
- <PreferenceCategory android:title="Sharing">
- <CheckBoxPreference
- android:disableDependentsState="false"
- android:key="@string/preference_enable_rest_upload"
- android:summary="Enable upload of data to Nightscout"
- android:title="REST API Upload"/>
- <EditTextPreference
- android:defaultValue="https://YOUR.NIGHTSCOUT.SITE"
- android:dependency="@string/preference_enable_rest_upload"
- android:dialogMessage="The hostname of your Nightscout site"
- android:dialogTitle="Enter Nightscout URL"
- android:key="@string/preference_nightscout_url"
- android:title="Nightscout URL"/>
- <info.nightscout.android.utils.ValidatingEditTextPreference
- android:defaultValue="YOURAPISECRET"
- android:dependency="@string/preference_enable_rest_upload"
- android:dialogMessage="Your Nightscout API secret"
- android:dialogTitle="Enter your Nightscout API secret"
- android:key="@string/preference_api_secret"
- android:title="API Secret"/>
- <CheckBoxPreference
- android:key="@string/preference_enable_xdrip_plus"
- android:summary="Enable local broadcast of data to xDrip+"
- android:title="Send to xDrip+"/>
- </PreferenceCategory>
- <PreferenceCategory android:title="Disclaimer">
- <SwitchPreference
- android:disableDependentsState="false"
- android:key="@string/preference_eula_accepted"
- android:summaryOff="Nightscout should not be used to make medical decisions. There is no support or any warranty of any kind. The quality and performance of the project is with you. This is a project that was created and is supported completely by volunteers"
- android:summaryOn="Nightscout should not be used to make medical decisions. There is no support or any warranty of any kind. The quality and performance of the project is with you. This is a project that was created and is supported completely by volunteers"
- android:switchTextOff="NO"
- android:switchTextOn="YES"
- android:title="I UNDERSTAND"/>
- </PreferenceCategory>
- <PreferenceCategory android:title="App Version">
- <Preference
- android:key="version"
- android:title="@string/versionName" />
- </PreferenceCategory>
- <PreferenceCategory android:title="Debug">
- <SwitchPreference
- android:defaultValue="true"
- android:key="@string/preferences_enable_crashlytics"
- android:summary="Send crash errors to developer"
- android:title="Crash Reporting" />
- <SwitchPreference
- android:defaultValue="true"
- android:key="@string/preferences_enable_answers"
- android:summary="Sends usage data to the developer to help develop a better app."
- android:title="Share usage data" />
- <SwitchPreference
- android:defaultValue="false"
- android:key="@string/preferences_enable_remote_logcat"
- android:summary="Allow the developer to debug your app. Only enable if asked to by the support team."
- android:title="Remote Debugging" />
- <ListPreference
- android:defaultValue="1"
- android:disableDependentsState="false"
- android:entries="@array/levelList"
- android:entryValues="@array/calib_types_values"
- android:key="logLevel"
- android:summary="Select item from array"
- android:title="Logging Level" />
- </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
--
GitLab