From 437bb0d65d25b485f59d28df3a9ea25b98f1543e Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 13 Oct 2022 15:26:49 +0200 Subject: [PATCH] AndroidAPS - AAPS, NSClient -> AAPSClient --- CONTRIBUTING.md | 2 +- README.md | 4 +- app/build.gradle | 18 ++--- app/google-services.json | 66 +++++++++++++++++-- .../androidaps/plugins/aps/loop/LoopPlugin.kt | 2 +- .../plugins/pump/virtual/VirtualPumpPlugin.kt | 2 +- .../utils/buildHelper/ConfigImpl.kt | 2 +- app/src/main/res/values/exam.xml | 66 +++++++++---------- app/src/main/res/values/objectives.xml | 4 +- app/src/main/res/values/strings.xml | 24 +++---- .../nightscout/androidaps/TestPumpPlugin.kt | 2 +- .../actions/ActionCarePortalEvent.kt | 2 +- .../general/automation/TestPumpPlugin.kt | 2 +- .../actions/ActionCarePortalEventTest.kt | 2 +- core/android_module_dependencies.gradle | 4 +- .../plugins/common/ManufacturerType.kt | 2 +- .../plugins/pump/common/defs/PumpType.kt | 6 +- core/src/main/res/values/strings.xml | 6 +- .../nightscout/androidaps/TestPumpPlugin.kt | 2 +- .../nightscout/androidaps/TestPumpPlugin.kt | 2 +- .../database/entities/GlucoseValue.kt | 6 +- ...sertTherapyEventAnnouncementTransaction.kt | 2 +- .../pump/insight/LocalInsightPlugin.java | 2 +- .../InsightConnectionService.java | 2 +- .../general/openhumans/OpenHumansUploader.kt | 2 +- openhumans/src/main/res/values/strings.xml | 2 +- .../nightscout/shared/logging/AAPSLogger.kt | 2 +- wear/build.gradle | 8 +-- 28 files changed, 152 insertions(+), 94 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ca2f66f536..2f474bf11f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ This document speciffy hints and good practices for source code contributions. -AndroidAPS is community effort and all contributions are welcome! If you wish help us improving AndroidAPS - please read and try to adhere to +AndroidAPS is community effort and all contributions are welcome! If you wish help us improving AAPS - please read and try to adhere to this guidelines, to make the development and process of change aproval as smooth as possible :) General rules diff --git a/README.md b/README.md index e481264d4a..c319d72528 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# AndroidAPS +# AAPS * Check the wiki: https://wiki.aaps.app -* Everyone who’s been looping with AndroidAPS needs to fill out the form after 3 days of looping https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1 +* Everyone who’s been looping with AAPS needs to fill out the form after 3 days of looping https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1 [![Support Server](https://img.shields.io/discord/629952586895851530.svg?label=Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.gg/4fQUWHZ4Mw) diff --git a/app/build.gradle b/app/build.gradle index 1fa1442669..41a2ca653c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,7 +119,7 @@ android { full { applicationId "info.nightscout.androidaps" dimension "standard" - resValue "string", "app_name", "AndroidAPS" + resValue "string", "app_name", "AAPS" versionName version manifestPlaceholders = [ appIcon : "@mipmap/ic_launcher", @@ -136,21 +136,21 @@ android { appIconRound: "@null" ] } - nsclient { - applicationId "info.nightscout.nsclient" + aapsclient { + applicationId "info.nightscout.aapsclient" dimension "standard" - resValue "string", "app_name", "NSClient" - versionName version + "-nsclient" + resValue "string", "app_name", "AAPSClient" + versionName version + "-aapsclient" manifestPlaceholders = [ appIcon : "@mipmap/ic_yellowowl", appIconRound: "@null" ] } - nsclient2 { - applicationId "info.nightscout.nsclient2" + aapsclient2 { + applicationId "info.nightscout.aapsclient2" dimension "standard" - resValue "string", "app_name", "NSClient2" - versionName version + "-nsclient" + resValue "string", "app_name", "AAPSClient2" + versionName version + "-aapsclient" manifestPlaceholders = [ appIcon : "@mipmap/ic_yellowowl", appIconRound: "@null" diff --git a/app/google-services.json b/app/google-services.json index 507c792c93..11c7efe359 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -6,6 +6,64 @@ "storage_bucket": "androidaps-c34f8.appspot.com" }, "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:477603612366:android:56b8fa16651fb8dbfcb29f", + "android_client_info": { + "package_name": "info.nightscout.aapsclient" + } + }, + "oauth_client": [ + { + "client_id": "477603612366-a925drvlvs7qn7gt73r585erbqto8c79.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyD9HRtJJsnk_SbAMAuvudSua2vEm3j3430" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "477603612366-a925drvlvs7qn7gt73r585erbqto8c79.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:477603612366:android:8e749a9253635bcafcb29f", + "android_client_info": { + "package_name": "info.nightscout.aapsclient2" + } + }, + "oauth_client": [ + { + "client_id": "477603612366-a925drvlvs7qn7gt73r585erbqto8c79.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyD9HRtJJsnk_SbAMAuvudSua2vEm3j3430" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "477603612366-a925drvlvs7qn7gt73r585erbqto8c79.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, { "client_info": { "mobilesdk_app_id": "1:477603612366:android:aef229914e3e5448", @@ -21,7 +79,7 @@ ], "api_key": [ { - "current_key": "AIzaSyDcZpDRMaGjdhihXp531cVYM6LkEL8KbgM" + "current_key": "AIzaSyD9HRtJJsnk_SbAMAuvudSua2vEm3j3430" } ], "services": { @@ -50,7 +108,7 @@ ], "api_key": [ { - "current_key": "AIzaSyDcZpDRMaGjdhihXp531cVYM6LkEL8KbgM" + "current_key": "AIzaSyD9HRtJJsnk_SbAMAuvudSua2vEm3j3430" } ], "services": { @@ -79,7 +137,7 @@ ], "api_key": [ { - "current_key": "AIzaSyDcZpDRMaGjdhihXp531cVYM6LkEL8KbgM" + "current_key": "AIzaSyD9HRtJJsnk_SbAMAuvudSua2vEm3j3430" } ], "services": { @@ -108,7 +166,7 @@ ], "api_key": [ { - "current_key": "AIzaSyDcZpDRMaGjdhihXp531cVYM6LkEL8KbgM" + "current_key": "AIzaSyD9HRtJJsnk_SbAMAuvudSua2vEm3j3430" } ], "services": { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt index 0eb6130f3e..f2bcfc92f4 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt @@ -721,6 +721,6 @@ class LoopPlugin @Inject constructor( companion object { - private const val CHANNEL_ID = "AndroidAPS-OpenLoop" + private const val CHANNEL_ID = "AAPS-OpenLoop" } } \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt index e0aec7e6e8..e60b7547be 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt @@ -378,7 +378,7 @@ open class VirtualPumpPlugin @Inject constructor( return pump } - override fun manufacturer(): ManufacturerType = pumpDescription.pumpType.manufacturer ?: ManufacturerType.AndroidAPS + override fun manufacturer(): ManufacturerType = pumpDescription.pumpType.manufacturer ?: ManufacturerType.AAPS override fun model(): PumpType = pumpDescription.pumpType diff --git a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/ConfigImpl.kt b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/ConfigImpl.kt index 1f8ee377c5..a65522a6fb 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/ConfigImpl.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/ConfigImpl.kt @@ -11,7 +11,7 @@ class ConfigImpl @Inject constructor() : Config { override val SUPPORTEDNSVERSION = 1002 // 0.10.00 override val APS = BuildConfig.FLAVOR == "full" - override val NSCLIENT = BuildConfig.FLAVOR == "nsclient" || BuildConfig.FLAVOR == "nsclient2" + override val NSCLIENT = BuildConfig.FLAVOR == "aapsclient" || BuildConfig.FLAVOR == "aapsclient2" override val PUMPCONTROL = BuildConfig.FLAVOR == "pumpcontrol" override val PUMPDRIVERS = BuildConfig.FLAVOR == "full" || BuildConfig.FLAVOR == "pumpcontrol" override val FLAVOR = BuildConfig.FLAVOR diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml index ff2a4f9d5d..6ef4c697a6 100644 --- a/app/src/main/res/values/exam.xml +++ b/app/src/main/res/values/exam.xml @@ -5,12 +5,12 @@ You should set the value for DIA in your profile. The minimum allowed value is 5 hours. https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin - If you are satisfied that the value for DIA that you used in your pump prior to AndroidAPS worked well, there is no need to change this when you start looping. + If you are satisfied that the value for DIA that you used in your pump prior to AAPS worked well, there is no need to change this when you start looping. You should determine for yourself the appropriate value for DIA. Hypo Temp-Target What is primary reason to set a hypo temp target? To correct for hypos caused by incorrect basal rate settings. - To prevent AndroidAPS from overcorrecting for a blood glucose rise caused by the fast acting carbs used to treat a hypo. + To prevent AAPS from overcorrecting for a blood glucose rise caused by the fast acting carbs used to treat a hypo. To correct for a hypo induced as a result of exercise. To prevent blood glucose from going low if there is already a 0% temporary basal rate running. https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html @@ -18,15 +18,15 @@ Topic: Offline Profile NS Profile can be used, but not configured. https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile - Reasons for applying "Disconnect pump" in AndroidAPS + Reasons for applying "Disconnect pump" in AAPS What should be done when disconnecting the pump? This is unnecessary as insulin will not be delivered if the pump is physically disconnected. - It prevents AndroidAPS from accounting for insulin that was not delivered whilst the pump is physically disconnected.  + It prevents AAPS from accounting for insulin that was not delivered whilst the pump is physically disconnected.  It will not stop insulin delivery if the pump remains connected. - It will send AndroidAPS into open loop mode. + It will send AAPS into open loop mode. https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings - AndroidAPS Settings - AndroidAPS Settings + AAPS Settings + AAPS Settings What are the best practices for backing up your settings? You do not need to export your settings provided that you make a note of them. Export your settings after you finish completing an objective. @@ -40,7 +40,7 @@ https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me Noisy CGM Readings What should be done if CGM data is noisy? - Do nothing - AndroidAPS will deal with it. + Do nothing - AAPS will deal with it. Disable the closed loop to avoid possible over or underdosing. Replace consistently noisy or inaccurate sensors. Verify that your CGM app provides smoothed data. @@ -71,7 +71,7 @@ Once set and validated, these values should not change over time. https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings Prerequisites - What is essential to set up and use AndroidAPS? + What is essential to set up and use AAPS? Validated profile information (Basal, IC, ISF, DIA). A computer with Android Studio installed and configured. A supported phone. @@ -86,25 +86,25 @@ A Smartwatch. A Supported CGM. Prerequisites - What is essential to set up and use AndroidAPS? + What is essential to set up and use AAPS? Validated information to set up a profile (ISF, I:C ratio, basal rates, DIA etc.). A compatible Android device (e.g. mobile/cell phone, full Android watch, or tablet). - AndroidAPS requires an internet connection in order to run in closed loop. + AAPS requires an internet connection in order to run in closed loop. A supported CGM and appropriate app to receive blood glucose values on the phone/device. https://androidaps.readthedocs.io/en/latest/EN/Module/module.html - Updating AndroidAPS + Updating AAPS Check all correct answers. You need to have Git installed and configured on your computer. - When updated versions of AndroidAPS are released, the earlier versions may be remotely limited after a specified time. + When updated versions of AAPS are released, the earlier versions may be remotely limited after a specified time. You should save and note the location of your keystore and use the same signing key for updates as for your previous installation. Never update if the system is working well. If you have difficulty building the apk, you can install an apk that has been built by a friend. https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch Troubleshooting - Where can you look for help with AndroidAPS? - You can ask for advice in the AndroidAPS Users Facebook group. - You should read (and re-read) the AndroidAPS documentation. - You can ask for advice and log technical problems or issues in the AndroidAPS Discord. + Where can you look for help with AAPS? + You can ask for advice in the AAPS Users Facebook group. + You should read (and re-read) the AAPS documentation. + You can ask for advice and log technical problems or issues in the AAPS Discord. You should ask your diabetes clinic/endocrinologist. https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting https://www.facebook.com/groups/AndroidAPSUsers/ @@ -118,7 +118,7 @@ https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin Sensitivity Plugins Check all correct answers. - Sensitivity plugins allow AndroidAPS to adjust for temporary or short-lived changes in insulin sensitivity (for example hormonal changes or issues with absorption at the infusion site). + Sensitivity plugins allow AAPS to adjust for temporary or short-lived changes in insulin sensitivity (for example hormonal changes or issues with absorption at the infusion site). Sensitivity plugins provide the user with suggested changes to basal rates, I:C ratios and ISF that can be used to edit profile. Logging a cannula change will reset Autosens ratio back to 100%. Some of the plugin options have configurable time ranges that can be set by the user. @@ -128,14 +128,14 @@ What should you do if you’ve made an incorrect carb entry? Delete the incorrect entry in Treatments and enter the correct new carb value. Bolus with insulin using the infusion set prime menu. - Do nothing – AndroidAPS will make the appropriate adjustments. + Do nothing – AAPS will make the appropriate adjustments. Bolus with insulin using the Insulin (bolus) button in Overview. Insulin delivery/entry errors What should you do if you received less insulin than the pump history suggests e.g. due to an occlusion, a failed cannula or forgetting to reattach the pump after a shower?  Delete insulin data from Nightscout Careportal to remove it from the pump history. - Compare values in AndroidAPS and pump history (if pump supports this). + Compare values in AAPS and pump history (if pump supports this). Bolus a proportion of your calculated ‘missed’ insulin by either syringe/pen or using a prime. - Do nothing and allow AndroidAPS to correct any resulting high blood glucose level. + Do nothing and allow AAPS to correct any resulting high blood glucose level. Carbs on Board (COB) How changing ISF value affects COB calculation? Increasing ISF will take absorbing carbs a longer time @@ -157,28 +157,28 @@ Carb entry and boluses Only grams should be used for estimating and recording carbohydrates consumed. Carbohydrates consumed can be recorded using an appropriate exchange system (e.g. DAFNE "CHO" exchanges or European "Bread Units"). - AndroidAPS uses a dynamic model to estimate carb “decay” and calculate COB. + AAPS uses a dynamic model to estimate carb “decay” and calculate COB. If blood glucose levels are outside acceptable values (too low or too high) the bolus calculator can be used to provide suggestions for carb or insulin corrections. https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u e-carbs What could you use e-carbs (extended carbs) for? To schedule carbs in the future, possibly distributed over an interval (similar to an extended bolus distributing insulin over an interval). - For logging \'free\' exercise carbs you want to hide from AndroidAPS. - e-carbs (distributed in the future) can assist AndroidAPS in dealing with high fat/protein meals. + For logging \'free\' exercise carbs you want to hide from AAPS. + e-carbs (distributed in the future) can assist AAPS in dealing with high fat/protein meals. For logging rescue carbs you use to treat low blood glucose.  https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html Remote Monitoring - How can you monitor AndroidAPS (for example for your child) remotely? - NS Client app, Nightscout app and Nightscout webpage all allow you to follow AndroidAPS remotely. + How can you monitor AAPS (for example for your child) remotely? + AAPSClient app, Nightscout app and Nightscout webpage all allow you to follow AAPS remotely. Other apps (e.g. Dexcom follow, xDrip running in follow mode) allow you to follow some parameters (e.g. blood glucose/sensor values) remotely, but use different algorithms so may have inaccurate IOB or COB values. - To follow AndroidAPS remotely, both devices must have internet access (e.g. via Wi-Fi or mobile/cellular network data). - NS Client used as a remote follower will both monitor and provide full control of AndroidAPS. + To follow AAPS remotely, both devices must have internet access (e.g. via Wi-Fi or mobile/cellular network data). + AAPSClient used as a remote follower will both monitor and provide full control of AAPS. https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html Insulin Sensitivity Factor (ISF) Raising ISF values will lead to more insulin delivery to cover a specific amount of carbs. Reducing ISF values lead to more insulin delivery to correct for an above target blood glucose. Raising or lowering ISF has no effect on insulin delivery when blood glucose levels are below target. - ISF should be entered in your AndroidAPS Preferences. + ISF should be entered in your AAPS Preferences. Changing the ISF value in your profile is enough to apply the change. https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html @@ -205,7 +205,7 @@ Target blood glucose will be unchanged. ISF will be 20% higher. Profile Switching - If you get up 2 hours earlier than usual, how should you notify AndroidAPS of the change in your schedule? + If you get up 2 hours earlier than usual, how should you notify AAPS of the change in your schedule? Initiate a profile switch with a timeshift of 2 Initiate a profile switch with a timeshift of -2 Set an eating soon temporary target. @@ -213,7 +213,7 @@ https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift Changes to profiles Basal rates, ISF, I:C ratios, etc., should be set in profiles. - Activating changes to your Nightscout Profile requires your AndroidAPS phone to have an internet connection. + Activating changes to your Nightscout Profile requires your AAPS phone to have an internet connection. Editing profiles to change values is sufficient to enact any changes made. Multiple profiles can be set up and selected to accommodate changing circumstances (e.g. hormonal changes, shift working, weekdays/weekend lifestyle). https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy @@ -224,7 +224,7 @@ Facebook Other Medication. Please read the statement below and then check the box to accept the declaration. - AndroidAPS reduces basal rates or suspends insulin delivery to raise blood sugar. Drugs in the class SGLT2 inhibitors (gliflozins) can prevent increases in blood glucose and therefore can produce a dangerous insulin deficiency leading to DKA. -\nCommon brand names are: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nI hereby promise that I will not take such drugs when using AndroidAPS or will deactivate the loop before using such drugs. + AAPS reduces basal rates or suspends insulin delivery to raise blood sugar. Drugs in the class SGLT2 inhibitors (gliflozins) can prevent increases in blood glucose and therefore can produce a dangerous insulin deficiency leading to DKA. +\nCommon brand names are: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nI hereby promise that I will not take such drugs when using AAPS or will deactivate the loop before using such drugs. diff --git a/app/src/main/res/values/objectives.xml b/app/src/main/res/values/objectives.xml index 7c1c4486a4..8e6823e3ef 100644 --- a/app/src/main/res/values/objectives.xml +++ b/app/src/main/res/values/objectives.xml @@ -37,8 +37,8 @@ Pump status available in NS Manual enacts Accomplished: %1$s - Learn how to control AndroidAPS - Perform different actions in AndroidAPS + Learn how to control AAPS + Perform different actions in AAPS Set profile 90% for 10 min (Long-press profile name on Overview) Simulate shower. Disconnect pump for 1h (Long-press on Open Loop) ... and reconnect back the same way diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 069cdb3e2f..cc57e3e06f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -93,9 +93,9 @@ Downloads BG data from Nightscout Receive BG values from xDrip+. Saves all treatments that were made - Monitor and control AndroidAPS using your WearOS watch. + Monitor and control AAPS using your WearOS watch. Show information about your loop on your xDrip+ watchface. - Remote control AndroidAPS using SMS commands. + Remote control AAPS using SMS commands. Insulin: Carbs: IOB: @@ -132,9 +132,9 @@ Treatments Virtual Pump Pump - Which pump would you like to use with AndroidAPS? + Which pump would you like to use with AAPS? Profile - Which profile should AndroidAPS use? + Which profile should AAPS use? APS Which APS algorithm should make therapy adjustments? General @@ -142,7 +142,7 @@ Which constraints are applied? Constraints Loop - Use this to activate AndroidAPS\' loop integration. + Use this to activate AAPS\' loop integration. APS After processed constraints Temp basal set by pump @@ -159,7 +159,7 @@ Basal: Change your input! BG Source - Where should AndroidAPS gain it\'s data from? + Where should AAPS gain it\'s data from? xDrip+ APS Mode Closed Loop @@ -516,7 +516,7 @@ Sensitivity WeightedAverage Not all profiles loaded! Values not stored! - Enable broadcasts to other apps (like xDrip+). Do not enable if you have more than one instance of AAPS or NSClient installed! + Enable broadcasts to other apps (like xDrip+). Do not enable if you have more than one instance of AAPS or AAPSClient installed! Enable local Broadcasts. OpenAPS SMB Dynamic ISF @@ -775,7 +775,7 @@ Welcome to setup wizard. It will guide you through the setup process\n Read status Skip setup wizard - Press the button below to enable AndroidAPS to suggest/make basal changes + Press the button below to enable AAPS to suggest/make basal changes startupwizard_processed Sensitivity plugin is used for sensitivity detection and COB calculation. For more info visit: https://androidaps.readthedocs.io/en/latest/Configuration/Sensitivity-detection-and-COB.html @@ -823,7 +823,7 @@ Remove items Sort items Stored settings found - Attention: If you activate and connect to a hardware pump, AndroidAPS will copy the basal settings from the profile to the pump, overwriting the existing basal rate stored on the pump. Make sure you have the correct basal setting in AndroidAPS. If you are not sure or don\'t want to overwrite the basal settings on your pump, press cancel and repeat switching to the pump at a later time. + Attention: If you activate and connect to a hardware pump, AAPS will copy the basal settings from the profile to the pump, overwriting the existing basal rate stored on the pump. Make sure you have the correct basal setting in AAPS. If you are not sure or don\'t want to overwrite the basal settings on your pump, press cancel and repeat switching to the pump at a later time. Treatment data incomplete Maintenance Settings Email recipient @@ -950,7 +950,7 @@ ID: Submit Most common profile: - Note: Only data visible on this screen will be anonymously uploaded. ID is assigned to this installation of AndroidAPS. You can submit data again if your main profile get changed but let it running at least for a week to make result visible in time in range. Your help is appreciated. + Note: Only data visible on this screen will be anonymously uploaded. ID is assigned to this installation of AAPS. You can submit data again if your main profile get changed but let it running at least for a week to make result visible in time in range. Your help is appreciated. Invalid age entry Invalid weight entry Invalid % entry @@ -1004,7 +1004,7 @@ Are you sure you want to copy OTP secret to clipboard?\n\nYou may only need that if your authenticator app have issues scanning QRCode, you want to enter it manually or you want to configure hardware OTP token using dedicated app. OTP secret (in Base32 format) exported and copied into clipboard. Paste it into authenticator or hardware OTP burner! 1. Install Authenticator - 2. Scan code to setup AndroidAPS OTP codes + 2. Scan code to setup AAPS OTP codes 3. Test One-Time-Password Reset Authenticators On each follower phone install Authenticator app that support RFC 6238 TOTP tokens. Popular free apps are:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator @@ -1228,7 +1228,7 @@ Above Show loop records Hide loop records - AndroidAPS widget + AAPS widget Configure opacity Loop status Graph scale diff --git a/app/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt b/app/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt index 64b0d80b45..c533893b3f 100644 --- a/app/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt +++ b/app/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt @@ -57,7 +57,7 @@ class TestPumpPlugin(val injector: HasAndroidInjector) : Pump { override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult = PumpEnactResult(injector).success(true) override fun cancelExtendedBolus(): PumpEnactResult = PumpEnactResult(injector).success(true) override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject = JSONObject() - override fun manufacturer(): ManufacturerType = ManufacturerType.AndroidAPS + override fun manufacturer(): ManufacturerType = ManufacturerType.AAPS override fun model(): PumpType = PumpType.GENERIC_AAPS override fun serialNumber(): String = "1" override fun shortStatus(veryShort: Boolean): String = "" diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEvent.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEvent.kt index d5f9e18caa..47d6679712 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEvent.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEvent.kt @@ -55,7 +55,7 @@ class ActionCarePortalEvent(injector: HasAndroidInjector) : Action(injector) { @DrawableRes override fun icon(): Int = cpEvent.value.drawableRes override fun doAction(callback: Callback) { - val enteredBy = sp.getString("careportal_enteredby", "AndroidAPS") + val enteredBy = sp.getString("careportal_enteredby", "AAPS") val eventTime = dateUtil.now() val therapyEvent = TherapyEvent( timestamp = eventTime, diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestPumpPlugin.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestPumpPlugin.kt index 134ffc7446..33a9e512c7 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestPumpPlugin.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestPumpPlugin.kt @@ -68,7 +68,7 @@ class TestPumpPlugin(pluginDescription: PluginDescription, override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult = PumpEnactResult(injector).success(true) override fun cancelExtendedBolus(): PumpEnactResult = PumpEnactResult(injector).success(true) override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject = JSONObject() - override fun manufacturer(): ManufacturerType = ManufacturerType.AndroidAPS + override fun manufacturer(): ManufacturerType = ManufacturerType.AAPS override fun model(): PumpType = PumpType.GENERIC_AAPS override fun serialNumber(): String = "1" override fun shortStatus(veryShort: Boolean): String = "" diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEventTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEventTest.kt index 6d7ed68b7d..430ae5e11c 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEventTest.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEventTest.kt @@ -21,7 +21,7 @@ class ActionCarePortalEventTest : ActionsTestBase() { @Before fun setup() { - `when`(sp.getString(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn("AndroidAPS") + `when`(sp.getString(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn("AAPS") `when`( rh.gs( ArgumentMatchers.eq(R.string.careportal_note_message), diff --git a/core/android_module_dependencies.gradle b/core/android_module_dependencies.gradle index 0329267ab3..a1912540c7 100644 --- a/core/android_module_dependencies.gradle +++ b/core/android_module_dependencies.gradle @@ -8,10 +8,10 @@ android { pumpcontrol { dimension "standard" } - nsclient { + aapsclient { dimension "standard" } - nsclient2 { + aapsclient2 { dimension "standard" } } diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt b/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt index a7ac2b5596..49eaccf0d7 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt @@ -1,7 +1,7 @@ package info.nightscout.androidaps.plugins.common enum class ManufacturerType(val description: String) { - AndroidAPS("AndroidAPS"), + AAPS("AAPS"), Medtronic("Medtronic"), Sooil("SOOIL"), Tandem("Tandem"), diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt index 0a9d28d76c..f02ba913f4 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt @@ -13,7 +13,7 @@ enum class PumpType { GENERIC_AAPS( description = "Generic AAPS", - manufacturer = ManufacturerType.AndroidAPS, + manufacturer = ManufacturerType.AAPS, model = "VirtualPump", bolusSize = 0.1, specialBolusSize = null, @@ -328,7 +328,7 @@ enum class PumpType { ), MDI( description = "MDI", - manufacturer = ManufacturerType.AndroidAPS, + manufacturer = ManufacturerType.AAPS, bolusSize = 0.5, model = "MDI", tbrSettings = DoseSettings(1.0, 15, 24 * 60, 0.0, 500.0), @@ -339,7 +339,7 @@ enum class PumpType { // Not real pump. Used for User as a source USER( description = "USER", - manufacturer = ManufacturerType.AndroidAPS, + manufacturer = ManufacturerType.AAPS, model = "USER", tbrSettings = DoseSettings(1.0, 15, 24 * 60, 0.0, 500.0), extendedBolusSettings = DoseSettings(0.1, 15, 12 * 60, 0.1), diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 56ed54ace4..7fad7686c7 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -94,7 +94,7 @@ Disconnected Disconnecting Waiting for disconnection - AndroidAPS started + AAPS started %1$.1f U %1$.2f U %1$+.2f U @@ -379,7 +379,7 @@ Version %1$s expire on %2$s - Please reboot your phone or restart AndroidAPS from the System Settings \notherwise Android APS will not have logging (important to track and verify that the algorithms are working correctly)! + Please reboot your phone or restart AAPS from the System Settings \notherwise Android APS will not have logging (important to track and verify that the algorithms are working correctly)! M @@ -500,7 +500,7 @@ »%1$s« is out of hard limits »%1$s« %2$.2f is out of hard limits Basal value - NSClient version doesn\'t match AndroidAPS version. Please update. + AAPSClient version doesn\'t match AAPS version. Please update. BOLUS %1$.2f U diff --git a/core/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt b/core/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt index 64b0d80b45..c533893b3f 100644 --- a/core/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt +++ b/core/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt @@ -57,7 +57,7 @@ class TestPumpPlugin(val injector: HasAndroidInjector) : Pump { override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult = PumpEnactResult(injector).success(true) override fun cancelExtendedBolus(): PumpEnactResult = PumpEnactResult(injector).success(true) override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject = JSONObject() - override fun manufacturer(): ManufacturerType = ManufacturerType.AndroidAPS + override fun manufacturer(): ManufacturerType = ManufacturerType.AAPS override fun model(): PumpType = PumpType.GENERIC_AAPS override fun serialNumber(): String = "1" override fun shortStatus(veryShort: Boolean): String = "" diff --git a/danar/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt b/danar/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt index 64b0d80b45..c533893b3f 100644 --- a/danar/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt +++ b/danar/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt @@ -57,7 +57,7 @@ class TestPumpPlugin(val injector: HasAndroidInjector) : Pump { override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult = PumpEnactResult(injector).success(true) override fun cancelExtendedBolus(): PumpEnactResult = PumpEnactResult(injector).success(true) override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject = JSONObject() - override fun manufacturer(): ManufacturerType = ManufacturerType.AndroidAPS + override fun manufacturer(): ManufacturerType = ManufacturerType.AAPS override fun model(): PumpType = PumpType.GENERIC_AAPS override fun serialNumber(): String = "1" override fun shortStatus(veryShort: Boolean): String = "" diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/GlucoseValue.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/GlucoseValue.kt index 5906caad5b..7a0e008e49 100644 --- a/database/src/main/java/info/nightscout/androidaps/database/entities/GlucoseValue.kt +++ b/database/src/main/java/info/nightscout/androidaps/database/entities/GlucoseValue.kt @@ -84,9 +84,9 @@ data class GlucoseValue( } enum class SourceSensor(val text: String) { - DEXCOM_NATIVE_UNKNOWN("AndroidAPS-Dexcom"), - DEXCOM_G6_NATIVE("AndroidAPS-DexcomG6"), - DEXCOM_G5_NATIVE("AndroidAPS-DexcomG5"), + DEXCOM_NATIVE_UNKNOWN("AAPS-Dexcom"), + DEXCOM_G6_NATIVE("AAPS-DexcomG6"), + DEXCOM_G5_NATIVE("AAPS-DexcomG5"), DEXCOM_G4_WIXEL("Bluetooth Wixel"), DEXCOM_G4_XBRIDGE("xBridge Wixel"), DEXCOM_G4_NATIVE("G4 Share Receiver"), diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/InsertTherapyEventAnnouncementTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/InsertTherapyEventAnnouncementTransaction.kt index 990b8b1c40..fe9f4196f7 100644 --- a/database/src/main/java/info/nightscout/androidaps/database/transactions/InsertTherapyEventAnnouncementTransaction.kt +++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/InsertTherapyEventAnnouncementTransaction.kt @@ -13,7 +13,7 @@ class InsertTherapyEventAnnouncementTransaction( timestamp = System.currentTimeMillis(), type = TherapyEvent.Type.ANNOUNCEMENT, duration = 0, note = error, - enteredBy = "AndroidAPS", + enteredBy = "AAPS", glucose = null, glucoseType = null, glucoseUnit = TherapyEvent.GlucoseUnit.MGDL, diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index 67bc30357d..772a3282c0 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -147,7 +147,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai private final InsightDbHelper insightDbHelper; private final PumpSync pumpSync; - public static final String ALERT_CHANNEL_ID = "AndroidAPS-InsightAlert"; + public static final String ALERT_CHANNEL_ID = "AAPS-InsightAlert"; private final PumpDescription pumpDescription; private InsightAlertService alertService; diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java index f394dad0bd..d121480611 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/connection_service/InsightConnectionService.java @@ -267,7 +267,7 @@ public class InsightConnectionService extends DaggerService implements Connectio } pairingDataStorage = new PairingDataStorage(this); state = pairingDataStorage.isPaired() ? InsightState.DISCONNECTED : InsightState.NOT_PAIRED; - wakeLock = ((PowerManager) getSystemService(POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:InsightConnectionService"); + wakeLock = ((PowerManager) getSystemService(POWER_SERVICE)).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AAPS:InsightConnectionService"); } private void setState(InsightState state) { diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt index 26d5657f8e..f55c69216f 100644 --- a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt +++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt @@ -519,7 +519,7 @@ class OpenHumansUploader @Inject internal constructor( val metaData = OpenHumansAPI.FileMetadata( tags = tags, - description = "AndroidAPS Database Upload", + description = "AAPS Database Upload", md5 = MessageDigest.getInstance("MD5").digest(bytes).toHexString(), creationDate = uploadDate ) diff --git a/openhumans/src/main/res/values/strings.xml b/openhumans/src/main/res/values/strings.xml index f07d7377a6..496a82e868 100644 --- a/openhumans/src/main/res/values/strings.xml +++ b/openhumans/src/main/res/values/strings.xml @@ -13,7 +13,7 @@ open_humans Uploading to Open Humans… Open Humans Notifications - AndroidAPS is uploading to Open Humans. This may take a while. + AAPS is uploading to Open Humans. This may take a while. You have been signed out of Open Humans Click here to sign in again if this wasn\'t on purpose. Upload now diff --git a/shared/src/main/java/info/nightscout/shared/logging/AAPSLogger.kt b/shared/src/main/java/info/nightscout/shared/logging/AAPSLogger.kt index 2eaf448b45..436849b461 100644 --- a/shared/src/main/java/info/nightscout/shared/logging/AAPSLogger.kt +++ b/shared/src/main/java/info/nightscout/shared/logging/AAPSLogger.kt @@ -23,7 +23,7 @@ interface AAPSLogger { // These are variants of the calls above that allow for explicitly // specifying the exact logging location. They are primarily meant - // as a way to integrate other logging infrastructures into AndroidAPS, + // as a way to integrate other logging infrastructures into AAPS, // and typically aren't practical to use directly for logging in code. fun debug(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String) fun info(className: String, methodName: String, lineNumber: Int, tag: LTag, message: String) diff --git a/wear/build.gradle b/wear/build.gradle index ec41997972..b8c093b23f 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -70,14 +70,14 @@ android { versionName version + "-pumpcontrol" } nsclient { - applicationId "info.nightscout.nsclient" + applicationId "info.nightscout.aapsclient" dimension "standard" - versionName version + "-nsclient" + versionName version + "-aapsclient" } nsclient2 { - applicationId "info.nightscout.nsclient2" + applicationId "info.nightscout.aapsclient2" dimension "standard" - versionName version + "-nsclient" + versionName version + "-aapsclient" } } namespace 'info.nightscout.androidaps'