Merge pull request #226 from nightscout/dev

2.8.1.1
nightscout · Jan 12, 2021 · 9c53034 · 9c53034
2 parents a40df15 + a3cbb66
commit 9c53034
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -120,7 +120,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.8.1"
+        version "2.8.1.1"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
@@ -201,9 +201,11 @@ public void preprocessPreferences(@NotNull PreferenceFragmentCompat preferenceFr
             SwitchPreference key_ns_autobackfill = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_autobackfill));
             if (key_ns_autobackfill != null) key_ns_autobackfill.setVisible(false);
             SwitchPreference key_ns_create_announcements_from_errors = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_create_announcements_from_errors));
-            if (key_ns_create_announcements_from_errors != null) key_ns_create_announcements_from_errors.setVisible(false);
+            if (key_ns_create_announcements_from_errors != null)
+                key_ns_create_announcements_from_errors.setVisible(false);
             SwitchPreference key_ns_create_announcements_from_carbs_req = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_create_announcements_from_carbs_req));
-            if (key_ns_create_announcements_from_carbs_req != null) key_ns_create_announcements_from_carbs_req.setVisible(false);
+            if (key_ns_create_announcements_from_carbs_req != null)
+                key_ns_create_announcements_from_carbs_req.setVisible(false);
             SwitchPreference key_ns_upload_only = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_upload_only));
             if (key_ns_upload_only != null) {
                 key_ns_upload_only.setVisible(false);
@@ -214,7 +216,8 @@ public void preprocessPreferences(@NotNull PreferenceFragmentCompat preferenceFr
         } else {
             // APS or pumpcontrol mode
             SwitchPreference key_ns_upload_only = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_ns_upload_only));
-            key_ns_upload_only.setVisible(buildHelper.isEngineeringMode());
+            if (key_ns_upload_only != null)
+                key_ns_upload_only.setVisible(buildHelper.isEngineeringMode());
         }
     }