Skip to content

Commit

Permalink
Merge branch 'release/v1.4.0-11'
Browse files Browse the repository at this point in the history
  • Loading branch information
alopezh committed Jun 14, 2021
2 parents c040201 + 66422ef commit 88ce2fe
Show file tree
Hide file tree
Showing 518 changed files with 18,907 additions and 2,861 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,9 @@ app/release/output.json
.DS_Store

environment.properties

#commitlint
node_modules
package-lock.json
commitlint.config.js
package.json
52 changes: 46 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,51 @@ All notable changes to this project will be documented in this file.

### 1.0.6 (2020-09-15)

### Bug Fixes

* Return to healthy state implemented for alerted contacts (close contacts) after 14 days.
* Multi-language - co-official languages
* Texts and design adjustments to meet Ministry of Health requirements
* Privacy policies and conditions of use adjustments
* Multi-language - co-official languages.
* Texts and design adjustments to meet Ministry of Health requirements.
* Privacy policies and conditions of use adjustments.
* Accessibility improvements.
* Bug fixing
* Bug fixing.

### 1.0.7 (2020-10-08)

* Added symptom/PCR date in positive communication.
* Send fake positive communications.
* DP-3T version upgrade.
* Improved accessibility.
* Bug fixing.

### 1.1.0 (2020-10-29)

* Implemented functionalities for interoperability with other European applications.
* Implemented review functionality for new privacy policy and terms of use.
* New language settings functionality.
* Improved accessibility.
* Bug fixing.

### 1.2.0 (2020-12-17)

* DP-3T version upgrade.
* Radar COVID statistics view.
* Application status information view.
* Opening reminder notification.
* Confinement counter.
* Share link for easy download.
* Added French language.
* Get positive code from SMS.
* Accessibility improvements:
* Increased text size and contrast.
* Changed links style.
* Tagged elements on screen.
* Incorporated headings.

### 1.3.0 (2021-02-17)

* Changed privacy policy.
* Anonymous metrics report to measure application efficiency.
* Added Romanian language.
* Bug fixing.
* Accessibility improvements:
* Fixed "Status Change" header in healed pop-up.
* Added closing icon on popups.
129 changes: 129 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@

# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
[email protected].
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<p align="center">
<a href="https://github.com/RadarCOVID/radar-covid-android/commits/" title="Last Commit"><img src="https://img.shields.io/github/last-commit/RadarCOVID/radar-covid-android?style=flat"></a>
<a href="https://github.com/RadarCOVID/radar-covid-android/issues" title="Open Issues"><img src="https://img.shields.io/github/issues/RadarCOVID/radar-covid-android?style=flat"></a>
<a href="https://github.com/RadarCOVID/radar-covid-ios/blob/master/LICENSE" title="License"><img src="https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg?style=flat"></a>
<a href="https://github.com/RadarCOVID/radar-covid-android/blob/master/LICENSE" title="License"><img src="https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg?style=flat"></a>
</p>

## Introduction
Expand All @@ -21,7 +21,9 @@ These are the tools used to develop the solution:

Clone this repository and import into **Android Studio**.

```bash
git clone https://github.com/RadarCOVID/radar-covid-android.git
```

## Building
### Create APK
Expand Down
2 changes: 1 addition & 1 deletion THIRD-PARTY-NOTICES
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RadarCOVID/radar-covid-android software.

In the event that we overlooked to list a required notice, please bring this
to our attention by contacting us via this email:
soporte.radarcovid@covid19.gob.es
soporte.radarcovid@economia.gob.es


Components:
Expand Down
88 changes: 76 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.protobuf'

android {
compileSdkVersion 29
Expand All @@ -21,8 +22,9 @@ android {
applicationId "es.gob.radarcovid"
minSdkVersion 23
targetSdkVersion 29
versionCode 6
versionName "1.0.6"
versionCode 11
versionName "1.4.0"
resConfigs "en", "es", "ro", "ca", "gl", "eu", "fr"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Expand Down Expand Up @@ -111,6 +113,13 @@ android {
buildConfigField 'String', 'PUBLIC_KEY_VERIFICATION', '"LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlHYk1CQUdCeXFHU000OUFnRUdCU3VCQkFBakE0R0dBQVFCbUlXU0ptdGVGNkh2VnI0M1V5SzliZStlNkpPQgpDRjlVaXpMeis4a3padkVEc25nMGl3VEF3UVB0QzdBMDlzQjVMM3EwSUl1N250Yzd4U1VqSUdTakZvd0JXL0xPCnFtMTBYQ1NkUWNZT3BMTi85dUI1emZKVUZOY3B6Ynk4dDAzSlg3TUZiYi9vQm1pcFNNNHptSm1UajR3Qm9XZ2sKRlF6ZEJHcnAwR2laUU9WVXRtUT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg=="'

buildConfigField 'String', 'CERTIFICATE_PIN', '"sha256/BZkFfM++uLfyl8jDpVoLvQWjyGm0xNAZRjEXy9jX798="'
buildConfigField 'String', 'CERTIFICATE_PIN_NEW', '"sha256/Bf/HXif22OO34dBnWpk7AEktor0HAzDwetIWrzJ39D4="'

buildConfigField("String", "SAFETY_NET_API_KEY", loadProperty("pre.safetyNet"))

buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://radarcovidpre.covid19.gob.es/qr"'
buildConfigField "String", "QR_CODE_HOST_NAME", '"radarcovidpre.covid19.gob.es"'
manifestPlaceholders = [qrCodeHostName: "radarcovidpre.covid19.gob.es"]
}
pro {
dimension = 'environment'
Expand All @@ -125,6 +134,13 @@ android {
buildConfigField 'String', 'PUBLIC_KEY_VERIFICATION', '"LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlHYk1CQUdCeXFHU000OUFnRUdCU3VCQkFBakE0R0dBQVFBWjM1ZzlhN1M2MjdXMVlpOEVsVmdNS012dkdUUAo5R0hiUHZHTzhLekNLQk84WTZOc0JSTHlJeWUwZmdxR0ZXM2Z5dHVxcnFSNi9wSllDUWFXN1IyUnY3OEF4OXJhCmlYbmRVSmVyVk9KSHJRaFgxbnMrTjZxaVUxT0I4a3dUaWVuaCtuZDVVbXZUN24vK3hod3djK1RYa1lnNDBxOVcKUTRiVjBMbHRWbGRUSUlTK1QxOD0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg=="'

buildConfigField 'String', 'CERTIFICATE_PIN', '"sha256/V5NaZx/jvh7NR/Ne6tXTw/g2Pcu9ztv08prWsUh7czI="'
buildConfigField 'String', 'CERTIFICATE_PIN_NEW', '"sha256/9psJkMemKz3JXVfw1TiLRoitC2eswaL9FfwF8JFbwrk="'

buildConfigField("String", "SAFETY_NET_API_KEY", loadProperty("pro.safetyNet"))

buildConfigField "String", "ENTRY_QR_CODE_PREFIX", '"https://radarcovid.covid19.gob.es/qr"'
buildConfigField "String", "QR_CODE_HOST_NAME", '"radarcovid.covid19.gob.es"'
manifestPlaceholders = [qrCodeHostName: "radarcovid.covid19.gob.es"]
}
}

Expand Down Expand Up @@ -158,6 +174,20 @@ def existProjectProperties() {
return propertiesFile.exists()
}

def loadProperty(String propertyName) {
String property = "\"DEFAULT_VALUE\""
def propertiesFile = project.rootProject.file("project.properties")
if (propertiesFile.exists()) {
def properties = new Properties()
properties.load(new FileInputStream(propertiesFile))
property = properties.getProperty(propertyName)
}
if (property == null)
return "\"DEFAULT_VALUE\""
else
return property
}

def loadCredential(String environmentVariableName, String propertyName) {
String credential = System.getProperty(environmentVariableName)
if (credential == null) {
Expand All @@ -179,6 +209,28 @@ def loadCredential(String environmentVariableName, String propertyName) {
return credential
}

protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.0.0'
}
plugins {
javalite {
artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
}
}
generateProtoTasks {
all().each { task ->
task.builtins {
remove javanone
}
task.plugins {
javalite {}
}
}
}
}


dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
// The google exposure library, required for DP3T, is resolved by the aar located in libs folder
Expand All @@ -187,6 +239,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.core:core-ktx:1.3.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
implementation 'androidx.lifecycle:lifecycle-process:2.3.0'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
testImplementation 'junit:junit:4.13'
testImplementation "org.mockito:mockito-core:3.5.6"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
Expand All @@ -195,11 +249,8 @@ dependencies {
androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation "org.mockito:mockito-core:3.5.6"

// Recommended: Add the Firebase SDK for Google Analytics.
implementation 'com.google.firebase:firebase-analytics-ktx:17.5.0'

//Views
implementation 'com.google.android.material:material:1.2.0'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'

implementation "org.funktionale:funktionale-either:1.2"
Expand Down Expand Up @@ -230,22 +281,35 @@ dependencies {
implementation "com.squareup.retrofit2:converter-scalars:$rootProject.retrofitVersion"

//WorkerManager
implementation 'androidx.work:work-runtime:2.4.0'
implementation 'androidx.work:work-runtime:2.5.0-beta01'

//JWT Token
implementation 'io.jsonwebtoken:jjwt-api:0.11.1'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.1'
runtimeOnly('io.jsonwebtoken:jjwt-orgjson:0.11.1') {
implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2'
runtimeOnly('io.jsonwebtoken:jjwt-orgjson:0.11.2') {
exclude group: 'org.json', module: 'json'
}
implementation 'org.bouncycastle:bcprov-jdk15on:1.65'

//DP3T
implementation 'org.dpppt:dp3t-sdk-android:1.0.3'
implementation 'org.dpppt:dp3t-sdk-android:2.0.0'
implementation 'com.google.android.gms:play-services-tasks:17.2.0'

//DP3T aar dependencies
implementation 'com.google.android.gms:play-services-base:17.4.0'
implementation 'com.google.android.gms:play-services-base:17.5.0'
implementation 'androidx.security:security-crypto:1.1.0-alpha02'

//SafetyNet
implementation 'com.google.android.gms:play-services-safetynet:17.0.0'

// google vision gradle
implementation 'com.google.android.gms:play-services-vision:20.1.3'

//CrowdNotifier
implementation 'org.crowdnotifier:crowdnotifier-sdk-android:2.1.0'
implementation 'com.google.protobuf:protobuf-lite:3.0.1'

//Biometrics
implementation "androidx.biometric:biometric-ktx:1.2.0-alpha03"

}
Binary file removed app/libs/play-services-nearby-18.0.3-eap.aar
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@
@com.squareup.otto.Subscribe public *;
@com.squareup.otto.Produce public *;
}

-keep class com.sun.jna.** { *; }
Loading

0 comments on commit 88ce2fe

Please sign in to comment.