Healthfit with Android Override

.gitignore

@@ -21,6 +21,8 @@ src/build/*
 src/debug-*
 
 src/secret.h
+src/secrets.h
+secrets.h
 
 *.swo
 *.swp
@@ -48,11 +50,15 @@ google_test/*
 *build-*
 !build-qdomyos-zwift-Qt_*_for_iOS-Debug # Needed for Apple Watch
 src/inner_templates/googlemaps/cesium-key.js
+src/inner_templates/googlemaps/cesium.js
+cesium.js
 *.autosave
 .vscode/settings.json
 /tst/Devices/.vs
 src/inner_templates/googlemaps/cesium-key.js
 src/qdomyos-zwift.pro.user.49de507
 /.vs
+src/android/.gradle/
+src/android/local.properties
 src/translations/*.qm
 /tools/__pycache__

src/android/AndroidManifest.xml

@@ -8,6 +8,10 @@
 	      Remove the comment if you do not require these default features. -->
 			<!-- %%INSERT_FEATURES -->
 
+    <queries>
+        <package android:name="com.google.android.apps.healthdata" />
+    </queries>
+
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 	 <application android:hardwareAccelerated="true" android:debuggable="false" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="qdomyos-zwift" android:extractNativeLibs="true" android:icon="@drawable/icon" android:usesCleartextTraffic="true">
              <activity android:theme="@style/Theme.AppCompat" android:exported="true" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.cagnulen.qdomyoszwift.CustomQtActivity" android:label="QZ" android:launchMode="singleTop">
@@ -120,6 +124,25 @@
                                     android:value="ocr" />
 
 				<activity android:name="org.cagnulen.qdomyoszwift.MyActivity" />
+                                <activity
+                                    android:name=".HealthConnectPermissionActivity"
+                                    android:exported="false"
+                                    android:theme="@style/Theme.AppCompat">
+                                    <intent-filter>
+                                        <action android:name="androidx.health.ACTION_SHOW_PERMISSIONS_RATIONALE" />
+                                    </intent-filter>
+                                </activity>
+
+                                <activity-alias
+                                    android:name="ViewPermissionUsageActivity"
+                                    android:exported="true"
+                                    android:targetActivity=".HealthConnectPermissionActivity"
+                                    android:permission="android.permission.START_VIEW_PERMISSION_USAGE">
+                                    <intent-filter>
+                                        <action android:name="android.intent.action.VIEW_PERMISSION_USAGE" />
+                                        <category android:name="android.intent.category.HEALTH_PERMISSIONS" />
+                                    </intent-filter>
+                                </activity-alias>
 
                                 <receiver android:name=".MediaButtonReceiver" android:exported="true" android:permission="android.permission.MODIFY_AUDIO_SETTINGS">
                                     <intent-filter>
@@ -129,7 +152,7 @@
 		  <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
 		</application>
 
-<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="36" tools:overrideLibrary="com.google.android.play.agesignals,com.google.android.gms.common" />
+<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="36" tools:overrideLibrary="com.google.android.play.agesignals,com.google.android.gms.common,androidx.health.connect.client" />
 <uses-permission android:name="android.permission.WAKE_LOCK"/>
 <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"/>
@@ -149,4 +172,15 @@
 	 <uses-permission android:name="android.permission.GET_TASKS" />
 	 <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"
 	     tools:ignore="ProtectedPermissions" />
+         <uses-permission android:name="android.permission.health.WRITE_EXERCISE" />
+         <uses-permission android:name="android.permission.health.WRITE_DISTANCE" />
+         <uses-permission android:name="android.permission.health.WRITE_TOTAL_CALORIES_BURNED" />
+         <uses-permission android:name="android.permission.health.WRITE_HEART_RATE" />
+         <uses-permission android:name="android.permission.health.WRITE_POWER" />
+         <uses-permission android:name="android.permission.health.WRITE_SPEED" />
+         <uses-permission android:name="android.permission.health.WRITE_CYCLING_PEDALING_CADENCE" />
+         <uses-permission android:name="android.permission.health.WRITE_ELEVATION_GAINED" />
+         <uses-permission android:name="android.permission.health.WRITE_STEPS" />
+         <uses-permission android:name="android.permission.health.WRITE_STEPS_CADENCE" />
+         <uses-permission android:name="android.permission.health.WRITE_HEART_RATE_VARIABILITY" />
 </manifest>

src/android/build.gradle

@@ -1,33 +1,44 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        gradlePluginPortal()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
+        classpath 'com.android.tools.build:gradle:8.13.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.5'
     }
 }
 
-plugins {
-  id "com.google.protobuf" version "0.9.4"
-}
-
 repositories {
     google()
-    jcenter()
-    maven { url 'https://jitpack.io' }
+    mavenCentral()
+    maven { url = 'https://jitpack.io' }
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.protobuf'
 
 def amazon = System.getenv('AMAZON')
+def androidCompileSdk = (project.findProperty('androidCompileSdkVersion') ?: '35').toString()
+def qtAndroidDir = project.findProperty('qt5AndroidDir') ?: System.getenv('QT_ANDROID_DIR')
 println(amazon)
+def qtAndroidBaseDir = qtAndroidDir ? qtAndroidDir.toString().replaceAll('/src/android/java/?$', '') : null
+def qtAndroidJavaRootDir = qtAndroidDir?.toString()?.endsWith('/src/android/java') ? qtAndroidDir.toString() : (qtAndroidBaseDir ? qtAndroidBaseDir + '/src/android/java' : null)
+def qtAndroidJarDir = qtAndroidBaseDir ? qtAndroidBaseDir + '/jar' : null
+def qtAndroidJavaSrcDir = qtAndroidJavaRootDir ? qtAndroidJavaRootDir + '/src' : 'qt-android-missing/src/android/java/src'
+def qtAndroidJavaResDir = qtAndroidJavaRootDir ? qtAndroidJavaRootDir + '/res' : 'qt-android-missing/src/android/java/res'
 
 dependencies {
+    if (qtAndroidJarDir) {
+        implementation fileTree(dir: qtAndroidJarDir, include: ['*.jar'])
+    }
+
     implementation "androidx.core:core:1.12.0"
+    implementation "androidx.activity:activity-ktx:1.9.3"
     implementation "androidx.core:core-ktx:1.12.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0"
     implementation 'com.google.protobuf:protobuf-javalite:3.25.1'
@@ -39,24 +50,27 @@ dependencies {
         // google play store
         implementation 'com.google.android.gms:play-services-mlkit-text-recognition:18.0.2'
         implementation 'com.google.android.play:age-signals:0.0.3'
+        implementation 'androidx.health.connect:connect-client:1.1.0-alpha11'
     }
 
     def appcompat_version = "1.3.1"
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-         implementation "com.android.billingclient:billing:8.0.0"
-         implementation 'com.android.support:appcompat-v7:28.0.0'
-
-         implementation "androidx.appcompat:appcompat:$appcompat_version"
-         implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
-         implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-         implementation files('libs/usb-serial-for-android-3.8.1.aar')
-	 androidTestImplementation "com.android.support:support-annotations:28.0.0"
-	      implementation 'com.google.android.gms:play-services-wearable:19.0.0'
+    implementation "com.android.billingclient:billing:8.0.0"
+    implementation "androidx.appcompat:appcompat:$appcompat_version"
+    implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation files('libs/usb-serial-for-android-3.8.1.aar')
+    implementation 'com.google.android.gms:play-services-wearable:19.0.0'
 
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.60'
     implementation 'org.bouncycastle:bcprov-jdk15on:1.60'
-    implementation("com.garmin.connectiq:ciq-companion-app-sdk:2.2.0@aar")
+    implementation("com.garmin.connectiq:ciq-companion-app-sdk:2.3.0@aar")
+
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:2.1.20'
+    testImplementation 'androidx.health.connect:connect-client:1.1.0-alpha11'
+    testImplementation 'org.json:json:20231013'
 }
 
 import org.apache.tools.ant.taskdefs.condition.Os
@@ -92,52 +106,73 @@ android {
      * updated by QtCreator and androiddeployqt tools.
      * Changing them manually might break the compilation!
      *******************************************************/
-
-    compileSdkVersion androidCompileSdkVersion.toInteger()
-
-    buildToolsVersion '29.0.2'
+    namespace = 'org.cagnulen.qdomyoszwift'
+    compileSdk androidCompileSdk.toInteger()
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
-            aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
-            res.srcDirs = [qt5AndroidDir + '/res', 'res']
+            java.srcDirs = [qtAndroidJavaSrcDir, 'src', 'java']
+            kotlin.srcDirs = ['src', 'java']
+            aidl.srcDirs = [qtAndroidJavaSrcDir, 'src', 'aidl']
+            res.srcDirs = [qtAndroidJavaResDir, 'res']
             resources.srcDirs = ['resources']
             renderscript.srcDirs = ['src']
             assets.srcDirs = ['assets']
             jniLibs.srcDirs = ['libs']
-       }
+        }
+        debug {
+            java.srcDirs += ["$buildDir/generated/aidl_source_output_dir/debug/out"]
+        }
+        release {
+            java.srcDirs += ["$buildDir/generated/aidl_source_output_dir/release/out"]
+        }
+        test {
+            java.srcDirs = ['tests']
+            kotlin.srcDirs = ['tests']
+        }
+    }
+
+    lint {
+        abortOnError = false
+        checkReleaseBuilds = false
     }
 
-    lintOptions {
-        abortOnError false
-		  checkReleaseBuilds false
+    buildFeatures {
+        aidl = true
     }
 
     // Do not compress Qt binary resources file
-    aaptOptions {
-        noCompress 'rcc'
+    androidResources {
+        noCompress += 'rcc'
     }
 
     defaultConfig {
+        applicationId = "org.cagnulen.qdomyoszwift"
         resConfig "en"
-                  compileSdkVersion 33
-		  minSdkVersion = 21
-                  targetSdkVersion = 36
+        minSdk 21
+        targetSdk 36
     }
 
-tasks.all { task ->
-     if (task.name == 'compileDebugJavaWithJavac' && amazon == "1") {
-        task.dependsOn copyArm64Directory
-        task.dependsOn copyArm32Directory
+    tasks.all { task ->
+        if (task.name == 'compileDebugJavaWithJavac' && amazon == "1") {
+            task.dependsOn copyArm64Directory
+            task.dependsOn copyArm32Directory
         }
-}
+    }
+
+    if (!qtAndroidDir) {
+        throw new GradleException("qt5AndroidDir is not set. Install Qt for Android and set qt5AndroidDir in gradle.properties or via the QT_ANDROID_DIR environment variable.")
+    }
 }
 
 

src/android/gradle.properties

@@ -1,3 +1,8 @@
 android.useAndroidX=true
 android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4096m
+systemProp.file.encoding=UTF-8
+org.gradle.warning.mode=all
+androidCompileSdkVersion=35
+android.suppressUnsupportedCompileSdk=35
 protoc_platform=osx-x86_64

src/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/android/src/ChannelService.java

@@ -15,6 +15,8 @@
  */
 package org.cagnulen.qdomyoszwift;
 
+import android.content.pm.ApplicationInfo;
+
 import com.dsi.ant.AntService;
 import com.dsi.ant.channel.*;
 import com.dsi.ant.message.ChannelId;
@@ -60,6 +62,10 @@ public class ChannelService extends Service {
     BikeChannelController bikeChannelController = null; // Added BikeChannelController reference
     BikeTransmitterController bikeTransmitterController = null; // Added BikeTransmitterController reference
 
+    private boolean isDebuggableBuild() {
+        return (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
+    }
+
     private ServiceConnection mAntRadioServiceConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
@@ -494,7 +500,7 @@ public void onReceive(Context context, Intent intent) {
     };
 
     private void doBindAntRadioService() {
-        if (BuildConfig.DEBUG) QLog.v(TAG, "doBindAntRadioService");
+        if (isDebuggableBuild()) QLog.v(TAG, "doBindAntRadioService");
 
         ContextCompat.registerReceiver(
             this,
@@ -509,13 +515,13 @@ private void doBindAntRadioService() {
     }
 
     private void doUnbindAntRadioService() {
-        if (BuildConfig.DEBUG) QLog.v(TAG, "doUnbindAntRadioService");
+        if (isDebuggableBuild()) QLog.v(TAG, "doUnbindAntRadioService");
 
         // Stop listing for channel available intents
         try {
             unregisterReceiver(mChannelProviderStateChangedReceiver);
         } catch (IllegalArgumentException exception) {
-            if (BuildConfig.DEBUG)
+            if (isDebuggableBuild())
                 QLog.d(TAG, "Attempting to unregister a never registered Channel Provider State Changed receiver.");
         }
 

src/android/src/CustomQtActivity.java

@@ -41,6 +41,7 @@ public void onCreate(Bundle savedInstanceState) {
         Log.d(TAG, "onCreate: CustomQtActivity initialized");
         dispatchOAuthCallback(getIntent());
         AgeSignalsHelper.requestAgeSignals(this);
+        HealthConnectHelper.initialize(this);
 
         // This tells the OS that we want to handle the display cutout area ourselves
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {