Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable New Audio Plugin and Add Missing Polar Provider to Self-Release #150

Merged
merged 3 commits into from
Sep 25, 2024
Merged

Enable New Audio Plugin and Add Missing Polar Provider to Self-Release #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b50f791
Added audio plugin as dependency and the remote config value
this-Aditya Sep 25, 2024
73a297e
Added audio plugin provider to RadarService
this-Aditya Sep 25, 2024
070770c
Added missing polar plugin to self-release build falvour
this-Aditya Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/xml/remote_config_defaults.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion app/src/playStore/java/org/radarcns/detail/RadarServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -53,7 +54,8 @@ class RadarServiceImpl : RadarService() {
WeatherApiProvider(this),
GoogleActivityProvider(this),
GoogleSleepProvider(this),
GooglePlacesProvider(this)
GooglePlacesProvider(this),
PhoneAudioInputProvider(this)
)

override val servicePermissions: List<String>
Expand Down
6 changes: 5 additions & 1 deletion app/src/selfRelease/java/org/radarcns/detail/RadarServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -67,6 +69,7 @@ class RadarServiceImpl : RadarService() {
OpenSmileAudioProvider(this),
E4Provider(this),
FarosProvider(this),
PolarProvider(this),
PhoneBluetoothProvider(this),
PhoneContactListProvider(this),
PhoneLocationProvider(this),
Expand All @@ -76,7 +79,8 @@ class RadarServiceImpl : RadarService() {
WeatherApiProvider(this),
GoogleActivityProvider(this),
GoogleSleepProvider(this),
GooglePlacesProvider(this)
GooglePlacesProvider(this),
PhoneAudioInputProvider(this)
)

override val servicePermissions: List<String>
Expand Down
Loading