preferences update

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

@@ -9,13 +9,9 @@ public class Config {
     // MAIN FUCTIONALITY
     public static final boolean APS = BuildConfig.APS;
     // PLUGINS
-    public static final boolean OPENAPSENABLED = APS;
-    public static final boolean LOOPENABLED = APS;
-
     public static final boolean NSCLIENT = BuildConfig.NSCLIENTOLNY;
 
     public static final boolean DANAR = true && BuildConfig.PUMPDRIVERS;
-    public static final boolean DANARv2 = true && BuildConfig.PUMPDRIVERS;
 
     public static final boolean ACTION = !BuildConfig.NSCLIENTOLNY;
     public static final boolean VIRTUALPUMP = !BuildConfig.NSCLIENTOLNY;
@@ -26,8 +22,6 @@ public class Config {
     public static final boolean SMSCOMMUNICATORENABLED = !BuildConfig.NSCLIENTOLNY;
 
 
-    public static final boolean ALLPREFERENCES = !BuildConfig.NSCLIENTOLNY;
-
     public static final boolean detailedLog = true;
     public static final boolean logFunctionCalls = true;
     public static final boolean logIncommingData = true;

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

@@ -336,6 +336,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                                     @Override
                                     public void run() {
                                         Intent i = new Intent(v.getContext(), PreferencesActivity.class);
+                                        i.putExtra("id", -1);
                                         startActivity(i);
                                     }
                                 }, null);

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

@@ -26,7 +26,7 @@ import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Actions.ActionsFragment;
-import info.nightscout.androidaps.plugins.Careportal.CareportalFragment;
+import info.nightscout.androidaps.plugins.Careportal.CareportalPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesPlugin;
@@ -67,7 +67,7 @@ import info.nightscout.androidaps.plugins.SourceMM640g.SourceMM640gPlugin;
 import info.nightscout.androidaps.plugins.SourceNSClient.SourceNSClientPlugin;
 import info.nightscout.androidaps.plugins.SourceXdrip.SourceXdripPlugin;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.plugins.Wear.WearFragment;
+import info.nightscout.androidaps.plugins.Wear.WearPlugin;
 import info.nightscout.androidaps.plugins.XDripStatusline.StatuslinePlugin;
 import info.nightscout.androidaps.receivers.DataReceiver;
 import info.nightscout.androidaps.receivers.KeepAliveReceiver;
@@ -127,12 +127,12 @@ public class MainApp extends Application {
             if (Config.DANAR) pluginsList.add(DanaRKoreanPlugin.getPlugin());
             if (Config.DANAR) pluginsList.add(DanaRv2Plugin.getPlugin());
             if (Config.DANAR) pluginsList.add(DanaRSPlugin.getPlugin());
-            pluginsList.add(CareportalFragment.getPlugin());
+            pluginsList.add(CareportalPlugin.getPlugin());
             if (Config.MDI) pluginsList.add(MDIPlugin.getPlugin());
-            if (Config.VIRTUALPUMP) pluginsList.add(VirtualPumpPlugin.getInstance());
+            if (Config.VIRTUALPUMP) pluginsList.add(VirtualPumpPlugin.getPlugin());
-            if (Config.LOOPENABLED) pluginsList.add(LoopPlugin.getPlugin());
+            if (Config.APS) pluginsList.add(LoopPlugin.getPlugin());
-            if (Config.OPENAPSENABLED) pluginsList.add(OpenAPSMAPlugin.getPlugin());
+            if (Config.APS) pluginsList.add(OpenAPSMAPlugin.getPlugin());
-            if (Config.OPENAPSENABLED) pluginsList.add(OpenAPSAMAPlugin.getPlugin());
+            if (Config.APS) pluginsList.add(OpenAPSAMAPlugin.getPlugin());
             pluginsList.add(NSProfilePlugin.getPlugin());
             if (Config.OTHERPROFILES) pluginsList.add(SimpleProfilePlugin.getPlugin());
             if (Config.OTHERPROFILES) pluginsList.add(LocalProfileFragment.getPlugin());
@@ -150,8 +150,8 @@ public class MainApp extends Application {
                 pluginsList.add(SourceGlimpPlugin.getPlugin());
             if (Config.SMSCOMMUNICATORENABLED) pluginsList.add(SmsCommunicatorPlugin.getPlugin());
 
-            pluginsList.add(WearFragment.getPlugin(this));
+            pluginsList.add(WearPlugin.initPlugin(this));
-            pluginsList.add(StatuslinePlugin.getPlugin(this));
+            pluginsList.add(StatuslinePlugin.initPlugin(this));
             pluginsList.add(new PersistentNotificationPlugin(this));
             pluginsList.add(NSClientInternalPlugin.getPlugin());
 

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

@@ -1,5 +1,6 @@
 package info.nightscout.androidaps;
 
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
@@ -15,18 +16,23 @@ import android.text.TextUtils;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventRefreshGui;
 import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.plugins.Careportal.CareportalPlugin;
+import info.nightscout.androidaps.plugins.ConstraintsSafety.SafetyPlugin;
 import info.nightscout.androidaps.plugins.Insulin.InsulinOrefFreePeakPlugin;
+import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
+import info.nightscout.androidaps.plugins.NSClientInternal.NSClientInternalPlugin;
+import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
+import info.nightscout.androidaps.plugins.OpenAPSMA.OpenAPSMAPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.BluetoothDevicePreference;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSClientInternalPlugin;
-import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.SensitivityAAPS.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.SensitivityOref0.SensitivityOref0Plugin;
 import info.nightscout.androidaps.plugins.SensitivityWeightedAverage.SensitivityWeightedAveragePlugin;
+import info.nightscout.androidaps.plugins.SmsCommunicator.SmsCommunicatorPlugin;
 import info.nightscout.androidaps.plugins.Wear.WearPlugin;
 import info.nightscout.androidaps.plugins.XDripStatusline.StatuslinePlugin;
 import info.nightscout.utils.LocaleHelper;
@@ -40,6 +46,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         myPreferenceFragment = new MyPreferenceFragment();
+        myPreferenceFragment.setCaller(getIntent());
         getFragmentManager().beginTransaction().replace(android.R.id.content, myPreferenceFragment).commit();
         PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
     }
@@ -72,12 +79,11 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
             if (pref.getKey().contains("password") || pref.getKey().contains("secret")) {
                 pref.setSummary("******");
             } else if (pref.getKey().equals(MainApp.sResources.getString(R.string.key_danars_name))) {
-                pref.setSummary(SP.getString(R.string.key_danars_name,""));
+                pref.setSummary(SP.getString(R.string.key_danars_name, ""));
             } else if (editTextPref.getText() != null && !editTextPref.getText().equals("")) {
                 ((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage());
                 pref.setSummary(editTextPref.getText());
-            }
+            } else if (pref.getKey().contains("smscommunicator_allowednumbers") && TextUtils.isEmpty(editTextPref.getText().toString().trim())) {
-            else if(pref.getKey().contains("smscommunicator_allowednumbers") && TextUtils.isEmpty(editTextPref.getText().toString().trim())){
                 pref.setSummary(MainApp.sResources.getString(R.string.smscommunicator_allowednumbers_summary));
             }
         }
@@ -99,85 +105,79 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
     }
 
     public static class MyPreferenceFragment extends PreferenceFragment {
+        Intent caller;
+
+        public void setCaller(Intent i) {
+            caller = i;
+        }
+
+        void addPreferencesFromResourceIfEnabled(PluginBase p, int type) {
+            if (p.isEnabled(type) && p.getPreferencesId() != -1)
+                addPreferencesFromResource(p.getPreferencesId());
+        }
+
         @Override
         public void onCreate(final Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            if (Config.ALLPREFERENCES) {
+
+            Integer id = caller.getIntExtra("id", -1);
+
+            if (id != -1) {
+                addPreferencesFromResource(id);
+            } else {
+                if (!Config.NSCLIENT) {
                     addPreferencesFromResource(R.xml.pref_password);
                 }
                 addPreferencesFromResource(R.xml.pref_age);
                 addPreferencesFromResource(R.xml.pref_language);
-            if (Config.ALLPREFERENCES) {
+
+                if (!Config.NSCLIENT) {
                     addPreferencesFromResource(R.xml.pref_quickwizard);
                 }
-            addPreferencesFromResource(R.xml.pref_careportal);
+                addPreferencesFromResourceIfEnabled(CareportalPlugin.getPlugin(), PluginBase.GENERAL);
-            if (Config.ALLPREFERENCES) {
+                addPreferencesFromResourceIfEnabled(SafetyPlugin.getPlugin(), PluginBase.CONSTRAINTS);
-                addPreferencesFromResource(R.xml.pref_treatments);
+                if (Config.APS) {
+                    addPreferencesFromResourceIfEnabled(LoopPlugin.getPlugin(), PluginBase.LOOP);
+                    addPreferencesFromResourceIfEnabled(OpenAPSMAPlugin.getPlugin(), PluginBase.APS);
+                    addPreferencesFromResourceIfEnabled(OpenAPSAMAPlugin.getPlugin(), PluginBase.APS);
                 }
-            if (Config.APS)
+
-                addPreferencesFromResource(R.xml.pref_closedmode);
+                addPreferencesFromResourceIfEnabled(SensitivityAAPSPlugin.getPlugin(), PluginBase.SENSITIVITY);
-            if (Config.OPENAPSENABLED) {
+                addPreferencesFromResourceIfEnabled(SensitivityWeightedAveragePlugin.getPlugin(), PluginBase.SENSITIVITY);
-                addPreferencesFromResource(R.xml.pref_openapsma);
+                addPreferencesFromResourceIfEnabled(SensitivityOref0Plugin.getPlugin(), PluginBase.SENSITIVITY);
-                if (MainApp.getSpecificPlugin(OpenAPSAMAPlugin.class) != null && MainApp.getSpecificPlugin(OpenAPSAMAPlugin.class).isEnabled(PluginBase.APS))
+
-                    addPreferencesFromResource(R.xml.pref_openapsama);
+                if (!Config.NSCLIENT) {
-            }
-            if (MainApp.getSpecificPlugin(SensitivityAAPSPlugin.class) != null && MainApp.getSpecificPlugin(SensitivityAAPSPlugin.class).isEnabled(PluginBase.SENSITIVITY)
-                    || MainApp.getSpecificPlugin(SensitivityWeightedAveragePlugin.class) != null && MainApp.getSpecificPlugin(SensitivityWeightedAveragePlugin.class).isEnabled(PluginBase.SENSITIVITY))
-                addPreferencesFromResource(R.xml.pref_absorption_aaps);
-            if (MainApp.getSpecificPlugin(SensitivityOref0Plugin.class) != null && MainApp.getSpecificPlugin(SensitivityOref0Plugin.class).isEnabled(PluginBase.SENSITIVITY))
-                addPreferencesFromResource(R.xml.pref_absorption_oref0);
-            if (Config.ALLPREFERENCES) {
                     addPreferencesFromResource(R.xml.pref_profile);
                 }
+
                 if (Config.DANAR) {
-                DanaRPlugin danaRPlugin = MainApp.getSpecificPlugin(DanaRPlugin.class);
+                    addPreferencesFromResourceIfEnabled(DanaRPlugin.getPlugin(), PluginBase.PUMP);
-                DanaRKoreanPlugin danaRKoreanPlugin = MainApp.getSpecificPlugin(DanaRKoreanPlugin.class);
+                    addPreferencesFromResourceIfEnabled(DanaRKoreanPlugin.getPlugin(), PluginBase.PUMP);
-                DanaRv2Plugin danaRv2Plugin = MainApp.getSpecificPlugin(DanaRv2Plugin.class);
+                    addPreferencesFromResourceIfEnabled(DanaRv2Plugin.getPlugin(), PluginBase.PUMP);
-                DanaRSPlugin danaRSPlugin = MainApp.getSpecificPlugin(DanaRSPlugin.class);
+                    addPreferencesFromResourceIfEnabled(DanaRSPlugin.getPlugin(), PluginBase.PUMP);
-                if (danaRPlugin.isEnabled(PluginBase.PUMP)) {
+
-                    addPreferencesFromResource(R.xml.pref_danar);
+                    if (DanaRPlugin.getPlugin().isEnabled(PluginBase.PROFILE)
-                }
+                            || DanaRKoreanPlugin.getPlugin().isEnabled(PluginBase.PROFILE)
-                if (danaRKoreanPlugin.isEnabled(PluginBase.PUMP)) {
+                            || DanaRv2Plugin.getPlugin().isEnabled(PluginBase.PROFILE)
-                    addPreferencesFromResource(R.xml.pref_danarkorean);
+                            || DanaRSPlugin.getPlugin().isEnabled(PluginBase.PROFILE)) {
-                }
-                if (danaRv2Plugin != null && danaRv2Plugin.isEnabled(PluginBase.PUMP)) {
-                    addPreferencesFromResource(R.xml.pref_danarv2);
-                }
-                if (danaRSPlugin != null && danaRSPlugin.isEnabled(PluginBase.PUMP)) {
-                    addPreferencesFromResource(R.xml.pref_danars);
-                }
-                if (danaRPlugin.isEnabled(PluginBase.PROFILE) || danaRKoreanPlugin.isEnabled(PluginBase.PROFILE) || danaRv2Plugin != null && danaRv2Plugin.isEnabled(PluginBase.PROFILE)) {
                         addPreferencesFromResource(R.xml.pref_danarprofile);
                     }
                 }
-            VirtualPumpPlugin virtualPumpPlugin = MainApp.getSpecificPlugin(VirtualPumpPlugin.class);
-            if (virtualPumpPlugin != null && virtualPumpPlugin.isEnabled(PluginBase.PUMP)) {
-                addPreferencesFromResource(R.xml.pref_virtualpump);
-            }
-            InsulinOrefFreePeakPlugin insulinOrefFreePeakPlugin = MainApp.getSpecificPlugin(InsulinOrefFreePeakPlugin.class);
-            if (insulinOrefFreePeakPlugin.isEnabled(PluginBase.INSULIN)) {
-                addPreferencesFromResource(R.xml.pref_insulinoreffreepeak);
-            }
 
-            NSClientInternalPlugin nsClientInternalPlugin = MainApp.getSpecificPlugin(NSClientInternalPlugin.class);
+                addPreferencesFromResourceIfEnabled(VirtualPumpPlugin.getPlugin(), PluginBase.PUMP);
-            if (nsClientInternalPlugin != null && nsClientInternalPlugin.isEnabled(PluginBase.GENERAL)) {
+
-                addPreferencesFromResource(R.xml.pref_nsclientinternal);
+                addPreferencesFromResourceIfEnabled(InsulinOrefFreePeakPlugin.getPlugin(), PluginBase.INSULIN);
-            }
+
-            if (Config.SMSCOMMUNICATORENABLED)
+                addPreferencesFromResourceIfEnabled(NSClientInternalPlugin.getPlugin(), PluginBase.GENERAL);
-                addPreferencesFromResource(R.xml.pref_smscommunicator);
+                addPreferencesFromResourceIfEnabled(SmsCommunicatorPlugin.getPlugin(), PluginBase.GENERAL);
-            if (Config.ALLPREFERENCES) {
+
+                if (!Config.NSCLIENT) {
                     addPreferencesFromResource(R.xml.pref_others);
                 }
                 addPreferencesFromResource(R.xml.pref_advanced);
 
-            WearPlugin wearPlugin = MainApp.getSpecificPlugin(WearPlugin.class);
+                addPreferencesFromResourceIfEnabled(WearPlugin.getPlugin(), PluginBase.GENERAL);
-            if (wearPlugin != null && wearPlugin.isEnabled(PluginBase.GENERAL)) {
+                addPreferencesFromResourceIfEnabled(StatuslinePlugin.getPlugin(), PluginBase.GENERAL);
-                addPreferencesFromResource(R.xml.pref_wear);
-            }
-
-            StatuslinePlugin statuslinePlugin = MainApp.getSpecificPlugin(StatuslinePlugin.class);
-            if (statuslinePlugin != null && statuslinePlugin.isEnabled(PluginBase.GENERAL)) {
-                addPreferencesFromResource(R.xml.pref_xdripstatus);
             }
 
             initSummary(getPreferenceScreen());

app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java

@@ -30,4 +30,5 @@ public interface PluginBase {
     boolean showInList(int type);
     void setFragmentEnabled(int type, boolean fragmentEnabled);
     void setFragmentVisible(int type, boolean fragmentVisible);
+    int getPreferencesId();
 }

app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsPlugin.java

@@ -74,4 +74,9 @@ public class ActionsPlugin implements PluginBase {
         if (type == GENERAL) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
 }

app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java

@@ -26,8 +26,6 @@ import info.nightscout.androidaps.plugins.Overview.OverviewFragment;
 
 public class CareportalFragment extends SubscriberFragment implements View.OnClickListener {
 
-    static CareportalPlugin careportalPlugin;
-
     TextView iage;
     TextView cage;
     TextView sage;
@@ -37,13 +35,6 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
     LinearLayout butonsLayout;
     View noProfileView;
 
-    static public CareportalPlugin getPlugin() {
-        if (careportalPlugin == null) {
-            careportalPlugin = new CareportalPlugin();
-        }
-        return careportalPlugin;
-    }
-
     //                                                    date,bg,insulin,carbs,prebolus,duration,percent,absolute,profile,split,temptarget
     public static final OptionsToShow BGCHECK = new OptionsToShow(R.id.careportal_bgcheck, R.string.careportal_bgcheck).date().bg();
     public static final OptionsToShow SNACKBOLUS = new OptionsToShow(R.id.careportal_snackbolus, R.string.careportal_snackbolus).date().bg().insulin().carbs().prebolus();

app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java

@@ -10,6 +10,15 @@ public class CareportalPlugin implements PluginBase {
     private boolean fragmentEnabled = true;
     private boolean fragmentVisible = true;
 
+    static CareportalPlugin careportalPlugin;
+
+    static public CareportalPlugin getPlugin() {
+        if (careportalPlugin == null) {
+            careportalPlugin = new CareportalPlugin();
+        }
+        return careportalPlugin;
+    }
+
     @Override
     public int getType() {
         return PluginBase.GENERAL;
@@ -71,4 +80,9 @@ public class CareportalPlugin implements PluginBase {
         if (type == GENERAL) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_careportal;
+    }
+
 }

app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java

@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.ConfigBuilder;
 
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -10,6 +11,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.ListView;
@@ -22,6 +24,7 @@ import com.crashlytics.android.answers.CustomEvent;
 import java.util.ArrayList;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.PreferencesActivity;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventConfigBuilderChange;
 import info.nightscout.androidaps.events.EventRefreshGui;
@@ -194,7 +197,7 @@ public class ConfigBuilderFragment extends Fragment {
         public PluginCustomAdapter(Context context, int textViewResourceId,
                                    ArrayList<PluginBase> pluginList, int type) {
             super(context, textViewResourceId, pluginList);
-            this.pluginList = new ArrayList<PluginBase>();
+            this.pluginList = new ArrayList<>();
             this.pluginList.addAll(pluginList);
             this.type = type;
         }
@@ -203,12 +206,14 @@ public class ConfigBuilderFragment extends Fragment {
             TextView name;
             CheckBox checkboxEnabled;
             CheckBox checkboxVisible;
+            ImageView settings;
         }
 
         @Override
         public View getView(int position, View view, ViewGroup parent) {
 
             PluginViewHolder holder = null;
+            PluginBase plugin = pluginList.get(position);
 
             if (view == null) {
                 view = LayoutInflater.from(parent.getContext()).inflate(R.layout.configbuilder_simpleitem, null);
@@ -217,6 +222,13 @@ public class ConfigBuilderFragment extends Fragment {
                 holder.name = (TextView) view.findViewById(R.id.configbuilder_simpleitem_name);
                 holder.checkboxEnabled = (CheckBox) view.findViewById(R.id.configbuilder_simpleitem_checkboxenabled);
                 holder.checkboxVisible = (CheckBox) view.findViewById(R.id.configbuilder_simpleitem_checkboxvisible);
+                holder.settings = (ImageView) view.findViewById(R.id.configbuilder_simpleitem_settings);
+
+                if (plugin.isEnabled(type) && plugin.getPreferencesId() != -1)
+                    holder.settings.setVisibility(View.VISIBLE);
+                else
+                    holder.settings.setVisibility(View.INVISIBLE);
+
                 view.setTag(holder);
 
                 holder.checkboxEnabled.setOnClickListener(new View.OnClickListener() {
@@ -244,17 +256,31 @@ public class ConfigBuilderFragment extends Fragment {
                         getPlugin().logPluginStatus();
                     }
                 });
+
+                holder.settings.setOnClickListener(new View.OnClickListener() {
+                    public void onClick(View v) {
+                        final PluginBase plugin = (PluginBase) v.getTag();
+                        PasswordProtection.QueryPassword(getContext(), R.string.settings_password, "settings_password", new Runnable() {
+                            @Override
+                            public void run() {
+                                Intent i = new Intent(getContext(), PreferencesActivity.class);
+                                i.putExtra("id", plugin.getPreferencesId());
+                                startActivity(i);
+                            }
+                        }, null);
+                    }
+                });
             } else {
                 holder = (PluginViewHolder) view.getTag();
             }
 
-            PluginBase plugin = pluginList.get(position);
             holder.name.setText(plugin.getName());
             holder.checkboxEnabled.setChecked(plugin.isEnabled(type));
             holder.checkboxVisible.setChecked(plugin.isVisibleInTabs(type));
             holder.name.setTag(plugin);
             holder.checkboxEnabled.setTag(plugin);
             holder.checkboxVisible.setTag(plugin);
+            holder.settings.setTag(plugin);
 
             if (!plugin.canBeHidden(type)) {
                 holder.checkboxEnabled.setEnabled(false);

app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java

@@ -146,6 +146,11 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
         // Always visible
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     public void initialize() {
         pluginList = MainApp.getPluginsList();
         loadSettings();
@@ -301,7 +306,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
         pluginsInCategory = MainApp.getSpecificPluginsList(PluginBase.PUMP);
         activePump = (PumpInterface) getTheOneEnabledInArray(pluginsInCategory, PluginBase.PUMP);
         if (activePump == null)
-            activePump = VirtualPumpPlugin.getInstance(); // for NSClient build
+            activePump = VirtualPumpPlugin.getPlugin(); // for NSClient build
         if (Config.logConfigBuilder)
             log.debug("Selected pump interface: " + ((PluginBase) activePump).getName());
         for (PluginBase p : pluginsInCategory) {

app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java

@@ -104,6 +104,11 @@ public class ObjectivesPlugin implements PluginBase, ConstraintsInterface {
         if (type == CONSTRAINTS) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     class Objective {
         Integer num;
         String objective;

app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPlugin.java

@@ -86,6 +86,11 @@ public class SafetyPlugin implements PluginBase, ConstraintsInterface {
     public void setFragmentVisible(int type, boolean fragmentVisible) {
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_safety;
+    }
+
     @Override
     public boolean isLoopEnabled() {
         return MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable;

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFastactingPlugin.java

@@ -80,6 +80,11 @@ public class InsulinFastactingPlugin implements PluginBase, InsulinInterface {
         if (type == INSULIN) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     // Insulin interface
     @Override
     public int getId() {

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFastactingProlongedPlugin.java

@@ -80,6 +80,11 @@ public class InsulinFastactingProlongedPlugin implements PluginBase, InsulinInte
         if (type == INSULIN) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     // Insulin interface
     @Override
     public int getId() {

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefFreePeakPlugin.java

@@ -68,6 +68,11 @@ public class InsulinOrefFreePeakPlugin extends InsulinOrefBasePlugin {
         if (type == INSULIN) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_insulinoreffreepeak;
+    }
+
     @Override
     int getPeak() {
         return SP.getInt(R.string.key_insulin_oref_peak, DEFAULT_PEAK);

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefRapidActingPlugin.java

@@ -67,6 +67,11 @@ public class InsulinOrefRapidActingPlugin extends InsulinOrefBasePlugin {
         if (type == INSULIN) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     @Override
     int getPeak() {
         return PEAK;

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefUltraRapidActingPlugin.java

@@ -67,6 +67,11 @@ public class InsulinOrefUltraRapidActingPlugin extends InsulinOrefBasePlugin {
         if (type == INSULIN) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     @Override
     int getPeak() {
         return PEAK;

app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobCalculatorPlugin.java

@@ -126,6 +126,11 @@ public class IobCobCalculatorPlugin implements PluginBase {
 
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     IobCobCalculatorPlugin() {
         MainApp.bus().register(this);
         if (sHandlerThread == null) {

app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java

@@ -148,6 +148,11 @@ public class LoopPlugin implements PluginBase {
         if (type == LOOP) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_closedmode;
+    }
+
     @Subscribe
     public void onStatusEvent(final EventTreatmentChange ev) {
         invoke("EventTreatmentChange", true);

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientInternalPlugin.java

@@ -135,6 +135,11 @@ public class NSClientInternalPlugin implements PluginBase {
         if (type == GENERAL) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_nsclientinternal;
+    }
+
     private ServiceConnection mConnection = new ServiceConnection() {
 
         public void onServiceDisconnected(ComponentName name) {

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java

@@ -103,6 +103,11 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
         if (type == APS) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_openapsama;
+    }
+
     @Override
     public void setFragmentEnabled(int type, boolean fragmentEnabled) {
         if (type == APS) this.fragmentEnabled = fragmentEnabled;

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java

@@ -101,6 +101,11 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
         if (type == APS) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_openapsma;
+    }
+
     @Override
     public void setFragmentEnabled(int type, boolean fragmentEnabled) {
         if (type == APS) this.fragmentEnabled = fragmentEnabled;

app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewPlugin.java

@@ -103,6 +103,11 @@ public class OverviewPlugin implements PluginBase {
         // Always visible
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     @Override
     public int getType() {
         return PluginBase.GENERAL;

app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java

@@ -205,6 +205,11 @@ public class PersistentNotificationPlugin implements PluginBase {
         //no visible fragment
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     private String deltastring(double deltaMGDL, double deltaMMOL, String units) {
         String deltastring = "";
         if (deltaMGDL >= 0) {

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

@@ -119,6 +119,11 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
         if (type == PROFILE) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     void storeSettings() {
         if (Config.logPrefsChange)
             log.debug("Storing settings");

app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfilePlugin.java

@@ -108,6 +108,11 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
         if (type == PROFILE) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     public void storeSettings() {
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
         SharedPreferences.Editor editor = settings.edit();

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

@@ -104,6 +104,11 @@ public class NSProfilePlugin implements PluginBase, ProfileInterface {
         if (type == PROFILE) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     @Override
     public int getType() {
         return PluginBase.PROFILE;

app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfilePlugin.java

@@ -111,6 +111,11 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
         if (type == PROFILE) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     public void storeSettings() {
         if (Config.logPrefsChange)
             log.debug("Storing settings");

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java

@@ -217,6 +217,11 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
             fragmentPumpVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_danar;
+    }
+
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
         return useExtendedBoluses;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java

@@ -219,6 +219,11 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
             this.fragmentPumpVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_danarkorean;
+    }
+
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
         return useExtendedBoluses;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java

@@ -137,6 +137,11 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
             this.fragmentPumpVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_danars;
+    }
+
     static boolean fragmentPumpEnabled = false;
     static boolean fragmentProfileEnabled = false;
     static boolean fragmentPumpVisible = false;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java

@@ -204,6 +204,11 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
             this.fragmentPumpVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_danarv2;
+    }
+
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
         return false;

app/src/main/java/info/nightscout/androidaps/plugins/PumpMDI/MDIPlugin.java

@@ -99,6 +99,11 @@ public class MDIPlugin implements PluginBase, PumpInterface {
         if (type == PUMP) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     @Override
     public int getType() {
         return PluginBase.PUMP;

app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java

@@ -79,7 +79,7 @@ public class VirtualPumpFragment extends SubscriberFragment {
             activity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    VirtualPumpPlugin virtualPump = VirtualPumpPlugin.getInstance();
+                    VirtualPumpPlugin virtualPump = VirtualPumpPlugin.getPlugin();
                     basaBasalRateView.setText(virtualPump.getBaseBasalRate() + "U");
                     if (MainApp.getConfigBuilder().isTempBasalInProgress()) {
                         tempBasalView.setText(MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis()).toStringFull());

app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java

@@ -64,12 +64,12 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
         return fromNSAreCommingFakedExtendedBoluses;
     }
 
-    private static VirtualPumpPlugin instance = null;
+    private static VirtualPumpPlugin plugin = null;
-    public static VirtualPumpPlugin getInstance() {
+    public static VirtualPumpPlugin getPlugin() {
         loadFakingStatus();
-        if (instance == null)
+        if (plugin == null)
-            instance = new VirtualPumpPlugin();
+            plugin = new VirtualPumpPlugin();
-        return instance;
+        return plugin;
     }
 
     private VirtualPumpPlugin() {
@@ -154,6 +154,11 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
         if (type == PUMP) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_virtualpump;
+    }
+
     @Override
     public int getType() {
         return PluginBase.PUMP;

app/src/main/java/info/nightscout/androidaps/plugins/SensitivityAAPS/SensitivityAAPSPlugin.java

@@ -96,6 +96,11 @@ public class SensitivityAAPSPlugin implements PluginBase, SensitivityInterface{
         if (type == SENSITIVITY) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_absorption_aaps;
+    }
+
 
     @Override
     public AutosensResult detectSensitivity(long fromTime, long toTime) {

app/src/main/java/info/nightscout/androidaps/plugins/SensitivityOref0/SensitivityOref0Plugin.java

@@ -94,6 +94,11 @@ public class SensitivityOref0Plugin implements PluginBase, SensitivityInterface
         if (type == SENSITIVITY) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_absorption_oref0;
+    }
+
 
     @Override
     public AutosensResult detectSensitivity(long fromTime, long toTime) {

app/src/main/java/info/nightscout/androidaps/plugins/SensitivityWeightedAverage/SensitivityWeightedAveragePlugin.java

@@ -93,6 +93,11 @@ public class SensitivityWeightedAveragePlugin implements PluginBase, Sensitivity
         if (type == SENSITIVITY) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_absorption_aaps;
+    }
+
 
     @Override
     public AutosensResult detectSensitivity(long fromTime, long toTime) {

app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java

@@ -186,6 +186,11 @@ public class SmsCommunicatorPlugin implements PluginBase {
         if (type == GENERAL) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_smscommunicator;
+    }
+
     @Subscribe
     public void processSettings(final EventPreferenceChange ev) {
         if (ev == null || ev.isChanged(R.string.key_smscommunicator_allowednumbers)) {

app/src/main/java/info/nightscout/androidaps/plugins/SourceGlimp/SourceGlimpPlugin.java

@@ -75,5 +75,10 @@ public class SourceGlimpPlugin implements PluginBase, BgSourceInterface {
 
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
 
 }

app/src/main/java/info/nightscout/androidaps/plugins/SourceMM640g/SourceMM640gPlugin.java

@@ -75,5 +75,10 @@ public class SourceMM640gPlugin implements PluginBase, BgSourceInterface {
 
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
 
 }

app/src/main/java/info/nightscout/androidaps/plugins/SourceNSClient/SourceNSClientPlugin.java

@@ -77,5 +77,10 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface {
 
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
 
 }

app/src/main/java/info/nightscout/androidaps/plugins/SourceXdrip/SourceXdripPlugin.java

@@ -75,5 +75,10 @@ public class SourceXdripPlugin implements PluginBase, BgSourceInterface {
     public void setFragmentVisible(int type, boolean fragmentVisible) {
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
 
 }

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

@@ -121,6 +121,11 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
         if (type == TREATMENT) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return -1;
+    }
+
     @Override
     public int getType() {
         return PluginBase.TREATMENT;

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

@@ -324,7 +324,7 @@ public class ActionStringHandler {
 
 
         // send result
-        WearFragment.getPlugin(MainApp.instance()).requestActionConfirmation(rTitle, rMessage, rAction);
+        WearPlugin.getPlugin().requestActionConfirmation(rTitle, rMessage, rAction);
         lastSentTimestamp = System.currentTimeMillis();
         lastConfirmActionString = rAction;
     }
@@ -596,7 +596,7 @@ public class ActionStringHandler {
             msg += MainApp.sResources.getString(R.string.cpp_valuesnotstored);
             String rTitle = "STATUS";
             String rAction = "statusmessage";
-            WearFragment.getPlugin(MainApp.instance()).requestActionConfirmation(rTitle, msg, rAction);
+            WearPlugin.getPlugin().requestActionConfirmation(rTitle, msg, rAction);
             lastSentTimestamp = System.currentTimeMillis();
             lastConfirmActionString = rAction;
             return;
@@ -667,14 +667,14 @@ public class ActionStringHandler {
     }
 
     private synchronized static void sendError(String errormessage) {
-        WearFragment.getPlugin(MainApp.instance()).requestActionConfirmation("ERROR", errormessage, "error");
+        WearPlugin.getPlugin().requestActionConfirmation("ERROR", errormessage, "error");
         lastSentTimestamp = System.currentTimeMillis();
         lastConfirmActionString = null;
         lastBolusWizard = null;
     }
 
     private synchronized static void sendStatusmessage(String title, String message) {
-        WearFragment.getPlugin(MainApp.instance()).requestActionConfirmation(title, message, "statusmessage");
+        WearPlugin.getPlugin().requestActionConfirmation(title, message, "statusmessage");
         lastSentTimestamp = System.currentTimeMillis();
         lastConfirmActionString = null;
         lastBolusWizard = null;
@@ -682,7 +682,7 @@ public class ActionStringHandler {
 
     public synchronized static void expectNotificationAction(String message, int id) {
         String actionstring = "dismissoverviewnotification " + id;
-        WearFragment.getPlugin(MainApp.instance()).requestActionConfirmation("DISMISS", message, actionstring);
+        WearPlugin.getPlugin().requestActionConfirmation("DISMISS", message, actionstring);
         lastSentTimestamp = System.currentTimeMillis();
         lastConfirmActionString = actionstring;
         lastBolusWizard = null;

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

@@ -15,17 +15,6 @@ import info.nightscout.androidaps.R;
 
 public class WearFragment extends Fragment {
 
-    private static WearPlugin wearPlugin;
-
-    public static WearPlugin getPlugin(Context ctx) {
-
-        if (wearPlugin == null) {
-            wearPlugin = new WearPlugin(ctx);
-        }
-
-        return wearPlugin;
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -34,14 +23,14 @@ public class WearFragment extends Fragment {
         view.findViewById(R.id.wear_resend).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                getPlugin(getContext()).resendDataToWatch();
+                WearPlugin.getPlugin().resendDataToWatch();
             }
         });
 
         view.findViewById(R.id.wear_opensettings).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                getPlugin(getContext()).openSettings();
+                WearPlugin.getPlugin().openSettings();
             }
         });
 

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

@@ -34,6 +34,20 @@ public class WearPlugin implements PluginBase {
     private static WatchUpdaterService watchUS;
     private final Context ctx;
 
+    private static WearPlugin wearPlugin;
+
+    public static WearPlugin getPlugin() {
+        return wearPlugin;
+    }
+    public static WearPlugin initPlugin(Context ctx) {
+
+        if (wearPlugin == null) {
+            wearPlugin = new WearPlugin(ctx);
+        }
+
+        return wearPlugin;
+    }
+
     WearPlugin(Context ctx) {
         this.ctx = ctx;
         MainApp.bus().register(this);
@@ -105,6 +119,11 @@ public class WearPlugin implements PluginBase {
         if (type == GENERAL) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_wear;
+    }
+
     private void sendDataToWatch(boolean status, boolean basals, boolean bgValue) {
         if (isEnabled(getType())) { //only start service when this plugin is enabled
 

app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java

@@ -47,7 +47,11 @@ public class StatuslinePlugin implements PluginBase {
 
     private static StatuslinePlugin statuslinePlugin;
 
-    public static StatuslinePlugin getPlugin(Context ctx) {
+    public static StatuslinePlugin getPlugin() {
+        return statuslinePlugin;
+    }
+
+    public static StatuslinePlugin initPlugin(Context ctx) {
 
         if (statuslinePlugin == null) {
             statuslinePlugin = new StatuslinePlugin(ctx);
@@ -138,6 +142,11 @@ public class StatuslinePlugin implements PluginBase {
         // do nothing, no gui
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_xdripstatus;
+    }
+
 
     private void sendStatus() {
 

app/src/main/res/layout/configbuilder_simpleitem.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
@@ -20,6 +21,16 @@
         android:layout_weight="1"
         android:text="ConfigBuilder plugin text" />
 
+    <ImageView
+        android:id="@+id/configbuilder_simpleitem_settings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginLeft="10dp"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        app:srcCompat="@drawable/ic_settings" />
+
     <CheckBox
         android:id="@+id/configbuilder_simpleitem_checkboxvisible"
         android:layout_width="wrap_content"

app/src/main/res/xml/pref_openapsama.xml

@@ -5,6 +5,18 @@
         android:key="openapsama"
         android:title="@string/openapsama">
 
+        <EditTextPreference
+            android:defaultValue="1"
+            android:key="openapsma_max_basal"
+            android:numeric="decimal"
+            android:dialogMessage="@string/openapsma_maxbasal_summary"
+            android:title="@string/openapsma_maxbasal_title" />
+        <EditTextPreference
+            android:defaultValue="1.5"
+            android:key="openapsma_max_iob"
+            android:numeric="decimal"
+            android:dialogMessage="@string/openapsma_maxiob_summary"
+            android:title="@string/openapsma_maxiob_title" />
         <SwitchPreference
             android:defaultValue="false"
             android:key="openapsama_useautosens"