v1.3

auto/build.gradle

@@ -72,17 +72,17 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.15.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     implementation 'com.joaomgcd:taskerpluginlibrary:0.4.10'
     implementation project(path: ':common')
     implementation "androidx.car.app:app:1.4.0"
     implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "com.jaredrummler:colorpicker:1.1.0"
     implementation "androidx.media:media:1.7.0"
-    implementation 'androidx.work:work-runtime:2.9.1'
+    implementation 'androidx.work:work-runtime:2.10.0'
 }
 
 afterEvaluate {

auto/src/main/java/de/michelinside/glucodataauto/MainActivity.kt

@@ -1,7 +1,7 @@
 package de.michelinside.glucodataauto
 
+import android.annotation.SuppressLint
 import android.app.Activity
-import android.app.AlarmManager
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -46,8 +46,6 @@ import de.michelinside.glucodatahandler.common.utils.GitHubVersionChecker
 import de.michelinside.glucodatahandler.common.utils.Utils
 import de.michelinside.glucodatahandler.common.ui.Dialogs
 import de.michelinside.glucodatahandler.common.utils.TextToSpeechUtils
-import java.text.DateFormat
-import java.util.Date
 import de.michelinside.glucodatahandler.common.R as CR
 
 class MainActivity : AppCompatActivity(), NotifierInterface {
@@ -165,6 +163,7 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
 
             GlucoDataServiceAuto.startDataSync()
             versionChecker.checkVersion(1)
+            checkNewSettings()
         } catch (exc: Exception) {
             Log.e(LOG_ID, "onResume exception: " + exc.message.toString() )
         }
@@ -178,27 +177,12 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
                 return false
             }
         }
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            val alarmManager = this.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-            if (!alarmManager.canScheduleExactAlarms()) {
-                Log.i(LOG_ID, "Request exact alarm permission...")
-                startActivity(Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM))
-            }
-        }
         requestExactAlarmPermission()
         return true
     }
 
-    private fun canScheduleExactAlarms(): Boolean {
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            val alarmManager = this.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-            return alarmManager.canScheduleExactAlarms()
-        }
-        return true
-    }
-
     private fun requestExactAlarmPermission() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !canScheduleExactAlarms()) {
+        if (!Utils.canScheduleExactAlarms(this)) {
             Log.i(LOG_ID, "Request exact alarm permission...")
             val builder: AlertDialog.Builder = AlertDialog.Builder(this)
             builder
@@ -215,6 +199,49 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
         }
     }
 
+    private fun checkNewSettings() {
+        try {
+            if(!sharedPref.contains(Constants.SHARED_PREF_DISCLAIMER_SHOWN)) {
+                Dialogs.showOkDialog(this,
+                    CR.string.gdh_disclaimer_title,
+                    CR.string.gdh_disclaimer_message,
+                    null
+                )
+                with(sharedPref.edit()) {
+                    putString(Constants.SHARED_PREF_DISCLAIMER_SHOWN, BuildConfig.VERSION_NAME)
+                    apply()
+                }
+            }
+            if(!sharedPref.contains(Constants.SHARED_PREF_LIBRE_AUTO_ACCEPT_TOU)) {
+                if(sharedPref.getBoolean(Constants.SHARED_PREF_LIBRE_ENABLED, false)) {
+                    Dialogs.showOkCancelDialog(this,
+                        resources.getString(CR.string.src_cat_libreview),
+                        resources.getString(CR.string.src_libre_tou_message),
+                        { _, _ ->
+                            with(sharedPref.edit()) {
+                                putBoolean(Constants.SHARED_PREF_LIBRE_AUTO_ACCEPT_TOU, true)
+                                apply()
+                            }
+                        },
+                        { _, _ ->
+                            with(sharedPref.edit()) {
+                                putBoolean(Constants.SHARED_PREF_LIBRE_AUTO_ACCEPT_TOU, false)
+                                apply()
+                            }
+                        })
+                } else {
+                    with(sharedPref.edit()) {
+                        putBoolean(Constants.SHARED_PREF_LIBRE_AUTO_ACCEPT_TOU, true)
+                        apply()
+                    }
+                }
+            }
+
+        } catch (exc: Exception) {
+            Log.e(LOG_ID, "checkNewSettings exception: " + exc.message.toString() )
+        }
+    }
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         try {
             Log.v(LOG_ID, "onCreateOptionsMenu called")
@@ -311,6 +338,14 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
                     startActivity(mailIntent)
                     return true
                 }
+                R.id.action_google_groups -> {
+                    val browserIntent = Intent(
+                        Intent.ACTION_VIEW,
+                        Uri.parse(resources.getText(CR.string.google_gdh_group_url).toString())
+                    )
+                    startActivity(browserIntent)
+                    return true
+                }
                 R.id.action_facebook -> {
                     val browserIntent = Intent(
                         Intent.ACTION_VIEW,
@@ -355,6 +390,7 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
         return super.onOptionsItemSelected(item)
     }
 
+    @SuppressLint("SetTextI18n")
     private fun update() {
         try {
             Log.v(LOG_ID, "update values")
@@ -394,17 +430,42 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
 
     private fun updateConnectionsTable() {
         tableConnections.removeViews(1, maxOf(0, tableConnections.childCount - 1))
-        if (SourceStateData.lastState != SourceState.NONE)
-            tableConnections.addView(createRow(
-                SourceStateData.lastSource.resId,
-                SourceStateData.getStateMessage(this)))
+        if (SourceStateData.lastState != SourceState.NONE) {
+            val msg = SourceStateData.getStateMessage(this)
+            tableConnections.addView(
+                createRow(
+                    SourceStateData.lastSource.resId,
+                    msg
+                )
+            )
+            if(SourceStateData.lastState == SourceState.ERROR && SourceStateData.lastSource == DataSource.DEXCOM_SHARE) {
+                if (msg.contains("500:")) { // invalid password
+                    val us_account = sharedPref.getBoolean(Constants.SHARED_PREF_DEXCOM_SHARE_USE_US_URL, false)
+                    val browserIntent = Intent(
+                        Intent.ACTION_VIEW,
+                        Uri.parse(resources.getString(if(us_account)CR.string.dexcom_account_us_url else CR.string.dexcom_account_non_us_url))
+                    )
+                    val onClickListener = View.OnClickListener {
+                        startActivity(browserIntent)
+                    }
+                    tableConnections.addView(
+                        createRow(
+                            SourceStateData.lastSource.resId,
+                            resources.getString(if(us_account) CR.string.dexcom_share_check_us_account else CR.string.dexcom_share_check_non_us_account),
+                            onClickListener
+                        )
+                    )
+                }
+            }
+            tableConnections.addView(createRow(CR.string.request_timestamp, Utils.getUiTimeStamp(SourceStateData.lastStateTime)))
+        }
         tableConnections.addView(createRow(CR.string.pref_cat_android_auto, if (GlucoDataServiceAuto.connected) resources.getString(CR.string.connected_label) else resources.getString(CR.string.disconnected_label)))
         checkTableVisibility(tableConnections)
     }
 
     private fun updateNotesTable() {
         tableNotes.removeViews(1, maxOf(0, tableNotes.childCount - 1))
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !canScheduleExactAlarms()) {
+        if (!Utils.canScheduleExactAlarms(this)) {
             Log.w(LOG_ID, "Schedule exact alarm is not active!!!")
             val onClickListener = View.OnClickListener {
                 startActivity(Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM))
@@ -478,7 +539,7 @@ class MainActivity : AppCompatActivity(), NotifierInterface {
         if(ReceiveData.time > 0) {
             if (ReceiveData.isMmol)
                 tableDetails.addView(createRow(CR.string.info_label_raw, "${ReceiveData.rawValue} mg/dl"))
-            tableDetails.addView(createRow(CR.string.info_label_timestamp, DateFormat.getTimeInstance(DateFormat.DEFAULT).format(Date(ReceiveData.time))))
+            tableDetails.addView(createRow(CR.string.info_label_timestamp, Utils.getUiTimeStamp(ReceiveData.time)))
             if (ReceiveData.sensorID?.isNotEmpty() == true) {
                 tableDetails.addView(createRow(CR.string.info_label_sensor_id, if(BuildConfig.DEBUG) "ABCDE12345" else ReceiveData.sensorID!!))
             }

auto/src/main/res/layout-land/activity_main.xml

@@ -207,7 +207,7 @@
                             android:layout_height="wrap_content"
                             android:layout_width="wrap_content"
                             android:layout_weight="1"
-                            android:text="@string/info_label_alarm"/>
+                            android:text="@string/alarm_header"/>
                     </TableRow>
                 </TableLayout>
 

auto/src/main/res/layout/activity_main.xml

@@ -154,7 +154,7 @@
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_weight="1"
-                    android:text="@string/info_label_alarm"/>
+                    android:text="@string/alarm_header"/>
             </TableRow>
         </TableLayout>
 

auto/src/main/res/menu/menu_items.xml

@@ -51,6 +51,13 @@
             </menu>
         </item>
     </group>
+    <group
+        android:id="@+id/group_google_groups">
+        <item
+            android:id="@+id/action_google_groups"
+            android:title="@string/menu_google_groups"
+            app:showAsAction="never" />
+    </group>
     <group
         android:id="@+id/group_facebook">
         <item

auto/src/main/res/xml/pref_general.xml

@@ -24,7 +24,7 @@
             app:showSeekBarValue="true"
             app:seekBarIncrement="1"
             app:min="2"
-            android:max="12"
+            android:max="16"
             android:key="obsolete_time"
             android:title="@string/obsolete_time"
             android:summary="@string/obsolete_time_summary"

auto/src/main/res/xml/sources_online.xml

@@ -29,6 +29,12 @@
             android:title="@string/src_enabled"
             android:summary="@string/src_libre_enabled_summary"
             app:iconSpaceReserved="false" />
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="source_libre_auto_accept_tou"
+            android:title="@string/source_libre_auto_accept_tou"
+            android:summary="@string/source_libre_auto_accept_tou_summary"
+            app:iconSpaceReserved="false" />
         <androidx.preference.EditTextPreference
             android:defaultValue=""
             android:key="source_libre_user"
@@ -99,7 +105,11 @@
         <Preference
             android:key="source_dexcom_share_info"
             android:title="@string/pref_source_dexcom_share_info"
-            android:summary="@string/pref_source_dexcom_share_info_summary"
+            android:summary="@string/pref_source_dexcom_share_info_1_summary"
+            app:iconSpaceReserved="false" />
+        <Preference
+            android:key="source_dexcom_share_info"
+            android:summary="@string/pref_source_dexcom_share_info_2_summary"
             app:iconSpaceReserved="false" />
     </PreferenceCategory>
 

build.gradle

@@ -8,10 +8,10 @@ plugins {
 Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
-project.ext.set("versionCode", 79)
-project.ext.set("versionName", "1.2.1")
-project.ext.set("compileSdk", 34)
-project.ext.set("targetSdk", 34)
+project.ext.set("versionCode", 82)
+project.ext.set("versionName", "1.2.9")
+project.ext.set("compileSdk", 35)
+project.ext.set("targetSdk", 35)
 project.ext.set("minSdk", 26)
 project.ext.set("releasePath", properties.getProperty('releasePath'))
 project.ext.set("DEXCOM_APPLICATION_ID", properties.getProperty('DEXCOM_APPLICATION_ID'))

common/build.gradle

@@ -42,11 +42,11 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.15.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'com.google.android.gms:play-services-wearable:18.2.0'
-    implementation 'androidx.work:work-runtime:2.9.1'
+    implementation 'com.google.android.gms:play-services-wearable:19.0.0'
+    implementation 'androidx.work:work-runtime:2.10.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'io.mockk:mockk:1.13.12'

common/src/main/java/de/michelinside/glucodatahandler/common/Constants.kt

@@ -21,7 +21,7 @@ object Constants {
     const val COMMAND_BUNDLE = "command_bundle"
     const val GLUCOSE_CONVERSION_FACTOR = 18.0182F
     const val GLUCOSE_MIN_VALUE = 40
-    const val GLUCOSE_MAX_VALUE = 400
+    const val GLUCOSE_MAX_VALUE = 600
     const val ACTION_STOP_FOREGROUND = "stop_foreground"
 
     const val ACTION_PREFIX = "gdh_action_"
@@ -95,6 +95,7 @@ object Constants {
     const val SHARED_PREF_FLOATING_WIDGET = "floating_widget"
     const val SHARED_PREF_FLOATING_WIDGET_STYLE = "floating_widget_style"
     const val SHARED_PREF_FLOATING_WIDGET_SIZE = "floating_widget_size"
+    const val SHARED_PREF_FLOATING_WIDGET_SIZE_MIGRATION = "floating_widget_size_migration"
     const val SHARED_PREF_FLOATING_WIDGET_TRANSPARENCY = "floating_widget_transparency"
     const val SHARED_PREF_FLOATING_WIDGET_TIME_TO_CLOSE = "floating_widget_time_to_close"
     const val SHARED_PREF_FLOATING_WIDGET_TAP_ACTION = "floating_widget_tap_action"
@@ -117,6 +118,11 @@ object Constants {
     const val SHARED_PREF_SAVE_WEAR_LOGS = "save_wear_logs"
 
 
+    const val SHARED_PREF_WATCHFACES_PUJIE = "pref_watchfaces_pujie"
+    const val SHARED_PREF_WATCHFACES_DMM = "pref_watchfaces_dmm"
+    const val SHARED_PREF_WATCHFACES_GDC = "pref_watchfaces_gdc"
+
+
     // internal app preferences (not changed by settings) -> use separate tag for not trigger onChanged events
     const val SHARED_PREF_INTERNAL_TAG = "GlucoDataHandlerInternalAppPrefs"
     const val SHARED_PREF_FLOATING_WIDGET_X = "floating_widget_x"
@@ -155,6 +161,7 @@ object Constants {
     const val SHARED_PREF_LIBRE_REGION="source_libre_region"
     const val SHARED_PREF_LIBRE_PATIENT_ID="source_libre_patient_id"
     const val SHARED_PREF_LIBRE_USER_ID="source_libre_user_id"
+    const val SHARED_PREF_LIBRE_AUTO_ACCEPT_TOU="source_libre_auto_accept_tou"
 
     const val SHARED_PREF_DEXCOM_SHARE_ENABLED="source_dexcom_share_enabled"
     const val SHARED_PREF_DEXCOM_SHARE_USER="source_dexcom_share_user"
@@ -232,6 +239,7 @@ object Constants {
     const val SHARED_PREF_ALARM_SUFFIX_TEST = "_test"
     const val SHARED_PREF_ALARM_SUFFIX_SAVE_SOUND = "_save_sound"
     const val SHARED_PREF_ALARM_SUFFIX_REPEAT = "_repeat"
+    const val SHARED_PREF_ALARM_SUFFIX_REPEAT_UNTIL_CLOSE = "_repeat_until_close"
     const val SHARED_PREF_ALARM_SUFFIX_DELTA = "_delta"
     const val SHARED_PREF_ALARM_SUFFIX_OCCURRENCE_COUNT = "_occurrence_count"
     const val SHARED_PREF_ALARM_SUFFIX_BORDER = "_border"
@@ -246,6 +254,12 @@ object Constants {
 
     const val SHARED_PREF_ALARM_TYPE_SETTINGS_CAT = "cat_alarm_settings"
 
+    const val SHARED_PREF_BATTERY_RECEIVER_ENABLED = "battery_receiver_enabled"
+    const val SHARED_PREF_SEND_TO_WATCH_INTERVAL = "send_to_watch_interval"
+    const val SHARED_PREF_SEND_TO_RECEIVER_INTERVAL = "send_to_receiver_interval"
+
+    const val SHARED_PREF_DISCLAIMER_SHOWN = "gdh_disclaimer_shown"
+
     // Android Auto
     const val AA_MEDIA_ICON_STYLE_TREND = "trend"
     const val AA_MEDIA_ICON_STYLE_GLUCOSE_TREND = "glucose_trend"