Merge pull request #11 from MilosKozak/master

update from milos master

app/src/main/java/info/nightscout/androidaps/Services/DataService.java

@@ -39,6 +39,7 @@ import info.nightscout.androidaps.events.EventTreatmentChange;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.DanaR.History.DanaRNSHistorySync;
+import info.nightscout.androidaps.plugins.NSProfileViewer.NSProfileViewerPlugin;
 import info.nightscout.androidaps.plugins.Objectives.ObjectivesPlugin;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.SmsCommunicator.SmsCommunicatorPlugin;
@@ -70,26 +71,42 @@ public class DataService extends IntentService {
         if (ConfigBuilderPlugin.getActiveBgSource().getClass().equals(SourceXdripPlugin.class)) {
             xDripEnabled = true;
             nsClientEnabled = false;
-        }
+        } else if (ConfigBuilderPlugin.getActiveBgSource().getClass().equals(SourceNSClientPlugin.class)) {
-        if (ConfigBuilderPlugin.getActiveBgSource().getClass().equals(SourceNSClientPlugin.class)) {
             xDripEnabled = false;
             nsClientEnabled = true;
         }
 
+        boolean isNSProfile = ConfigBuilderPlugin.getActiveProfile().getClass().equals(NSProfileViewerPlugin.class);
+
+        SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        boolean nsUploadOnly = SP.getBoolean("ns_upload_only", false);
+
         if (intent != null) {
             final String action = intent.getAction();
             if (Intents.ACTION_NEW_BG_ESTIMATE.equals(action)) {
-                if (xDripEnabled)
+                if (xDripEnabled) {
                     handleNewDataFromXDrip(intent);
-            } else if (Intents.ACTION_NEW_PROFILE.equals(action) ||
+                }
+            } else if (Intents.ACTION_NEW_SGV.equals(action)) {
+                // always handle SGV if NS-Client is the source
+                if (nsClientEnabled) {
+                    handleNewDataFromNSClient(intent);
+                }
+                // Objectives 0
+                ObjectivesPlugin.bgIsAvailableInNS = true;
+                ObjectivesPlugin.saveProgress();
+            } else if (isNSProfile && Intents.ACTION_NEW_PROFILE.equals(action)){
+                // always handle Profili if NSProfile is enabled without looking at nsUploadOnly
+                handleNewDataFromNSClient(intent);
+            } else if (!nsUploadOnly &&
+                    (Intents.ACTION_NEW_PROFILE.equals(action) ||
                             Intents.ACTION_NEW_TREATMENT.equals(action) ||
                             Intents.ACTION_CHANGED_TREATMENT.equals(action) ||
                             Intents.ACTION_REMOVED_TREATMENT.equals(action) ||
-                    Intents.ACTION_NEW_SGV.equals(action) ||
                             Intents.ACTION_NEW_STATUS.equals(action) ||
                             Intents.ACTION_NEW_DEVICESTATUS.equals(action) ||
                             Intents.ACTION_NEW_CAL.equals(action) ||
-                    Intents.ACTION_NEW_MBG.equals(action)
+                            Intents.ACTION_NEW_MBG.equals(action))
                     ) {
                 handleNewDataFromNSClient(intent);
             } else if (Telephony.Sms.Intents.SMS_RECEIVED_ACTION.equals(action)) {
@@ -318,7 +335,6 @@ public class DataService extends IntentService {
         }
 
         if (intent.getAction().equals(Intents.ACTION_NEW_SGV)) {
-            if (nsClientEnabled) {
             try {
                 if (bundles.containsKey("sgv")) {
                     String sgvstring = bundles.getString("sgv");
@@ -357,10 +373,6 @@ public class DataService extends IntentService {
             }
             MainApp.bus().post(new EventNewBG());
         }
-            // Objectives 0
-            ObjectivesPlugin.bgIsAvailableInNS = true;
-            ObjectivesPlugin.saveProgress();
-        }
 
         if (intent.getAction().equals(Intents.ACTION_NEW_MBG)) {
             log.error("Not implemented yet"); // TODO implemeng MBGS

app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java

@@ -3,7 +3,9 @@ package info.nightscout.androidaps.plugins.Treatments;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.CardView;
@@ -34,6 +36,7 @@ import info.nightscout.androidaps.events.EventTreatmentChange;
 import info.nightscout.androidaps.interfaces.FragmentBase;
 import info.nightscout.client.data.NSProfile;
 import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.utils.ToastUtils;
 
 public class TreatmentsFragment extends Fragment implements View.OnClickListener, FragmentBase {
     private static Logger log = LoggerFactory.getLogger(TreatmentsFragment.class);
@@ -148,6 +151,11 @@ public class TreatmentsFragment extends Fragment implements View.OnClickListener
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.treatments_reshreshfromnightscout:
+                SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(getContext());
+                boolean nsUploadOnly = SP.getBoolean("ns_upload_only", false);
+                if(nsUploadOnly){
+                    ToastUtils.showToastInUiThread(getContext(),this.getContext().getString(R.string.ns_upload_only_enabled));
+                } else {
                     AlertDialog.Builder builder = new AlertDialog.Builder(this.getContext());
                     builder.setTitle(this.getContext().getString(R.string.confirmation));
                     builder.setMessage(this.getContext().getString(R.string.refreshfromnightscout));
@@ -162,7 +170,7 @@ public class TreatmentsFragment extends Fragment implements View.OnClickListener
                     });
                     builder.setNegativeButton(this.getContext().getString(R.string.cancel), null);
                     builder.show();
-
+                }
                 break;
         }
     }

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

@@ -336,5 +336,7 @@
     <string name="ko_lang">Korean</string>
     <string name="actions">Actions</string>
     <string name="androidaps_start">AndroidAPS started</string>
-
+    <string name="ns_upload_only">NS upload only (disabled sync)</string>
+    <string name="ns_upload_only_summary">NS upload only. Not effective on SGV unless a local source like xDrip is selected. Not effective on Profiles while NS-Profiles is used.</string>
+    <string name="ns_upload_only_enabled">Please deactivate "NS upload only" to use this feature.</string>
 </resources>

app/src/main/res/xml/pref_nightscout.xml

@@ -8,6 +8,11 @@
             android:defaultValue="false"
             android:key="syncprofiletopump"
             android:title="@string/syncprofiletopump_title" />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="ns_upload_only"
+            android:title="@string/ns_upload_only"
+            android:summary="@string/ns_upload_only_summary"/>
         <SwitchPreference
             android:defaultValue="false"
             android:key="ns_sync_use_absolute"