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.

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

Updated Radar-prmt to Target SDK 34 (Android 14) #151

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
defaultConfig {
applicationId "org.radarcns.detail"
minSdkVersion 26
targetSdkVersion 33
targetSdkVersion 34
versionCode 62
versionName "1.2.1"
Comment on lines 14 to 15
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am uncertain about which version to use in this context.
Please feel free to update versionCode, versionName and other configs as needed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @this-Aditya I'll bump the version. It should be 64.

manifestPlaceholders = ["appAuthRedirectScheme": "org.radarbase.passive.app"]
Expand Down
18 changes: 17 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<uses-permission android:name="android.permission.WAKE_LOCK" />

<!-- 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_HEALTH" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />

<supports-screens android:largeScreens="true"
android:xlargeScreens="true" />

Expand Down Expand Up @@ -117,7 +125,15 @@
android:name=".SettingsActivity"
android:screenOrientation="userPortrait"
android:parentActivityName=".MainActivityImpl" />
<service android:name=".RadarServiceImpl" />

<service
android:name=".RadarServiceImpl"
android:exported="false"
android:foregroundServiceType="dataSync|health|location|microphone|specialUse|connectedDevice" >
<property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
android:value="@string/special_fgs_explanation"/>
</service>

<service android:name=".AuthServiceImpl" />

<!--
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,5 @@
<string name="reject_privacy_policy_button">Reject</string>
<string name="consent">Consent</string>
<string name="filter_split_regex">,</string>
<string name="special_fgs_explanation">RadarService operates with plugins and modules that may need permissions beyond standard foreground service types. Defining a special use subtype ensures compliance with Android’s requirements for permissions that may vary dynamically based on active plugins</string>
</resources>
17 changes: 16 additions & 1 deletion app/src/selfRelease/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@
<!-- TODO: Check if necessary -->
<uses-permission android:name="android.permission.SET_ALARM"/>

<!-- 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_HEALTH" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />

<supports-screens android:largeScreens="true"
android:xlargeScreens="true" />

Expand Down Expand Up @@ -121,7 +129,14 @@
android:screenOrientation="userPortrait"
android:parentActivityName=".MainActivityImpl" />

<service android:name=".RadarServiceImpl" />
<service
android:name=".RadarServiceImpl"
android:exported="false"
android:foregroundServiceType="dataSync|health|location|microphone|specialUse|connectedDevice" >
<property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
android:value="@string/special_fgs_explanation"/>
</service>

<service android:name=".AuthServiceImpl" />

<receiver android:name=".UpdateAlarmReceiver" />
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ android.defaults.buildfeatures.buildconfig=true
android.useAndroidX=true
android.enableJetifier=true

radar_commons_android_version=1.2.5
radar_commons_android_version=1.4.1-SNAPSHOT

kotlin_version=1.9.24
gradle_version=8.6
Expand Down
Loading