Skip to content

Commit 7e20fe0

Browse files
this-Adityathis-Aditya
authored
Merge pull request #153 from RADAR-base/release-1.2.7
Release 1.2.7
2 parents 4b94b9d + 19f5373 commit 7e20fe0

File tree

22 files changed

+284
-171
lines changed

22 files changed

+284
-171
lines changed

‎.github/workflows/scheduled_snyk.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Snyk scheduled test
2+
on:
3+
schedule:
4+
- cron: '0 2 * * 1'
5+
push:
6+
branches:
7+
- master
8+
9+
jobs:
10+
security:
11+
runs-on: ubuntu-latest
12+
env:
13+
REPORT_FILE: test.json
14+
15+
steps:
16+
- uses: actions/checkout@v3
17+
- uses: snyk/actions/setup@master
18+
with:
19+
snyk-version: v1.1032.0
20+
21+
- uses: actions/setup-java@v3
22+
with:
23+
distribution: temurin
24+
java-version: 17
25+
26+
- name: Setup Gradle
27+
uses: gradle/gradle-build-action@v2
28+
29+
- name: Run Snyk
30+
env:
31+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
32+
run: >
33+
snyk test
34+
--all-sub-projects
35+
--configuration-matching='^releaseRuntimeClasspath$'
36+
--fail-on=upgradable
37+
--json-file-output=${{ env.REPORT_FILE }}
38+
--org=radar-base
39+
--policy-path=$PWD/.snyk
40+
41+
- name: Report new vulnerabilities
42+
uses: thehyve/report-vulnerability@master
43+
if: success() || failure()
44+
with:
45+
report-file: ${{ env.REPORT_FILE }}
46+
env:
47+
TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/snyk.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Snyk test
2+
on:
3+
pull_request:
4+
branches:
5+
- master
6+
- dev
7+
8+
jobs:
9+
security:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v3
13+
- uses: snyk/actions/setup@master
14+
with:
15+
snyk-version: v1.1032.0
16+
17+
- uses: actions/setup-java@v3
18+
with:
19+
distribution: temurin
20+
java-version: 17
21+
22+
- name: Setup Gradle
23+
uses: gradle/gradle-build-action@v2
24+
25+
- name: Run Snyk to check for vulnerabilities
26+
env:
27+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
28+
run: >
29+
snyk test
30+
--all-sub-projects
31+
--configuration-matching="^runtimeClasspath$"
32+
--fail-on=upgradable
33+
--org=radar-base
34+
--policy-path=.snyk
35+
--severity-threshold=high

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
app/src/debug/google-services.json
2+
app/google-services.json
3+
14
# Local configuration file
25
local.properties
36

‎app/build.gradle

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
apply plugin: 'com.android.application'
2-
apply plugin: 'com.google.android.gms.oss-licenses-plugin'
3-
apply plugin: 'kotlin-android'
1+
apply plugin: "com.android.application"
2+
apply plugin: "com.google.android.gms.oss-licenses-plugin"
3+
apply plugin: "kotlin-android"
44

55
android {
6-
compileSdkVersion 33
7-
buildToolsVersion '32.0.0'
6+
compileSdkVersion 34
7+
buildToolsVersion "34.0.0"
88
namespace "org.radarcns.detail"
99

1010
defaultConfig {
11-
applicationId 'org.radarcns.detail'
12-
minSdkVersion 24
13-
targetSdkVersion 33
14-
versionCode 62
15-
versionName '1.2.0'
16-
manifestPlaceholders = ['appAuthRedirectScheme': 'org.radarbase.passive.app']
11+
applicationId "org.radarcns.detail"
12+
minSdkVersion 26
13+
targetSdkVersion 34
14+
versionCode 69
15+
versionName "1.2.7"
16+
manifestPlaceholders = ["appAuthRedirectScheme": "org.radarbase.passive.app"]
1717
multiDexEnabled true
1818
ndkVersion "25.2.9519653"
1919
}
2020
buildTypes {
2121
release {
2222
shrinkResources true
2323
minifyEnabled true
24-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
24+
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
2525
ndk {
26-
debugSymbolLevel = 'full'
26+
debugSymbolLevel = "full"
2727
}
2828
}
2929
debug {
3030
shrinkResources false
3131
minifyEnabled true
32-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
32+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
3333
}
3434
}
3535
packagingOptions {
3636
resources {
37-
excludes += ['META-INF/ASL2.0', 'META-INF/LICENSE']
37+
excludes += ["META-INF/ASL2.0", "META-INF/LICENSE"]
3838
}
3939
}
4040
compileOptions {
41-
targetCompatibility JavaVersion.VERSION_11
42-
sourceCompatibility JavaVersion.VERSION_11
41+
targetCompatibility JavaVersion.VERSION_17
42+
sourceCompatibility JavaVersion.VERSION_17
4343
}
4444
buildFeatures {
4545
viewBinding true
@@ -61,66 +61,70 @@ android {
6161
}
6262

6363
configurations.all {
64-
resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds'
65-
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
64+
resolutionStrategy.cacheDynamicVersionsFor 0, "seconds"
65+
resolutionStrategy.cacheChangingModulesFor 0, "seconds"
6666
}
6767

6868
repositories {
69-
flatDir { dirs 'libs' }
69+
flatDir { dirs "libs" }
7070
google()
7171
mavenLocal()
7272
mavenCentral()
7373
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
7474
maven { url 'https://repo.thehyve.nl/content/repositories/releases' }
75+
maven { url 'https://jitpack.io' }
7576
}
7677

77-
ext.radarCommonsVersion = '1.2.4'
78-
7978
dependencies {
8079
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
81-
api "org.radarbase:radar-commons-android:$radarCommonsVersion"
80+
api "org.radarbase:radar-commons-android:$radar_commons_android_version"
8281

83-
implementation "org.radarbase:radar-android-login-qr:$radarCommonsVersion"
82+
implementation "org.radarbase:radar-android-login-qr:$radar_commons_android_version"
8483

85-
implementation platform('com.google.firebase:firebase-bom:31.2.2')
86-
implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
84+
implementation platform("com.google.firebase:firebase-bom:$firebase_bom_version")
85+
implementation "com.google.android.gms:play-services-oss-licenses:$play_services_oss_licenses_version"
8786
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
8887

89-
implementation 'org.slf4j:slf4j-api:2.0.6'
90-
91-
implementation 'com.google.firebase:firebase-config'
92-
implementation 'com.google.firebase:firebase-crashlytics'
93-
implementation 'com.google.firebase:firebase-analytics'
94-
95-
implementation 'com.gitlab.mvysny.slf4j:slf4j-handroid:2.0.4'
96-
97-
implementation "org.radarbase:radar-android-phone:$radarCommonsVersion"
98-
implementation "org.radarbase:radar-android-phone-usage:$radarCommonsVersion"
99-
selfReleaseImplementation "org.radarbase:radar-android-phone-telephony:$radarCommonsVersion"
100-
implementation "org.radarbase:radar-android-empatica:$radarCommonsVersion"
101-
implementation "org.radarbase:radar-android-application-status:$radarCommonsVersion"
102-
implementation "org.radarbase:radar-android-weather:$radarCommonsVersion"
103-
implementation "org.radarbase:radar-android-audio:$radarCommonsVersion"
104-
implementation "org.radarbase:radar-android-faros:$radarCommonsVersion"
105-
106-
implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
107-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
108-
implementation 'com.google.android.material:material:1.8.0'
109-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
110-
implementation 'androidx.fragment:fragment-ktx:1.5.7'
111-
112-
testImplementation 'junit:junit:4.13.2'
113-
testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.6'
88+
implementation "org.slf4j:slf4j-api:$slf4j_api_version"
89+
90+
implementation "com.google.firebase:firebase-config"
91+
implementation "com.google.firebase:firebase-crashlytics"
92+
implementation "com.google.firebase:firebase-analytics"
93+
94+
implementation "com.gitlab.mvysny.slf4j:slf4j-handroid:$slf4j_handroid_version"
95+
96+
implementation "org.radarbase:radar-android-phone:$radar_commons_android_version"
97+
implementation "org.radarbase:radar-android-phone-usage:$radar_commons_android_version"
98+
selfReleaseImplementation "org.radarbase:radar-android-phone-telephony:$radar_commons_android_version"
99+
implementation "org.radarbase:radar-android-empatica:$radar_commons_android_version"
100+
implementation "org.radarbase:radar-android-application-status:$radar_commons_android_version"
101+
implementation "org.radarbase:radar-android-weather:$radar_commons_android_version"
102+
implementation "org.radarbase:radar-android-audio:$radar_commons_android_version"
103+
implementation "org.radarbase:radar-android-faros:$radar_commons_android_version"
104+
// implementation "org.radarbase:radar-android-polar:$radar_commons_android_version"
105+
implementation "org.radarbase:radar-android-google-sleep:$radar_commons_android_version"
106+
implementation "org.radarbase:radar-android-google-activity:$radar_commons_android_version"
107+
implementation "org.radarbase:radar-android-google-places:$radar_commons_android_version"
108+
implementation "org.radarbase:radar-android-phone-audio-input:$radar_commons_android_version"
109+
110+
implementation "androidx.lifecycle:lifecycle-process:$lifecycle_process_version"
111+
implementation "androidx.legacy:legacy-support-v4:$legacy_support_version"
112+
implementation "com.google.android.material:material:$material_version"
113+
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
114+
implementation "androidx.fragment:fragment-ktx:$fragment_version"
115+
116+
testImplementation "junit:junit:$junit_version"
117+
testRuntimeOnly "org.slf4j:slf4j-simple:$slf4j_simple_version"
114118
}
115119

116120
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
117121
kotlinOptions {
118-
jvmTarget = '11'
119-
apiVersion = '1.7'
120-
languageVersion = '1.7'
122+
jvmTarget = "17"
123+
apiVersion = "1.7"
124+
languageVersion = "1.7"
121125
}
122126
}
123127

124128
// Needed for Firebase. Put at the bottom so it can detect the Firebase version.
125-
apply plugin: 'com.google.gms.google-services'
126-
apply plugin: 'com.google.firebase.crashlytics'
129+
apply plugin: "com.google.gms.google-services"
130+
apply plugin: "com.google.firebase.crashlytics"

‎app/src/debug/google-services.json

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎app/src/main/AndroidManifest.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
1919
<uses-permission android:name="android.permission.WAKE_LOCK" />
2020

21+
<!-- Foreground service types permissions (for targeting devices running on android 14 and above) -->
22+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
23+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
24+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_HEALTH" />
25+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
26+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
27+
2128
<supports-screens android:largeScreens="true"
2229
android:xlargeScreens="true" />
2330

@@ -117,7 +124,13 @@
117124
android:name=".SettingsActivity"
118125
android:screenOrientation="userPortrait"
119126
android:parentActivityName=".MainActivityImpl" />
120-
<service android:name=".RadarServiceImpl" />
127+
128+
<service
129+
android:name=".RadarServiceImpl"
130+
android:exported="false"
131+
android:foregroundServiceType="dataSync|health|location|microphone|connectedDevice" >
132+
</service>
133+
121134
<service android:name=".AuthServiceImpl" />
122135

123136
<!--

‎app/src/main/java/org/radarcns/detail/PrivacyPolicyFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class PrivacyPolicyFragment : Fragment() {
3838
projectId = args.getString(PROJECT_ID_KEY)
3939
userId = args.getString(USER_ID_KEY)
4040
baseUrl = args.getString(BASE_URL_PROPERTY)
41-
privacyPolicyUrl = args.getString(PRIVACY_POLICY_URL_PROPERTY)
42-
dataCollectionUrl = args.getString(PRIVACY_POLICY)
41+
privacyPolicyUrl = args.getString(PRIVACY_POLICY) //args.getString(PRIVACY_POLICY_URL_PROPERTY)
42+
dataCollectionUrl = "https://radar-base.org/docs/4048-2/"
4343
}
4444

4545
override fun onCreateView(

‎app/src/main/java/org/radarcns/detail/SourceRowView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,6 @@ class SourceRowView internal constructor(
183183

184184
companion object {
185185
private val logger = LoggerFactory.getLogger(SourceRowView::class.java)
186-
private const val sourceStatusIconDefault = R.drawable.status_searching
186+
private val sourceStatusIconDefault = R.drawable.baseline_status_search
187187
}
188-
}
188+
}

‎app/src/main/res/drawable/baseline_status_search.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="960"
5+
android:viewportHeight="960"
6+
android:tint="#229f11">
7+
<path
8+
android:fillColor="@android:color/white"
9+
android:pathData="M164,400Q178,297 255.5,228.5Q333,160 440,160Q499,160 550.5,182.5Q602,205 640,244L640,160L720,160L720,400L480,400L480,320L600,320Q571,284 530.5,262Q490,240 440,240Q368,240 313,285.5Q258,331 244,400L164,400ZM784,840L608,664Q572,691 529.5,705.5Q487,720 440,720Q381,720 329.5,697.5Q278,675 240,636L240,720L160,720L160,480L400,480L400,560L280,560Q309,596 349.5,618Q390,640 440,640Q512,640 567,594.5Q622,549 636,480L716,480Q711,516 698,547.5Q685,579 664,608L840,784L784,840Z"/>
10+
</vector>

0 commit comments

Comments
 (0)