Merge pull request #420 from RADAR-base/release-1.2.4

Release 1.2.4
RADAR-base · May 8, 2024 · 23f0a3b · 23f0a3b
2 parents f62557c + 03f8fa7
commit 23f0a3b
Show file tree

Hide file tree

Showing 65 changed files with 556 additions and 196 deletions.
diff --git a/README.md b/README.md
@@ -97,6 +97,35 @@ To only build plugins that are of interest to you, add a `gradle.skip` file in a
 
 If you want to contribute a feature or fix browse our [issues](https://github.com/RADAR-base/radar-commons-android/issues), and please make a pull request.
 
+## Publishing Schemas to Maven Local
+
+While the plugin is in development phase schemas are not published centrally. To access the java generated file from avro schemas first publish them to maven local.
+To publish schemas locally to Maven, please follow these steps:
+
+1. Change your working directory to java-sdk in RADAR-Schemas.
+
+2. Run the following commands in your terminal:
+```shell
+./gradlew build 
+./gradlew publishToMavenLocal
+```
+
+3. In your build.gradle file, add the following to your repositories block:
+```gradle
+repositories {
+    mavenLocal()
+}
+```
+
+4. In the same build.gradle file, add the following to your dependencies block, replacing `$radarSchemasVersion` with its corresponding value:
+```gradle
+dependencies {
+    implementation "org.radarbase:radar-schemas-commons:$radarSchemasVersion"
+}
+```
+
+You can find the version value in the metadata of your local Maven repository. It should end in `SNAPSHOT`.
+
 ## Licensing
 
 Code made in the RADAR-base platform is licensed under the Apache License 2.0, as listed in see the LICENSE file in this directory. Plugins that have additional licensing requirements list them in their README.
diff --git a/avro-android/src/main/AndroidManifest.xml b/avro-android/src/main/AndroidManifest.xml
@@ -1 +1,2 @@
+
 <manifest/>
diff --git a/build.gradle b/build.gradle
@@ -41,10 +41,10 @@ allprojects {
     ext.issueUrl = 'https://github.com/' + githubRepoName + '/issues'
     ext.website = 'http://radar-base.org'
 
-    version = "1.2.3"
+    version = "1.2.4"
     group = 'org.radarbase'
 
-    ext.versionCode = 51
+    ext.versionCode = 52
 }
 
 subprojects {

diff --git a/plugins/radar-android-application-status/src/main/AndroidManifest.xml b/plugins/radar-android-application-status/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
-        <service android:name=".ApplicationStatusService"/>
+        <service android:name=".ApplicationStatusService"
+            android:exported="false"
+            android:description="@string/application_status_description" />
     </application>
 </manifest>
diff --git a/plugins/radar-android-application-status/src/main/res/values/strings.xml b/plugins/radar-android-application-status/src/main/res/values/strings.xml
@@ -1,6 +1,4 @@
 <resources>
     <string name="applicationServiceDisplayName">Application</string>
-    <string name="application_status_description">Monitors how much data the app is collecting and
-        server status.
-    </string>
+    <string name="application_status_description">Monitors how much data the app is collecting and server status.</string>
 </resources>
diff --git a/plugins/radar-android-audio/build.gradle b/plugins/radar-android-audio/build.gradle
@@ -10,9 +10,6 @@ android {
         ndk {
             moduleName rootProject.name
         }
-        packagingOptions {
-            doNotStrip '**.so'
-        }
     }
 
     // Encapsulates your external native build configurations.

diff --git a/plugins/radar-android-audio/src/main/AndroidManifest.xml b/plugins/radar-android-audio/src/main/AndroidManifest.xml
@@ -8,6 +8,8 @@
 
     <application>
         <service android:name=".OpenSmileAudioService"
-            android:foregroundServiceType="microphone"/>
+            android:foregroundServiceType="microphone"
+            android:exported="false"
+            android:description="@string/audio_description" />
     </application>
 </manifest>
diff --git a/...ns/radar-android-audio/src/main/java/org/radarbase/passive/audio/OpenSmileAudioService.kt b/...ns/radar-android-audio/src/main/java/org/radarbase/passive/audio/OpenSmileAudioService.kt
@@ -39,9 +39,9 @@ class OpenSmileAudioService : SourceService<BaseSourceState>() {
         manager as OpensmileAudioManager
         manager.setRecordRate(config.getLong(AUDIO_RECORD_RATE_S, DEFAULT_RECORD_RATE))
         manager.config = OpensmileAudioManager.AudioConfiguration(
-                config.getString(AUDIO_CONFIG_FILE, "ComParE_2016.conf"),
-                config.getLong(AUDIO_DURATION_S, 15L),
-                TimeUnit.SECONDS
+            config.getString(AUDIO_CONFIG_FILE, "ComParE_2016.conf"),
+            config.getLong(AUDIO_DURATION_S, 15L),
+            TimeUnit.SECONDS,
         )
     }
 

diff --git a/...ns/radar-android-audio/src/main/java/org/radarbase/passive/audio/OpensmileAudioManager.kt b/...ns/radar-android-audio/src/main/java/org/radarbase/passive/audio/OpensmileAudioManager.kt
@@ -135,7 +135,7 @@ class OpensmileAudioManager constructor(service: OpenSmileAudioService) : Abstra
                     ?.list { _, name -> name.startsWith("audio_") && name.endsWith(".bin") }
                     ?.forEach { File(audioDir.parentFile, it).delete() }
 
-            audioDir.walk().filter { it.startsWith("audio_") && it.endsWith(".bin") }
+            audioDir.walk().filter { it.startsWith("audio_") && it.path.endsWith(".bin") }
                     .forEach { it.delete() }
         }
     }

diff --git a/plugins/radar-android-empatica/src/main/AndroidManifest.xml b/plugins/radar-android-empatica/src/main/AndroidManifest.xml
@@ -4,16 +4,24 @@
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="false" />
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30"/>
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
 
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation"
+        android:minSdkVersion="31"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"
+        android:minSdkVersion="31"/>
+
     <application android:allowBackup="true">
         <service
             android:name=".E4Service"
-            android:foregroundServiceType="location"/>
+            android:foregroundServiceType="location"
+            android:exported="false"
+            android:description="@string/empatica_e4_explanation" />
     </application>
 </manifest>
diff --git a/plugins/radar-android-empatica/src/main/java/org/radarbase/passive/empatica/E4Manager.kt b/plugins/radar-android-empatica/src/main/java/org/radarbase/passive/empatica/E4Manager.kt
@@ -26,7 +26,6 @@ import com.empatica.empalink.config.EmpaStatus
 import com.empatica.empalink.delegate.EmpaDataDelegate
 import com.empatica.empalink.delegate.EmpaSessionManagerDelegate
 import com.empatica.empalink.delegate.EmpaStatusDelegate
-import org.radarbase.android.RadarApplication.Companion.radarApp
 import org.radarbase.android.source.AbstractSourceManager
 import org.radarbase.android.source.SourceStatusListener
 import org.radarbase.android.util.BluetoothStateReceiver.Companion.bluetoothIsEnabled
@@ -46,6 +45,9 @@ class E4Manager(
         EmpaDataDelegate,
         EmpaStatusDelegate,
         EmpaSessionManagerDelegate {
+    private val notificationHandler: NotificationHandler by lazy {
+        NotificationHandler(service)
+    }
     private var doNotify: Boolean = false
     private val accelerationTopic = createCache("android_empatica_e4_acceleration", EmpaticaE4Acceleration())
     private val batteryLevelTopic = createCache("android_empatica_e4_battery_level", EmpaticaE4BatteryLevel())
@@ -122,7 +124,7 @@ class E4Manager(
             EmpaStatus.CONNECTING -> hasBeenConnecting = true
             EmpaStatus.CONNECTED -> {
                 status = SourceStatusListener.Status.CONNECTED
-                service.radarApp.notificationHandler.manager?.cancel(EMPATICA_DISCONNECTED_NOTIFICATION_ID)
+                notificationHandler.manager?.cancel(EMPATICA_DISCONNECTED_NOTIFICATION_ID)
             }
             EmpaStatus.DISCONNECTED ->
                 // The device manager disconnected from a device. Before it ever makes a connection,
@@ -230,10 +232,11 @@ class E4Manager(
 
     override fun disconnect() {
         if (status != SourceStatusListener.Status.UNAVAILABLE && !isClosed && doNotify) {
-            service.radarApp.notificationHandler.notify(
-                    id = EMPATICA_DISCONNECTED_NOTIFICATION_ID,
-                    channel = NotificationHandler.NOTIFICATION_CHANNEL_ALERT,
-                    includeStartIntent = true) {
+            notificationHandler.notify(
+                id = EMPATICA_DISCONNECTED_NOTIFICATION_ID,
+                channel = NotificationHandler.NOTIFICATION_CHANNEL_ALERT,
+                includeStartIntent = true,
+            ) {
                 setContentTitle(service.getString(R.string.notification_empatica_disconnected_title))
                 setContentText(service.getString(R.string.notification_empatica_disconnected_text))
             }

diff --git a/plugins/radar-android-empatica/src/main/java/org/radarbase/passive/empatica/E4Provider.kt b/plugins/radar-android-empatica/src/main/java/org/radarbase/passive/empatica/E4Provider.kt
@@ -21,6 +21,7 @@ import android.content.pm.PackageManager
 import android.os.Build
 import org.radarbase.android.RadarService
 import org.radarbase.android.source.SourceProvider
+import org.radarbase.android.util.BluetoothStateReceiver.Companion.bluetoothPermissionList
 
 open class E4Provider(radarService: RadarService) : SourceProvider<E4State>(radarService) {
     override val serviceClass = E4Service::class.java
@@ -32,19 +33,7 @@ open class E4Provider(radarService: RadarService) : SourceProvider<E4State>(rada
             "org.radarbase.passive.empatica.E4Provider",
             "org.radarcns.empatica.E4ServiceProvider")
 
-    override val permissionsNeeded = buildList {
-        add(ACCESS_COARSE_LOCATION)
-        add(ACCESS_FINE_LOCATION)
-        add(BLUETOOTH)
-        add(BLUETOOTH_ADMIN)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            add(BLUETOOTH_SCAN)
-            add(BLUETOOTH_CONNECT)
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            add(ACCESS_BACKGROUND_LOCATION)
-        }
-    }
+    override val permissionsNeeded = bluetoothPermissionList
 
     override val featuresNeeded = listOf(PackageManager.FEATURE_BLUETOOTH, PackageManager.FEATURE_BLUETOOTH_LE)
 

diff --git a/plugins/radar-android-faros/src/main/AndroidManifest.xml b/plugins/radar-android-faros/src/main/AndroidManifest.xml
@@ -3,16 +3,24 @@
 
     <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
 
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30"/>
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
 
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation"
+        android:minSdkVersion="31"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"
+        android:minSdkVersion="31"/>
+
     <application>
         <service android:name=".FarosService"
-            android:foregroundServiceType="location"/>
+            android:foregroundServiceType="location"
+            android:exported="false"
+            android:description="@string/farosDescription"/>
     </application>
 </manifest>
diff --git a/plugins/radar-android-faros/src/main/java/org/radarbase/passive/bittium/FarosManager.kt b/plugins/radar-android-faros/src/main/java/org/radarbase/passive/bittium/FarosManager.kt
@@ -35,6 +35,9 @@ class FarosManager internal constructor(
         private val farosFactory: FarosSdkFactory,
         private val handler: SafeHandler
 ) : AbstractSourceManager<FarosService, FarosState>(service), FarosDeviceListener, FarosSdkListener {
+    private val notificationHandler by lazy {
+        NotificationHandler(this.service)
+    }
     private var doNotify: Boolean = false
     private val accelerationTopic: DataCache<ObservationKey, BittiumFarosAcceleration> = createCache("android_bittium_faros_acceleration", BittiumFarosAcceleration())
     private val ecgTopic: DataCache<ObservationKey, BittiumFarosEcg> = createCache("android_bittium_faros_ecg", BittiumFarosEcg())
@@ -78,7 +81,7 @@ class FarosManager internal constructor(
                         startMeasurements()
                     }
                 }
-                service.radarApp.notificationHandler.manager?.cancel(FAROS_DISCONNECTED_NOTIFICATION_ID)
+                notificationHandler.manager?.cancel(FAROS_DISCONNECTED_NOTIFICATION_ID)
                 SourceStatusListener.Status.CONNECTED
             }
             FarosDeviceListener.CONNECTING -> SourceStatusListener.Status.CONNECTING
@@ -194,10 +197,11 @@ class FarosManager internal constructor(
 
     override fun disconnect() {
         if (!isClosed && doNotify) {
-            service.radarApp.notificationHandler.notify(
-                    id = FAROS_DISCONNECTED_NOTIFICATION_ID,
-                    channel = NotificationHandler.NOTIFICATION_CHANNEL_ALERT,
-                    includeStartIntent = true) {
+            notificationHandler.notify(
+                id = FAROS_DISCONNECTED_NOTIFICATION_ID,
+                channel = NotificationHandler.NOTIFICATION_CHANNEL_ALERT,
+                includeStartIntent = true,
+            ) {
                 setContentTitle(service.getString(R.string.notification_faros_disconnected_title))
                 setContentText(service.getString(R.string.notification_faros_disconnected_text))
             }

diff --git a/plugins/radar-android-faros/src/main/java/org/radarbase/passive/bittium/FarosProvider.kt b/plugins/radar-android-faros/src/main/java/org/radarbase/passive/bittium/FarosProvider.kt
@@ -16,12 +16,11 @@
 
 package org.radarbase.passive.bittium
 
-import android.Manifest.permission.*
 import android.content.pm.PackageManager
-import android.os.Build
 import org.radarbase.android.BuildConfig
 import org.radarbase.android.RadarService
 import org.radarbase.android.source.SourceProvider
+import org.radarbase.android.util.BluetoothStateReceiver.Companion.bluetoothPermissionList
 
 class FarosProvider(radarService: RadarService) : SourceProvider<FarosState>(radarService) {
     override val description: String?
@@ -38,19 +37,7 @@ class FarosProvider(radarService: RadarService) : SourceProvider<FarosState>(rad
 
     override val hasDetailView: Boolean = true
 
-    override val permissionsNeeded: List<String> = buildList {
-        add(ACCESS_COARSE_LOCATION)
-        add(ACCESS_FINE_LOCATION)
-        add(BLUETOOTH)
-        add(BLUETOOTH_ADMIN)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            add(BLUETOOTH_SCAN)
-            add(BLUETOOTH_CONNECT)
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            add(ACCESS_BACKGROUND_LOCATION)
-        }
-    }
+    override val permissionsNeeded: List<String> = bluetoothPermissionList
 
     override val featuresNeeded: List<String> = listOf(PackageManager.FEATURE_BLUETOOTH)
 

diff --git a/plugins/radar-android-faros/src/main/java/org/radarbase/passive/bittium/FarosState.kt b/plugins/radar-android-faros/src/main/java/org/radarbase/passive/bittium/FarosState.kt
@@ -48,12 +48,10 @@ class FarosState : BaseSourceState() {
         this.acceleration[2] = z
     }
 
-    override fun toString(): String {
-        return "FarosDeviceStatus{" +
-                "batteryLevel=" + batteryLevel +
-                ", heartRate=" + heartRate +
-                ", temperature=" + temperature +
-                ", acceleration=" + Arrays.toString(acceleration) +
-                '}'.toString()
-    }
+    override fun toString(): String = "FarosDeviceStatus{" +
+            "batteryLevel=" + batteryLevel +
+            ", heartRate=" + heartRate +
+            ", temperature=" + temperature +
+            ", acceleration=" + acceleration.contentToString() +
+            '}'
 }
diff --git a/...ndroid-login-oauth2/src/main/java/org/radarbase/android/auth/oauth2/OAuth2LoginManager.kt b/...ndroid-login-oauth2/src/main/java/org/radarbase/android/auth/oauth2/OAuth2LoginManager.kt
@@ -20,15 +20,16 @@ import android.app.Activity
 import org.json.JSONException
 import org.radarbase.android.RadarApplication.Companion.radarApp
 import org.radarbase.android.auth.*
+import org.radarbase.android.auth.portal.ManagementPortalLoginManager
 import org.radarbase.producer.AuthenticationException
 
 /**
  * Authenticates against the RADAR Management Portal.
  */
 class OAuth2LoginManager(
-        private val service: AuthService,
-        private val projectIdClaim: String,
-        private val userIdClaim: String
+    private val service: AuthService,
+    private val projectIdClaim: String,
+    private val userIdClaim: String
 ) : LoginManager, LoginListener {
     private val stateManager: OAuth2StateManager = OAuth2StateManager(service)
 
@@ -55,16 +56,8 @@ class OAuth2LoginManager(
         return true
     }
 
-    override fun invalidate(authState: AppAuthState, disableRefresh: Boolean): AppAuthState? {
-        return when {
-            authState.tokenType != LoginManager.AUTH_TYPE_BEARER -> return null
-            disableRefresh -> authState.alter {
-                attributes -= LOGIN_REFRESH_TOKEN
-                isPrivacyPolicyAccepted = false
-            }
-            else -> authState
-        }
-    }
+    override fun invalidate(authState: AppAuthState, disableRefresh: Boolean): AppAuthState? =
+        authState.takeIf { it.authenticationSource == OAUTH2_SOURCE_TYPE }
 
     override val sourceTypes: List<String> = OAUTH2_SOURCE_TYPES
 
@@ -89,16 +82,16 @@ class OAuth2LoginManager(
     override fun loginSucceeded(manager: LoginManager?, authState: AppAuthState) {
         val token = authState.token
         if (token == null) {
-            this.service.loginFailed(this,
+            loginFailed(this,
                     IllegalArgumentException("Cannot login using OAuth2 without a token"))
             return
         }
         try {
             processJwt(authState, Jwt.parse(token)).let {
-                this.service.loginSucceeded(this, it)
+                service.loginSucceeded(this, it)
             }
         } catch (ex: JSONException) {
-            this.service.loginFailed(this, ex)
+            loginFailed(this, ex)
         }
 
     }