Skip to content

Commit

Permalink
Merge pull request #153 from RADAR-base/release-1.2.7
Browse files Browse the repository at this point in the history
Release 1.2.7
  • Loading branch information
this-Aditya authored Jan 22, 2025
2 parents 4b94b9d + 19f5373 commit 7e20fe0
Show file tree
Hide file tree
Showing 22 changed files with 284 additions and 171 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/scheduled_snyk.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Snyk scheduled test
on:
schedule:
- cron: '0 2 * * 1'
push:
branches:
- master

jobs:
security:
runs-on: ubuntu-latest
env:
REPORT_FILE: test.json

steps:
- uses: actions/checkout@v3
- uses: snyk/actions/setup@master
with:
snyk-version: v1.1032.0

- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2

- name: Run Snyk
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
run: >
snyk test
--all-sub-projects
--configuration-matching='^releaseRuntimeClasspath$'
--fail-on=upgradable
--json-file-output=${{ env.REPORT_FILE }}
--org=radar-base
--policy-path=$PWD/.snyk
- name: Report new vulnerabilities
uses: thehyve/report-vulnerability@master
if: success() || failure()
with:
report-file: ${{ env.REPORT_FILE }}
env:
TOKEN: ${{ secrets.GITHUB_TOKEN }}
35 changes: 35 additions & 0 deletions .github/workflows/snyk.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Snyk test
on:
pull_request:
branches:
- master
- dev

jobs:
security:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: snyk/actions/setup@master
with:
snyk-version: v1.1032.0

- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2

- name: Run Snyk to check for vulnerabilities
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
run: >
snyk test
--all-sub-projects
--configuration-matching="^runtimeClasspath$"
--fail-on=upgradable
--org=radar-base
--policy-path=.snyk
--severity-threshold=high
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
app/src/debug/google-services.json
app/google-services.json

# Local configuration file
local.properties

Expand Down
116 changes: 60 additions & 56 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.android.gms.oss-licenses-plugin'
apply plugin: 'kotlin-android'
apply plugin: "com.android.application"
apply plugin: "com.google.android.gms.oss-licenses-plugin"
apply plugin: "kotlin-android"

android {
compileSdkVersion 33
buildToolsVersion '32.0.0'
compileSdkVersion 34
buildToolsVersion "34.0.0"
namespace "org.radarcns.detail"

defaultConfig {
applicationId 'org.radarcns.detail'
minSdkVersion 24
targetSdkVersion 33
versionCode 62
versionName '1.2.0'
manifestPlaceholders = ['appAuthRedirectScheme': 'org.radarbase.passive.app']
applicationId "org.radarcns.detail"
minSdkVersion 26
targetSdkVersion 34
versionCode 69
versionName "1.2.7"
manifestPlaceholders = ["appAuthRedirectScheme": "org.radarbase.passive.app"]
multiDexEnabled true
ndkVersion "25.2.9519653"
}
buildTypes {
release {
shrinkResources true
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
ndk {
debugSymbolLevel = 'full'
debugSymbolLevel = "full"
}
}
debug {
shrinkResources false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
}
packagingOptions {
resources {
excludes += ['META-INF/ASL2.0', 'META-INF/LICENSE']
excludes += ["META-INF/ASL2.0", "META-INF/LICENSE"]
}
}
compileOptions {
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_17
}
buildFeatures {
viewBinding true
Expand All @@ -61,66 +61,70 @@ android {
}

configurations.all {
resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds'
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
resolutionStrategy.cacheDynamicVersionsFor 0, "seconds"
resolutionStrategy.cacheChangingModulesFor 0, "seconds"
}

repositories {
flatDir { dirs 'libs' }
flatDir { dirs "libs" }
google()
mavenLocal()
mavenCentral()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
maven { url 'https://repo.thehyve.nl/content/repositories/releases' }
maven { url 'https://jitpack.io' }
}

ext.radarCommonsVersion = '1.2.4'

dependencies {
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
api "org.radarbase:radar-commons-android:$radarCommonsVersion"
api "org.radarbase:radar-commons-android:$radar_commons_android_version"

implementation "org.radarbase:radar-android-login-qr:$radarCommonsVersion"
implementation "org.radarbase:radar-android-login-qr:$radar_commons_android_version"

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

implementation 'org.slf4j:slf4j-api:2.0.6'

implementation 'com.google.firebase:firebase-config'
implementation 'com.google.firebase:firebase-crashlytics'
implementation 'com.google.firebase:firebase-analytics'

implementation 'com.gitlab.mvysny.slf4j:slf4j-handroid:2.0.4'

implementation "org.radarbase:radar-android-phone:$radarCommonsVersion"
implementation "org.radarbase:radar-android-phone-usage:$radarCommonsVersion"
selfReleaseImplementation "org.radarbase:radar-android-phone-telephony:$radarCommonsVersion"
implementation "org.radarbase:radar-android-empatica:$radarCommonsVersion"
implementation "org.radarbase:radar-android-application-status:$radarCommonsVersion"
implementation "org.radarbase:radar-android-weather:$radarCommonsVersion"
implementation "org.radarbase:radar-android-audio:$radarCommonsVersion"
implementation "org.radarbase:radar-android-faros:$radarCommonsVersion"

implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.fragment:fragment-ktx:1.5.7'

testImplementation 'junit:junit:4.13.2'
testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.6'
implementation "org.slf4j:slf4j-api:$slf4j_api_version"

implementation "com.google.firebase:firebase-config"
implementation "com.google.firebase:firebase-crashlytics"
implementation "com.google.firebase:firebase-analytics"

implementation "com.gitlab.mvysny.slf4j:slf4j-handroid:$slf4j_handroid_version"

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"
implementation "org.radarbase:radar-android-faros:$radar_commons_android_version"
// implementation "org.radarbase:radar-android-polar:$radar_commons_android_version"
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"
implementation "com.google.android.material:material:$material_version"
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
implementation "androidx.fragment:fragment-ktx:$fragment_version"

testImplementation "junit:junit:$junit_version"
testRuntimeOnly "org.slf4j:slf4j-simple:$slf4j_simple_version"
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions {
jvmTarget = '11'
apiVersion = '1.7'
languageVersion = '1.7'
jvmTarget = "17"
apiVersion = "1.7"
languageVersion = "1.7"
}
}

// Needed for Firebase. Put at the bottom so it can detect the Firebase version.
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
apply plugin: "com.google.gms.google-services"
apply plugin: "com.google.firebase.crashlytics"
73 changes: 0 additions & 73 deletions app/src/debug/google-services.json

This file was deleted.

15 changes: 14 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
<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" />

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

Expand Down Expand Up @@ -117,7 +124,13 @@
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|connectedDevice" >
</service>

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

<!--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class PrivacyPolicyFragment : Fragment() {
projectId = args.getString(PROJECT_ID_KEY)
userId = args.getString(USER_ID_KEY)
baseUrl = args.getString(BASE_URL_PROPERTY)
privacyPolicyUrl = args.getString(PRIVACY_POLICY_URL_PROPERTY)
dataCollectionUrl = args.getString(PRIVACY_POLICY)
privacyPolicyUrl = args.getString(PRIVACY_POLICY) //args.getString(PRIVACY_POLICY_URL_PROPERTY)
dataCollectionUrl = "https://radar-base.org/docs/4048-2/"
}

override fun onCreateView(
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/radarcns/detail/SourceRowView.kt
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,6 @@ class SourceRowView internal constructor(

companion object {
private val logger = LoggerFactory.getLogger(SourceRowView::class.java)
private const val sourceStatusIconDefault = R.drawable.status_searching
private val sourceStatusIconDefault = R.drawable.baseline_status_search
}
}
}
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/baseline_status_search.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="#229f11">
<path
android:fillColor="@android:color/white"
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"/>
</vector>
Loading

0 comments on commit 7e20fe0

Please sign in to comment.