Merge pull request #150 from RADAR-base/enable-audio-plugin

Enable New Audio Plugin and Add Missing Polar Provider to Self-Release
RADAR-base · Sep 25, 2024 · df1a3fc · df1a3fc
2 parents 6289ffb + 070770c
commit df1a3fc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -105,6 +105,7 @@ dependencies {
     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-phone-audio-input:$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/xml/remote_config_defaults.xml b/app/src/main/res/xml/remote_config_defaults.xml
@@ -47,7 +47,7 @@
     </entry>
     <entry>
         <key>device_services_to_connect</key>
-        <value>.phone.PhoneSensorProvider .application.ApplicationServiceProvider .weather.WeatherApiProvider .phone.PhoneLocationProvider .phone.PhoneBluetoothProvider .phone.PhoneContactListProvider .phone.PhoneUsageProvider .passive.bittium.FarosProvider .google.GoogleActivityProvider .google.GoogleSleepProvider .google.GooglePlacesProvider</value>
+        <value>.phone.PhoneSensorProvider .application.ApplicationServiceProvider .weather.WeatherApiProvider .phone.PhoneLocationProvider .phone.PhoneBluetoothProvider .phone.PhoneContactListProvider .phone.PhoneUsageProvider .phone.PhoneAudioInputProvider .passive.bittium.FarosProvider .google.GoogleActivityProvider .google.GoogleSleepProvider .google.GooglePlacesProvider</value>
     </entry>
     <!--Assume max. sensor frequency is 64Hz and send every 10 seconds. ~=640 records-->
     <entry>

diff --git a/app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt b/app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt
@@ -34,6 +34,7 @@ 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.phone.audio.input.PhoneAudioInputProvider
 import org.radarbase.passive.polar.PolarProvider
 import org.radarbase.passive.phone.usage.PhoneUsageProvider
 import org.radarbase.passive.weather.WeatherApiProvider
@@ -53,7 +54,8 @@ class RadarServiceImpl : RadarService() {
         WeatherApiProvider(this),
         GoogleActivityProvider(this),
         GoogleSleepProvider(this),
-        GooglePlacesProvider(this)
+        GooglePlacesProvider(this),
+        PhoneAudioInputProvider(this)
     )
 
     override val servicePermissions: List<String>

diff --git a/app/src/selfRelease/java/org/radarcns/detail/RadarServiceImpl.kt b/app/src/selfRelease/java/org/radarcns/detail/RadarServiceImpl.kt
@@ -45,6 +45,8 @@ import org.radarbase.passive.phone.PhoneLocationProvider
 import org.radarbase.passive.phone.PhoneSensorProvider
 import org.radarbase.passive.phone.telephony.PhoneLogProvider
 import org.radarbase.passive.phone.usage.PhoneUsageProvider
+import org.radarbase.passive.phone.audio.input.PhoneAudioInputProvider
+import org.radarbase.passive.polar.PolarProvider
 import org.radarbase.passive.weather.WeatherApiProvider
 import org.radarcns.detail.UpdatesActivity.Companion.DAY
 import org.radarcns.detail.UpdatesActivity.Companion.LAST_AUTO_UPDATE_CHECK_TIME_KEY
@@ -67,6 +69,7 @@ class RadarServiceImpl : RadarService() {
         OpenSmileAudioProvider(this),
         E4Provider(this),
         FarosProvider(this),
+        PolarProvider(this),
         PhoneBluetoothProvider(this),
         PhoneContactListProvider(this),
         PhoneLocationProvider(this),
@@ -76,7 +79,8 @@ class RadarServiceImpl : RadarService() {
         WeatherApiProvider(this),
         GoogleActivityProvider(this),
         GoogleSleepProvider(this),
-        GooglePlacesProvider(this)
+        GooglePlacesProvider(this),
+        PhoneAudioInputProvider(this)
     )
 
     override val servicePermissions: List<String>