Merge pull request #160 from RADAR-base/dev

Release 1.3.0

Author: peyman-mohtashami

app/build.gradle

@@ -3,16 +3,15 @@ apply plugin: "com.google.android.gms.oss-licenses-plugin"
 apply plugin: "kotlin-android"
 
 android {
-    compileSdkVersion 34
-    buildToolsVersion "34.0.0"
+    compileSdk 35
     namespace "org.radarcns.detail"
 
     defaultConfig {
         applicationId "org.radarcns.detail"
         minSdkVersion 26
-        targetSdkVersion 34
-        versionCode 69
-        versionName "1.2.7"
+        targetSdkVersion 35
+        versionCode 70
+        versionName "1.3.0"
         manifestPlaceholders = ["appAuthRedirectScheme": "org.radarbase.passive.app"]
         multiDexEnabled true
         ndkVersion "25.2.9519653"
@@ -96,7 +95,6 @@ dependencies {
     implementation "org.radarbase:radar-android-phone:$radar_commons_android_version"
     implementation "org.radarbase:radar-android-phone-usage:$radar_commons_android_version"
     selfReleaseImplementation "org.radarbase:radar-android-phone-telephony:$radar_commons_android_version"
-    implementation "org.radarbase:radar-android-empatica:$radar_commons_android_version"
     implementation "org.radarbase:radar-android-application-status:$radar_commons_android_version"
     implementation "org.radarbase:radar-android-weather:$radar_commons_android_version"
     implementation "org.radarbase:radar-android-audio:$radar_commons_android_version"
@@ -106,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-phone-audio-input:$radar_commons_android_version"
+    implementation("org.radarbase:radar-android-login-oauth2:$radar_commons_android_version")
 
     implementation "androidx.lifecycle:lifecycle-process:$lifecycle_process_version"
     implementation "androidx.legacy:legacy-support-v4:$legacy_support_version"

app/src/main/AndroidManifest.xml

@@ -20,7 +20,7 @@
 
     <!-- Foreground service types permissions (for targeting devices running on android 14 and above) -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_HEALTH" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
@@ -128,7 +128,10 @@
         <service
             android:name=".RadarServiceImpl"
             android:exported="false"
-            android:foregroundServiceType="dataSync|health|location|microphone|connectedDevice" >
+            android:foregroundServiceType="specialUse|health|location|microphone|connectedDevice" >
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="@string/fgs_special_type_use"/>
         </service>
 
         <service android:name=".AuthServiceImpl" />

app/src/main/java/org/radarcns/detail/AuthServiceImpl.kt

@@ -3,11 +3,15 @@ package org.radarcns.detail
 import org.radarbase.android.auth.AppAuthState
 import org.radarbase.android.auth.AuthService
 import org.radarbase.android.auth.LoginManager
+import org.radarbase.android.auth.oauth2.OAuth2LoginManager
 import org.radarbase.android.auth.portal.ManagementPortalLoginManager
+import org.radarbase.android.auth.sep.SEPLoginManager
 
 class AuthServiceImpl : AuthService() {
     override fun createLoginManagers(appAuth: AppAuthState): List<LoginManager> = listOf(
         ManagementPortalLoginManager(this, appAuth),
+        SEPLoginManager(this, appAuth),
+        OAuth2LoginManager(this, appAuth)
     )
 
     override fun showLoginNotification() = Unit