diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt index eae9da8d40..043cc10b06 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt +++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt @@ -25,6 +25,8 @@ import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.configBuilder.PluginStore import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils +import info.nightscout.androidaps.plugins.general.overview.notifications.Notification +import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore import info.nightscout.androidaps.receivers.BTReceiver import info.nightscout.androidaps.receivers.ChargingStateReceiver import info.nightscout.androidaps.receivers.KeepAliveReceiver.KeepAliveManager @@ -33,6 +35,7 @@ import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver import info.nightscout.androidaps.services.AlarmSoundServiceHelper import info.nightscout.androidaps.utils.ActivityMonitor import info.nightscout.androidaps.utils.DateUtil +import info.nightscout.androidaps.utils.buildHelper.BuildHelper import info.nightscout.androidaps.utils.locale.LocaleHelper import info.nightscout.androidaps.utils.protection.PasswordCheck import info.nightscout.androidaps.utils.sharedPreferences.SP @@ -55,6 +58,7 @@ class MainApp : DaggerApplication() { @Inject lateinit var versionCheckersUtils: VersionCheckerUtils @Inject lateinit var sp: SP @Inject lateinit var config: Config + @Inject lateinit var buildHelper: BuildHelper @Inject lateinit var configBuilder: ConfigBuilder @Inject lateinit var keepAliveManager: KeepAliveManager @Inject lateinit var plugins: List<@JvmSuppressWildcards PluginBase> @@ -65,6 +69,7 @@ class MainApp : DaggerApplication() { @Inject lateinit var uel: UserEntryLogger @Inject lateinit var passwordCheck: PasswordCheck @Inject lateinit var alarmSoundServiceHelper: AlarmSoundServiceHelper + @Inject lateinit var notificationStore: NotificationStore override fun onCreate() { super.onCreate() @@ -99,8 +104,11 @@ class MainApp : DaggerApplication() { aapsLogger.debug("Remote: " + BuildConfig.REMOTE) registerLocalBroadcastReceiver() - //trigger here to see the new version on app start after an update + // trigger here to see the new version on app start after an update versionCheckersUtils.triggerCheckVersion() + // check if identification is set + if (buildHelper.isDev() && sp.getStringOrNull(R.string.key_email_for_crash_report, null).isNullOrBlank()) + notificationStore.add(Notification(Notification.IDENTIFICATION_NOT_SET, getString(R.string.identification_not_set), Notification.INFO)) // Register all tabs in app here pluginStore.plugins = plugins diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 8cf2eab1ec..d9d0049edd 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -331,6 +331,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList updateSensitivity("onResume") updateGraph("onResume") updatePumpStatus("onResume") + updateNotification("onResume") } @Synchronized diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index db8266abdb..43382b5de7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1083,7 +1083,7 @@ Cannula User entry Use values of your largest food you usually eat\n - This email address will attached to crash reports so we can contact you in urgent cases. It\'s optional. + This identification will attached to crash reports so we can contact you in urgent cases. It\'s optional. Email address Privacy setting You can provide optional email address if you want to be notified about app crashes. This is not an automated service. You will be contacted by developers in dangerous situations. @@ -1135,5 +1135,7 @@ Recalculated data used BG too close:\n%1$s\n%2$s last_processed_glunovo_timestamp + Identification (email, FB or Discord nick etc) + Identification not set in dev mode diff --git a/app/src/main/res/xml/pref_datachoices.xml b/app/src/main/res/xml/pref_datachoices.xml index 1e6423f3da..408296cae5 100644 --- a/app/src/main/res/xml/pref_datachoices.xml +++ b/app/src/main/res/xml/pref_datachoices.xml @@ -16,12 +16,11 @@ + android:title="@string/identification" /> diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt index 7dff52b472..bf5f8d2998 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt @@ -128,6 +128,7 @@ open class Notification { const val VERSION_EXPIRE = 74 const val INVALID_PROFILE_NOT_ACCEPTED = 75 const val MDT_INVALID_HISTORY_DATA = 76 + const val IDENTIFICATION_NOT_SET = 77 const val USER_MESSAGE = 1000