Merge pull request #505 from jotomo/sync-to-pump

Remove sync to pump pref, always sync

app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java

@@ -149,10 +149,6 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
                 addPreferencesFromResourceIfEnabled(SensitivityWeightedAveragePlugin.getPlugin(), PluginBase.SENSITIVITY);
                 addPreferencesFromResourceIfEnabled(SensitivityOref0Plugin.getPlugin(), PluginBase.SENSITIVITY);
 
-                if (!Config.NSCLIENT && !Config.G5UPLOADER) {
-                    addPreferencesFromResource(R.xml.pref_profile);
-                }
-
                 if (Config.DANAR) {
                     addPreferencesFromResourceIfEnabled(DanaRPlugin.getPlugin(), PluginBase.PUMP);
                     addPreferencesFromResourceIfEnabled(DanaRKoreanPlugin.getPlugin(), PluginBase.PUMP);

app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java

@@ -182,9 +182,6 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
         if (timeshift < 0 || timeshift > 23) {
             msg += String.format(MainApp.sResources.getString(R.string.openapsma_valueoutofrange), "Profile-Timeshift") + "\n";
         }
-        if (!SP.getBoolean("syncprofiletopump", false)) {
-            msg += MainApp.sResources.getString(R.string.syncprofiletopump_title) + " " + MainApp.sResources.getString(R.string.cpp_sync_setting_missing) + "\n";
-        }
         final Profile profile = MainApp.getConfigBuilder().getProfile();
 
         if (profile == null || profile.getBasal() == null) {

app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java

@@ -120,7 +120,6 @@ public class NSProfilePlugin implements PluginBase, ProfileInterface {
         profile = new ProfileStore(newProfile.getData());
         storeNSProfile();
         MainApp.bus().post(new EventNSProfileUpdateGUI());
-        if (SP.getBoolean("syncprofiletopump", false)) {
         ConfigBuilderPlugin.getCommandQueue().setProfile(MainApp.getConfigBuilder().getProfile(), new Callback() {
             @Override
             public void run() {
@@ -133,7 +132,6 @@ public class NSProfilePlugin implements PluginBase, ProfileInterface {
             }
         });
     }
-    }
 
     private static void storeNSProfile() {
         SP.putString("profile", profile.getData().toString());

app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java

@@ -579,9 +579,6 @@ public class ActionStringHandler {
         if (timeshift < 0 || timeshift > 23) {
             msg += String.format(MainApp.sResources.getString(R.string.openapsma_valueoutofrange), "Profile-Timeshift") + "\n";
         }
-        if (!SP.getBoolean("syncprofiletopump", false)) {
-            msg += MainApp.sResources.getString(R.string.syncprofiletopump_title) + " " + MainApp.sResources.getString(R.string.cpp_sync_setting_missing) + "\n";
-        }
         final Profile profile = MainApp.getConfigBuilder().getProfile();
 
         if (profile == null || profile.getBasal() == null) {

app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java

@@ -59,7 +59,7 @@ public class KeepAliveReceiver extends BroadcastReceiver {
 
             LocalAlertUtils.checkPumpUnreachableAlarm(lastConnection, isStatusOutdated);
 
-            if (SP.getBoolean("syncprofiletopump", false) && !pump.isThisProfileSet(profile)) {
+            if (!pump.isThisProfileSet(profile)) {
                 MainApp.getConfigBuilder().getCommandQueue().setProfile(profile, null);
             } else if (isStatusOutdated && !pump.isBusy()) {
                 MainApp.getConfigBuilder().getCommandQueue().readStatus("KeepAlive. Status outdated.", null);

app/src/main/res/values-bg/strings.xml

@@ -212,7 +212,6 @@
     <string name="connecting">Свързване</string>
     <string name="connected">Свързана</string>
     <string name="disconnected">Не е сврзана</string>
-    <string name="syncprofiletopump_title">Синхронизирай помпата с профила</string>
     <string name="danar_pump_settings">DanaR настройки</string>
     <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">End User License Agreement</string>

app/src/main/res/values-cs/strings.xml

@@ -192,7 +192,6 @@
     <string name="disconnected">Odpojeno</string>
     <string name="danar_bt_name_title">DanaR Bluetooth zařízení</string>
     <string name="danar_pump_settings">DanaR nastavení</string>
-    <string name="syncprofiletopump_title">Synchronizovat profil do pumpy</string>
     <string name="nightscout">Nightscout</string>
     <string name="absolute">Absolutní</string>
     <string name="comment">Komentář</string>

app/src/main/res/values-de/strings.xml

@@ -226,7 +226,6 @@
     <string name="hoursago">vor h </string>
     <string name="smscommunicator">SMS Kommunikator</string>
     <string name="smscommunicator_allowednumbers">erlaubte Telefonnummern</string>
-    <string name="syncprofiletopump_title">Profil zur Pumpe synchronisieren</string>
     <string name="waitingforpumpresult">auf Pumpenergebnis warten</string>
     <string name="nobtadapter">Kein Bluetoothadapter gefunden</string>
     <string name="smscommunicator_remotebolusnotallowed">Remote Bolus ist nicht erlaubt</string>

app/src/main/res/values-es/strings.xml

@@ -201,7 +201,6 @@
     <string name="connecting">Conectando</string>
     <string name="connected">Conectado</string>
     <string name="disconnected">Desconectado</string>
-    <string name="syncprofiletopump_title">Sincronizar perfil a bomba</string>
     <string name="danar_pump_settings">Ajustes de la bomba DanaR</string>
     <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">Acuerdo de licencia de usuario final</string>

app/src/main/res/values-it/strings.xml

@@ -372,7 +372,6 @@
     <string name="suspendloopfor1h">Sospendi loop per 1h</string>
     <string name="suspendloopfor2h">Sospendi loop per 2h</string>
     <string name="suspendloopfor3h">Sospendi loop per 3h</string>
-    <string name="syncprofiletopump_title">Sincronizza profilo sul micro</string>
     <string name="target_range">Target range:</string>
     <string name="teenage">Adolescente</string>
     <string name="tempbasals_iob_label_string">IOB:</string>

app/src/main/res/values-ko/strings.xml

@@ -213,7 +213,6 @@
     <string name="connecting">연결중</string>
     <string name="connected">연결됨</string>
     <string name="disconnected">연결 끊김</string>
-    <string name="syncprofiletopump_title">프로파일을 펌프에 동기화하기</string>
     <string name="danar_pump_settings">다나R 펌프 설정</string>
     <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">최종 사용자 라이선스 동의서</string>

app/src/main/res/values-nl/strings.xml

@@ -626,7 +626,6 @@
     <string name="openapsama_bolussnooze_dia_divisor_summary">Standaard waarde: 2 Bolus snooze is actief nadat je een maaltijd bolus toegediend hebt, zodat de loop geen tegenvoorstel met een verlaagd tijdelijk basaal doet nadat je gegeten hebt. Het voorbeeld hier van van standaard 2; dus een 3 u DIA betekent dat de bolus snooze gemiddeld 1.5u actief is (3DIA/2).</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Standaard waarde: 4 Dit is een combinatie van enerzijds het OpenAPS veiligheid limieten en anderzijds van “3 x max dagelijks basaal ; 4x actueel”. Dit betekent dat het basaal niet hoger kan ingesteld worden dan het ingestelde nummer keer het actueel basaal waarbij de limiet in de pomp geen invloed heeft.Dit is een veiligheidsmaatregel om te vermijden dat patiënten in gevaarlijke laag bereik komen zonder te snappen hoe het algoritme werkt. Nogmaals de standaard waarde is 4x; de meeste zullen deze waarde nooit moeten aanpassen maar zullen eerder andere waardes moeten aanpassen als ze tegen een limiet aanstoten.</string>
     <string name="objectives_5_gate">Gedurende 1 week succesvol closed loop met KH ingave</string>
-    <string name="syncprofiletopump_title">Synchroniseer profiel met de pomp</string>
     <string name="careportal_activity_label">ACTIVITIJD &amp; FEEDBACK</string>
     <string name="danar_model" formatted="false">Model: %02X Protokoll: %02X Code: %02X</string>
     <string name="danar_history_connectingfor">Verbonden gedurende %d s</string>

app/src/main/res/values-ru/strings.xml

@@ -486,7 +486,6 @@
     <string name="suspendloopfor1h">приостановить цикл на 1 час</string>
     <string name="suspendloopfor2h">приостановить цикл на 2 часа</string>
     <string name="suspendloopfor3h">приостановить цикл на 3 часа</string>
-    <string name="syncprofiletopump_title">синхронизировать профиль с помпой</string>
     <string name="target_range">целевой диапазон</string>
     <string name="teenage">подросток</string>
     <string name="tempbasaldeliveryerror">ошибка доставки врем базала</string>

app/src/main/res/values-sv/strings.xml

@@ -362,7 +362,6 @@
     <string name="teenage">Tonåring</string>
     <string name="targetmissing">Mål saknas i profil. Använder grundinställning</string>
     <string name="target_range">Mål gränser:</string>
-    <string name="syncprofiletopump_title">Uppdatera profil till pump</string>
     <string name="suspendloopfor3h">Stäng av loop i 3 h</string>
     <string name="suspendloopfor2h">Stäng av loop i 2 h</string>
     <string name="suspendloopfor1h">Stäng av loop i 1 h</string>

app/src/main/res/values/strings.xml

@@ -223,7 +223,6 @@
     <string name="connecting">Connecting</string>
     <string name="connected">Connected</string>
     <string name="disconnected">Disconnected</string>
-    <string name="syncprofiletopump_title">Sync profile to pump</string>
     <string name="danar_pump_settings">DanaR pump settings</string>
     <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">End User License Agreement</string>

app/src/main/res/xml/pref_profile.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:key="profile"
-        android:title="@string/profile">
-
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="syncprofiletopump"
-            android:title="@string/syncprofiletopump_title" />
-    </PreferenceCategory>
-
-</PreferenceScreen>