From a626f9ee6f5ffcca2b2d734d36405d917ddc35dd Mon Sep 17 00:00:00 2001 From: Famke Schulting Date: Thu, 21 Mar 2024 09:55:11 +0100 Subject: [PATCH 1/5] Use testclient (instead of pRMT) --- app/src/main/res/xml/remote_config_defaults.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/xml/remote_config_defaults.xml b/app/src/main/res/xml/remote_config_defaults.xml index 7b38c57..1b321a1 100644 --- a/app/src/main/res/xml/remote_config_defaults.xml +++ b/app/src/main/res/xml/remote_config_defaults.xml @@ -76,7 +76,7 @@ oauth2_client_id - pRMT + testclient oauth2_redirect_url From 067352277cc68ec60de46cc3cd840453928e5937 Mon Sep 17 00:00:00 2001 From: Famke Schulting Date: Mon, 15 Apr 2024 12:34:29 +0200 Subject: [PATCH 2/5] Added polar plugin --- app/build.gradle | 1 + app/src/main/res/values/strings.xml | 1 + app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt | 3 +++ 3 files changed, 5 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 5a422c8..2652ec1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -104,6 +104,7 @@ dependencies { implementation "org.radarbase:radar-android-google-activity:$radar_commons_android_version" implementation "org.radarbase:radar-android-google-places:$radar_commons_android_version" + implementation "org.radarbase:radar-android-polar:$radar_commons_android_version" implementation "androidx.lifecycle:lifecycle-process:$lifecycle_process_version" implementation "androidx.legacy:legacy-support-v4:$legacy_support_version" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b44b318..0738e44 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,6 +34,7 @@ Angel Pebble Phone + Polar NA diff --git a/app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt b/app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt index d604067..6f7e206 100644 --- a/app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt +++ b/app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt @@ -38,6 +38,8 @@ import org.radarbase.passive.phone.PhoneLocationProvider import org.radarbase.passive.phone.PhoneSensorProvider import org.radarbase.passive.phone.usage.PhoneUsageProvider import org.radarbase.passive.weather.WeatherApiProvider +import org.radarbase.passive.polar.PolarProvider + class RadarServiceImpl : RadarService() { override val plugins: List> = listOf( @@ -45,6 +47,7 @@ class RadarServiceImpl : RadarService() { OpenSmileAudioProvider(this), E4Provider(this), FarosProvider(this), + PolarProvider(this), PhoneBluetoothProvider(this), PhoneContactListProvider(this), PhoneLocationProvider(this), From 7f18a153a99c9455ac240b113de7953b95bec752 Mon Sep 17 00:00:00 2001 From: Famke Schulting Date: Thu, 2 May 2024 17:42:40 +0200 Subject: [PATCH 3/5] Bump radar-commons-android --- app/build.gradle | 5 +++-- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2652ec1..53a1794 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,8 +70,9 @@ repositories { google() mavenLocal() mavenCentral() - maven { url "https://oss.sonatype.org/content/repositories/snapshots" } - maven { url "https://repo.thehyve.nl/content/repositories/releases" } + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } + maven { url 'https://repo.thehyve.nl/content/repositories/releases' } + maven { url 'https://jitpack.io' } } dependencies { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0738e44..284aa78 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,7 +34,7 @@ Angel Pebble Phone - Polar + Polar NA From 7931cad6713bbb223c763d9d95ed1322c5602c9a Mon Sep 17 00:00:00 2001 From: Famke Schulting Date: Fri, 10 May 2024 10:44:35 +0200 Subject: [PATCH 4/5] Add radar_commons_android_version for Polar plugin --- app/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 53a1794..3b7e8fa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -101,12 +101,11 @@ dependencies { implementation "org.radarbase:radar-android-weather:$radar_commons_android_version" implementation "org.radarbase:radar-android-audio:$radar_commons_android_version" implementation "org.radarbase:radar-android-faros:$radar_commons_android_version" + implementation "org.radarbase:radar-android-polar:$radar_commons_android_version" implementation "org.radarbase:radar-android-google-sleep:$radar_commons_android_version" implementation "org.radarbase:radar-android-google-activity:$radar_commons_android_version" implementation "org.radarbase:radar-android-google-places:$radar_commons_android_version" - implementation "org.radarbase:radar-android-polar:$radar_commons_android_version" - implementation "androidx.lifecycle:lifecycle-process:$lifecycle_process_version" implementation "androidx.legacy:legacy-support-v4:$legacy_support_version" implementation "com.google.android.material:material:$material_version" From 8d16ed7a910eff7229f747bec1aa522e80117a26 Mon Sep 17 00:00:00 2001 From: Famke Schulting Date: Tue, 23 Jul 2024 11:01:05 +0200 Subject: [PATCH 5/5] Clean up code --- app/src/main/res/xml/remote_config_defaults.xml | 2 +- .../playStore/java/org/radarcns/detail/RadarServiceImpl.kt | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/xml/remote_config_defaults.xml b/app/src/main/res/xml/remote_config_defaults.xml index 1b321a1..7b38c57 100644 --- a/app/src/main/res/xml/remote_config_defaults.xml +++ b/app/src/main/res/xml/remote_config_defaults.xml @@ -76,7 +76,7 @@ oauth2_client_id - testclient + pRMT oauth2_redirect_url diff --git a/app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt b/app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt index 6f7e206..e9ecdf4 100644 --- a/app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt +++ b/app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt @@ -19,8 +19,6 @@ package org.radarcns.detail import android.Manifest.permission.RECEIVE_BOOT_COMPLETED import android.Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS import android.Manifest.permission.SYSTEM_ALERT_WINDOW -import android.os.Build -import org.radarbase.android.RadarConfiguration import org.radarbase.android.RadarConfiguration.Companion.START_AT_BOOT import org.radarbase.android.RadarService import org.radarbase.android.config.SingleRadarConfiguration @@ -36,10 +34,9 @@ import org.radarbase.passive.phone.PhoneBluetoothProvider import org.radarbase.passive.phone.PhoneContactListProvider import org.radarbase.passive.phone.PhoneLocationProvider import org.radarbase.passive.phone.PhoneSensorProvider +import org.radarbase.passive.polar.PolarProvider import org.radarbase.passive.phone.usage.PhoneUsageProvider import org.radarbase.passive.weather.WeatherApiProvider -import org.radarbase.passive.polar.PolarProvider - class RadarServiceImpl : RadarService() { override val plugins: List> = listOf(