From 398e950f8e42bc5459f1fd6750bbb747508b633d Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Tue, 10 Oct 2017 22:11:06 +0200
Subject: [PATCH] fix percentage concatenation on profile names

---
 .../plugins/Careportal/Dialogs/NewNSTreatmentDialog.java    | 2 +-
 .../plugins/ConfigBuilder/ConfigBuilderPlugin.java          | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
index bb727966f6..1b9de2acf9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
@@ -726,7 +726,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                     profileSwitch = new ProfileSwitch();
                     profileSwitch.date = System.currentTimeMillis();
                     profileSwitch.source = Source.USER;
-                    profileSwitch.profileName = MainApp.getConfigBuilder().getProfileName();
+                    profileSwitch.profileName = MainApp.getConfigBuilder().getProfileName(System.currentTimeMillis(), false);
                     profileSwitch.profileJson = MainApp.getConfigBuilder().getProfile().getData().toString();
                     profileSwitch.profilePlugin = ConfigBuilderPlugin.getActiveProfileInterface().getClass().getName();
                     profileSwitch.durationInMinutes = duration;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
index c0f1c01aac..89fa92fc18 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
@@ -934,10 +934,14 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
     }
 
     public String getProfileName(long time) {
+        return getProfileName(time, true);
+    }
+
+    public String getProfileName(long time, boolean customized) {
         ProfileSwitch profileSwitch = getProfileSwitchFromHistory(time);
         if (profileSwitch != null) {
             if (profileSwitch.profileJson != null) {
-                return profileSwitch.getCustomizedName();
+                return customized?profileSwitch.getCustomizedName():profileSwitch.profileName;
             } else {
                 Profile profile = activeProfile.getProfile().getSpecificProfile(profileSwitch.profileName);
                 if (profile != null)