Adding chart to GDH

.gitignore

@@ -13,3 +13,4 @@ release/
 dev_release/
 debug/
 second/
+/.kotlin/

build.gradle

@@ -1,15 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.6.1' apply false
-    id 'com.android.library' version '8.6.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
+    id 'com.android.application' version '8.8.0' apply false
+    id 'com.android.library' version '8.8.0' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
+    id 'com.google.devtools.ksp' version "2.1.0-1.0.29" apply false
 }
 
 Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
-project.ext.set("versionCode", 98)
-project.ext.set("versionName", "1.3")
+project.ext.set("versionCode", 99)
+project.ext.set("versionName", "1.3.1")
 project.ext.set("compileSdk", 34)
 project.ext.set("targetSdk", 34)
 project.ext.set("minSdk", 26)

common/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'com.google.devtools.ksp'
 }
 
 android {
@@ -48,10 +49,18 @@ dependencies {
     implementation 'com.google.android.gms:play-services-wearable:19.0.0'
     implementation 'androidx.work:work-runtime:2.9.1'
     implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'io.mockk:mockk:1.13.12'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     testImplementation 'org.mockito:mockito-core:4.11.0'
     testImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
+
+    //Room
+    def roomVersion = "2.6.1"
+    implementation("androidx.room:room-runtime:$roomVersion")
+    implementation("androidx.room:room-ktx:$roomVersion")
+    ksp("androidx.room:room-compiler:$roomVersion")
 }

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

@@ -11,6 +11,7 @@ object Constants {
     const val REQUEST_DATA_MESSAGE_PATH = "/request_data_intent"
     const val REQUEST_LOGCAT_MESSAGE_PATH = "/request_logcat_intent"
     const val LOGCAT_CHANNEL_PATH = "/logcat_intent"
+    const val DB_SYNC_CHANNEL_PATH = "/db_sync_intent"
     const val COMMAND_PATH = "/command_intent"
     const val GLUCODATA_BROADCAST_ACTION = "glucodata.Minute"
     const val SETTINGS_BUNDLE = "settings_bundle"
@@ -28,6 +29,7 @@ object Constants {
     const val ACTION_FLOATING_WIDGET_TOGGLE = ACTION_PREFIX + "floating_widget_toggle"
     const val ACTION_DUMMY_VALUE = ACTION_PREFIX + "dummy_value"
     const val ACTION_SPEAK = ACTION_PREFIX + "speak"
+    const val ACTION_GRAPH = ACTION_PREFIX + "show_graph"
 
     const val IS_SECOND = BuildConfig.BUILD_TYPE == "second"
 
@@ -284,4 +286,16 @@ object Constants {
     const val AA_MEDIA_PLAYER_DURATION = "aa_media_player_duration"
 
     const val PATIENT_NAME = "patient_name"
+
+    // database
+    const val DB_MAX_DATA_WEAR_TIME_MS = (24*60*60*1000)  // 24h
+    const val DB_MAX_DATA_TIME_MS = (7*24*60*60*1000)  // 7 days
+    const val SHARED_PREF_RESET_DATABASE = "reset_db"
+    const val SHARED_PREF_USE_RATE_CALCULATION = "rate_calculation"
+
+    // graph
+    const val GRAPH_ID = "graph_id"
+    const val SHARED_PREF_GRAPH_DURATION_WEAR_COMPLICATION = "graph_duration_wear_complication"
+    const val SHARED_PREF_GRAPH_DURATION_PHONE_MAIN = "graph_duration_phone_main"
+
 }

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

@@ -2,6 +2,7 @@ package de.michelinside.glucodatahandler.common
 
 import android.annotation.SuppressLint
 import android.app.Notification
+import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
@@ -11,7 +12,6 @@ import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.annotation.RequiresApi
-import com.google.android.gms.wearable.WearableListenerService
 import de.michelinside.glucodatahandler.common.notification.ChannelType
 import de.michelinside.glucodatahandler.common.notification.Channels
 import de.michelinside.glucodatahandler.common.notifier.DataSource
@@ -44,7 +44,7 @@ enum class AppSource {
     AUTO_APP;
 }
 
-abstract class GlucoDataService(source: AppSource) : WearableListenerService(), SharedPreferences.OnSharedPreferenceChangeListener {
+abstract class GlucoDataService(source: AppSource) : Service(), SharedPreferences.OnSharedPreferenceChangeListener {
     protected var batteryReceiver: BatteryReceiver? = null
     protected var screenEventReceiver: ScreenEventReceiver? = null
     private lateinit var broadcastServiceAPI: BroadcastServiceAPI
@@ -60,6 +60,7 @@ abstract class GlucoDataService(source: AppSource) : WearableListenerService(),
         const val NOTIFICATION_ID = 1234
         var appSource = AppSource.NOT_SET
         private var isRunning = false
+        private var started = false
         val running get() = isRunning
         private var created = false
 
@@ -84,31 +85,46 @@ abstract class GlucoDataService(source: AppSource) : WearableListenerService(),
         }
 
         fun start(source: AppSource, context: Context, cls: Class<*>) {
-            Log.v(LOG_ID, "start called (running: $running - foreground: $foreground)")
-            if (!running) {
+            Log.v(LOG_ID, "start called (running: $running - foreground: $foreground - started: $started)")
+            if (!running||!foreground||!started) {
                 try {
-                    isRunning = true
-                    appSource = source
-                    migrateSettings(context)
-                    val serviceIntent = Intent(
-                        context,
-                        cls
-                    )
-                    /*
-                    val sharedPref = context.getSharedPreferences(
-                        Constants.SHARED_PREF_TAG,
-                        Context.MODE_PRIVATE
-                    )*/
-                    serviceIntent.putExtra(
-                        Constants.SHARED_PREF_FOREGROUND_SERVICE,
-                        // default on wear and phone
-                        true//sharedPref.getBoolean(Constants.SHARED_PREF_FOREGROUND_SERVICE, true)
-                    )
-                    if (foreground) {
-                        context.startService(serviceIntent)
-                    } else {
-                        Log.v(LOG_ID, "start foreground service")
-                        context.startForegroundService(serviceIntent)
+                    if(!started || !running || service == null) {
+                        isRunning = true
+                        appSource = source
+                        migrateSettings(context)
+                        val serviceIntent = Intent(
+                            context,
+                            cls
+                        )
+                        /*
+                        val sharedPref = context.getSharedPreferences(
+                            Constants.SHARED_PREF_TAG,
+                            Context.MODE_PRIVATE
+                        )*/
+                        serviceIntent.putExtra(
+                            Constants.SHARED_PREF_FOREGROUND_SERVICE,
+                            // default on wear and phone
+                            true//sharedPref.getBoolean(Constants.SHARED_PREF_FOREGROUND_SERVICE, true)
+                        )
+                        //if (foreground) {
+                            context.startService(serviceIntent)
+                        /*} else {
+                            Log.v(LOG_ID, "start foreground service")
+                            context.startForegroundService(serviceIntent)
+                        }*/
+                    } else if(!foreground && service != null) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                            Log.i(LOG_ID, "Starting service in foreground with type ${ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC}!")
+                            service!!.startForeground(
+                                NOTIFICATION_ID,
+                                service!!.getNotification(),
+                                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+                            )
+                        } else {
+                            Log.i(LOG_ID, "Starting service in foreground!")
+                            service!!.startForeground(NOTIFICATION_ID, service!!.getNotification())
+                        }
+                        isForegroundService = true
                     }
                 } catch (exc: Exception) {
                     Log.e(
@@ -168,6 +184,10 @@ abstract class GlucoDataService(source: AppSource) : WearableListenerService(),
             }
         }
 
+        fun getWearPhoneConnection(): WearPhoneConnection? {
+            return connection
+        }
+
         private var glucoDataReceiver: GlucoseDataReceiver? = null
         private var xDripReceiver: XDripBroadcastReceiver?  = null
         private var aapsReceiver: AAPSReceiver?  = null
@@ -180,11 +200,7 @@ abstract class GlucoDataService(source: AppSource) : WearableListenerService(),
         fun registerReceiver(context: Context, receiver: ReceiverBase, filter: IntentFilter): Boolean {
             Log.i(LOG_ID, "Register receiver ${receiver.getName()} for $receiver on $context")
             try {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    context.registerReceiver(receiver, filter, RECEIVER_EXPORTED or RECEIVER_VISIBLE_TO_INSTANT_APPS)
-                } else {
-                    context.registerReceiver(receiver, filter)
-                }
+                PackageUtils.registerReceiver(context, receiver, filter)
                 registeredReceivers.add(receiver.getName())
                 return true
             } catch (exc: Exception) {
@@ -429,11 +445,13 @@ abstract class GlucoDataService(source: AppSource) : WearableListenerService(),
     @RequiresApi(Build.VERSION_CODES.Q)
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         try {
-            Log.v(LOG_ID, "onStartCommand called")
+            if(started && isForegroundService)
+                return START_STICKY
+            Log.v(LOG_ID, "onStartCommand called - running: $running - foreground: $foreground")
+            started = true
             GdhUncaughtExecptionHandler.init()
-            super.onStartCommand(intent, flags, startId)
-            val isForeground = true // intent?.getBooleanExtra(Constants.SHARED_PREF_FOREGROUND_SERVICE, true)    --> always use foreground!!!
-            if (isForeground && !isForegroundService) {
+            //super.onStartCommand(intent, flags, startId)
+            if (!isForegroundService) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                     Log.i(LOG_ID, "Starting service in foreground with type ${ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC}!")
                     startForeground(
@@ -446,11 +464,11 @@ abstract class GlucoDataService(source: AppSource) : WearableListenerService(),
                     startForeground(NOTIFICATION_ID, getNotification())
                 }
                 isForegroundService = true
-            } else if ( isForegroundService && intent?.getBooleanExtra(Constants.ACTION_STOP_FOREGROUND, false) == true ) {
+            } /*else if ( isForegroundService && intent?.getBooleanExtra(Constants.ACTION_STOP_FOREGROUND, false) == true ) {
                 isForegroundService = false
                 Log.i(LOG_ID, "Stopping service in foreground!")
                 stopForeground(STOP_FOREGROUND_REMOVE)
-            }
+            }*/
         } catch (exc: Exception) {
             Log.e(LOG_ID, "onStartCommand exception: " + exc.toString())
         }