Skip to content

Commit

Permalink
Merge pull request #221 from DP-3T/develop
Browse files Browse the repository at this point in the history
Version 1.1.0
  • Loading branch information
simonroesch committed Sep 24, 2020
2 parents 286fb39 + 89cb9ed commit 1cc2f7c
Show file tree
Hide file tree
Showing 85 changed files with 2,727 additions and 396 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:5.6.4-jdk8
FROM gradle:6.6.1-jdk8

ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip
ENV ANDROID_BUILD_TOOLS_VERSION 29.0.3
Expand Down
12 changes: 8 additions & 4 deletions app/backend_certs.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,23 @@

ext {
backend_certs = [
dev : [
dev : [
CONFIG_CERTIFICATE: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNTekNDQWZHZ0F3SUJBZ0lVWkN4SHZUbVlnMEZEZGxubDRnTlNwUFcyd2Q0d0NnWUlLb1pJemowRUF3SXcKZXpFTE1Ba0dBMVVFQmhNQ1EwZ3hEVEFMQmdOVkJBZ01CRUpsY200eERUQUxCZ05WQkFjTUJFSmxjbTR4RERBSwpCZ05WQkFvTUEwSkpWREVNTUFvR0ExVUVDd3dEUlZkS01RMHdDd1lEVlFRRERBUkVVRE5VTVNNd0lRWUpLb1pJCmh2Y05BUWtCRmhSemRYQndiM0owUUdKcGRDNWhaRzFwYmk1amFEQWVGdzB5TURBME16QXhNakV4TWpaYUZ3MHoKTURBME1qZ3hNakV4TWpaYU1Ic3hDekFKQmdOVkJBWVRBa05JTVEwd0N3WURWUVFJREFSQ1pYSnVNUTB3Q3dZRApWUVFIREFSQ1pYSnVNUXd3Q2dZRFZRUUtEQU5DU1ZReEREQUtCZ05WQkFzTUEwVlhTakVOTUFzR0ExVUVBd3dFClJGQXpWREVqTUNFR0NTcUdTSWIzRFFFSkFSWVVjM1Z3Y0c5eWRFQmlhWFF1WVdSdGFXNHVZMmd3V1RBVEJnY3EKaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFTS3BHQnFoenN1Z2x5NHZEQ3E3eVRmcUZTeUJySzZRaElhTytrcAptZzJqaDlEbHVYTUJOYTRENER6TWdJV29MeEpZR0toOEFFV1dPUEF6SGkvUDJHVjZvMU13VVRBZEJnTlZIUTRFCkZnUVVpZzMzbkh3UFllU1FUQS9WbVJZYWNZWm5QOG93SHdZRFZSMGpCQmd3Rm9BVWlnMzNuSHdQWWVTUVRBL1YKbVJZYWNZWm5QOG93RHdZRFZSMFRBUUgvQkFVd0F3RUIvekFLQmdncWhrak9QUVFEQWdOSUFEQkZBaUVBK202bQpwMEk1TVRYZ3NPdE9KQXBYdHoyMFZCelRhakRFc2hOZ0E4NlVqcXdDSUJ1TzRscHRYWi9nWmk3Qmp4dHZoRll1CnpnUFNIVEszdVZocU4zUHY1ZTdjCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
BUCKET_PUBLIC_KEY : "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFc0ZjRW5PUFk0QU9BS2twdjlIU2RXMkJyaFVDVwp3TDE1SHBxdTV6SGFXeTFXbm8yS1I4RzZkWUo4UU8wdVp1MU02ajh6Nk5HWEZWWmNwdzd0WWVYQXFRPT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t"
],
test : [
test : [
CONFIG_CERTIFICATE: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNTekNDQWZHZ0F3SUJBZ0lVWkN4SHZUbVlnMEZEZGxubDRnTlNwUFcyd2Q0d0NnWUlLb1pJemowRUF3SXcKZXpFTE1Ba0dBMVVFQmhNQ1EwZ3hEVEFMQmdOVkJBZ01CRUpsY200eERUQUxCZ05WQkFjTUJFSmxjbTR4RERBSwpCZ05WQkFvTUEwSkpWREVNTUFvR0ExVUVDd3dEUlZkS01RMHdDd1lEVlFRRERBUkVVRE5VTVNNd0lRWUpLb1pJCmh2Y05BUWtCRmhSemRYQndiM0owUUdKcGRDNWhaRzFwYmk1amFEQWVGdzB5TURBME16QXhNakV4TWpaYUZ3MHoKTURBME1qZ3hNakV4TWpaYU1Ic3hDekFKQmdOVkJBWVRBa05JTVEwd0N3WURWUVFJREFSQ1pYSnVNUTB3Q3dZRApWUVFIREFSQ1pYSnVNUXd3Q2dZRFZRUUtEQU5DU1ZReEREQUtCZ05WQkFzTUEwVlhTakVOTUFzR0ExVUVBd3dFClJGQXpWREVqTUNFR0NTcUdTSWIzRFFFSkFSWVVjM1Z3Y0c5eWRFQmlhWFF1WVdSdGFXNHVZMmd3V1RBVEJnY3EKaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFTS3BHQnFoenN1Z2x5NHZEQ3E3eVRmcUZTeUJySzZRaElhTytrcAptZzJqaDlEbHVYTUJOYTRENER6TWdJV29MeEpZR0toOEFFV1dPUEF6SGkvUDJHVjZvMU13VVRBZEJnTlZIUTRFCkZnUVVpZzMzbkh3UFllU1FUQS9WbVJZYWNZWm5QOG93SHdZRFZSMGpCQmd3Rm9BVWlnMzNuSHdQWWVTUVRBL1YKbVJZYWNZWm5QOG93RHdZRFZSMFRBUUgvQkFVd0F3RUIvekFLQmdncWhrak9QUVFEQWdOSUFEQkZBaUVBK202bQpwMEk1TVRYZ3NPdE9KQXBYdHoyMFZCelRhakRFc2hOZ0E4NlVqcXdDSUJ1TzRscHRYWi9nWmk3Qmp4dHZoRll1CnpnUFNIVEszdVZocU4zUHY1ZTdjCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
BUCKET_PUBLIC_KEY : "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFc0ZjRW5PUFk0QU9BS2twdjlIU2RXMkJyaFVDVwp3TDE1SHBxdTV6SGFXeTFXbm8yS1I4RzZkWUo4UU8wdVp1MU02ajh6Nk5HWEZWWmNwdzd0WWVYQXFRPT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t"
],
abnahme: [
abnahme : [
CONFIG_CERTIFICATE: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNTekNDQWZHZ0F3SUJBZ0lVWkN4SHZUbVlnMEZEZGxubDRnTlNwUFcyd2Q0d0NnWUlLb1pJemowRUF3SXcKZXpFTE1Ba0dBMVVFQmhNQ1EwZ3hEVEFMQmdOVkJBZ01CRUpsY200eERUQUxCZ05WQkFjTUJFSmxjbTR4RERBSwpCZ05WQkFvTUEwSkpWREVNTUFvR0ExVUVDd3dEUlZkS01RMHdDd1lEVlFRRERBUkVVRE5VTVNNd0lRWUpLb1pJCmh2Y05BUWtCRmhSemRYQndiM0owUUdKcGRDNWhaRzFwYmk1amFEQWVGdzB5TURBME16QXhNakV4TWpaYUZ3MHoKTURBME1qZ3hNakV4TWpaYU1Ic3hDekFKQmdOVkJBWVRBa05JTVEwd0N3WURWUVFJREFSQ1pYSnVNUTB3Q3dZRApWUVFIREFSQ1pYSnVNUXd3Q2dZRFZRUUtEQU5DU1ZReEREQUtCZ05WQkFzTUEwVlhTakVOTUFzR0ExVUVBd3dFClJGQXpWREVqTUNFR0NTcUdTSWIzRFFFSkFSWVVjM1Z3Y0c5eWRFQmlhWFF1WVdSdGFXNHVZMmd3V1RBVEJnY3EKaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFTS3BHQnFoenN1Z2x5NHZEQ3E3eVRmcUZTeUJySzZRaElhTytrcAptZzJqaDlEbHVYTUJOYTRENER6TWdJV29MeEpZR0toOEFFV1dPUEF6SGkvUDJHVjZvMU13VVRBZEJnTlZIUTRFCkZnUVVpZzMzbkh3UFllU1FUQS9WbVJZYWNZWm5QOG93SHdZRFZSMGpCQmd3Rm9BVWlnMzNuSHdQWWVTUVRBL1YKbVJZYWNZWm5QOG93RHdZRFZSMFRBUUgvQkFVd0F3RUIvekFLQmdncWhrak9QUVFEQWdOSUFEQkZBaUVBK202bQpwMEk1TVRYZ3NPdE9KQXBYdHoyMFZCelRhakRFc2hOZ0E4NlVqcXdDSUJ1TzRscHRYWi9nWmk3Qmp4dHZoRll1CnpnUFNIVEszdVZocU4zUHY1ZTdjCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
BUCKET_PUBLIC_KEY : "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFc0ZjRW5PUFk0QU9BS2twdjlIU2RXMkJyaFVDVwp3TDE1SHBxdTV6SGFXeTFXbm8yS1I4RzZkWUo4UU8wdVp1MU02ajh6Nk5HWEZWWmNwdzd0WWVYQXFRPT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t"
],
prod : [
prod : [
CONFIG_CERTIFICATE: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNTekNDQWZHZ0F3SUJBZ0lVZFliSWwzUEJPQkRCMUUvcTN6SHdEdkF6WWhZd0NnWUlLb1pJemowRUF3SXcKZXpFTE1Ba0dBMVVFQmhNQ1EwZ3hEVEFMQmdOVkJBZ01CRUpsY200eERUQUxCZ05WQkFjTUJFSmxjbTR4RERBSwpCZ05WQkFvTUEwSkpWREVNTUFvR0ExVUVDd3dEUlZkS01RMHdDd1lEVlFRRERBUkVVRE5VTVNNd0lRWUpLb1pJCmh2Y05BUWtCRmhSemRYQndiM0owUUdKcGRDNWhaRzFwYmk1amFEQWVGdzB5TURBME16QXhNakV5TURkYUZ3MHoKTURBME1qZ3hNakV5TURkYU1Ic3hDekFKQmdOVkJBWVRBa05JTVEwd0N3WURWUVFJREFSQ1pYSnVNUTB3Q3dZRApWUVFIREFSQ1pYSnVNUXd3Q2dZRFZRUUtEQU5DU1ZReEREQUtCZ05WQkFzTUEwVlhTakVOTUFzR0ExVUVBd3dFClJGQXpWREVqTUNFR0NTcUdTSWIzRFFFSkFSWVVjM1Z3Y0c5eWRFQmlhWFF1WVdSdGFXNHVZMmd3V1RBVEJnY3EKaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFUT0k4dTlZaFMxYm5DdklVNkt0SG9ydUZhbW96Yzg4NHJxWDJ5RApVV1FLUEdZMkVnM1JBNitEajN4d29Obm0ydzlJcHdPWHpIRDErV3JuQTNMWGVaL1dvMU13VVRBZEJnTlZIUTRFCkZnUVVZb3IyVDM0cUJtTXM1RFgvVkVWcU5YcHpETUV3SHdZRFZSMGpCQmd3Rm9BVVlvcjJUMzRxQm1NczVEWC8KVkVWcU5YcHpETUV3RHdZRFZSMFRBUUgvQkFVd0F3RUIvekFLQmdncWhrak9QUVFEQWdOSUFEQkZBaUE3U2VJQwpmS1NYRlo3NjFSSDZWbUdiLzRSNC9JVlBCTVkxTkFHWUxoS3NpQUloQUpDd2JLcEo2TnVxTDUxOUpON2dqRTJCCmZ2MDJUQTZndlZpTEJObW1kbXIxCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
BUCKET_PUBLIC_KEY : "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFSzJrOW5aOGd1bzdKUDJFTFBRWG5Va3FEeWpqSgptWW1wdDlaeTBIUHNpR1hDZEkzU0ZtTHIyMDRLTnprdUlUcHBOVjVQNytiWFJ4aWlZMDROTXJFSVRnPT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t"
],
log: [
CONFIG_CERTIFICATE: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNTekNDQWZHZ0F3SUJBZ0lVZFliSWwzUEJPQkRCMUUvcTN6SHdEdkF6WWhZd0NnWUlLb1pJemowRUF3SXcKZXpFTE1Ba0dBMVVFQmhNQ1EwZ3hEVEFMQmdOVkJBZ01CRUpsY200eERUQUxCZ05WQkFjTUJFSmxjbTR4RERBSwpCZ05WQkFvTUEwSkpWREVNTUFvR0ExVUVDd3dEUlZkS01RMHdDd1lEVlFRRERBUkVVRE5VTVNNd0lRWUpLb1pJCmh2Y05BUWtCRmhSemRYQndiM0owUUdKcGRDNWhaRzFwYmk1amFEQWVGdzB5TURBME16QXhNakV5TURkYUZ3MHoKTURBME1qZ3hNakV5TURkYU1Ic3hDekFKQmdOVkJBWVRBa05JTVEwd0N3WURWUVFJREFSQ1pYSnVNUTB3Q3dZRApWUVFIREFSQ1pYSnVNUXd3Q2dZRFZRUUtEQU5DU1ZReEREQUtCZ05WQkFzTUEwVlhTakVOTUFzR0ExVUVBd3dFClJGQXpWREVqTUNFR0NTcUdTSWIzRFFFSkFSWVVjM1Z3Y0c5eWRFQmlhWFF1WVdSdGFXNHVZMmd3V1RBVEJnY3EKaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFUT0k4dTlZaFMxYm5DdklVNkt0SG9ydUZhbW96Yzg4NHJxWDJ5RApVV1FLUEdZMkVnM1JBNitEajN4d29Obm0ydzlJcHdPWHpIRDErV3JuQTNMWGVaL1dvMU13VVRBZEJnTlZIUTRFCkZnUVVZb3IyVDM0cUJtTXM1RFgvVkVWcU5YcHpETUV3SHdZRFZSMGpCQmd3Rm9BVVlvcjJUMzRxQm1NczVEWC8KVkVWcU5YcHpETUV3RHdZRFZSMFRBUUgvQkFVd0F3RUIvekFLQmdncWhrak9QUVFEQWdOSUFEQkZBaUE3U2VJQwpmS1NYRlo3NjFSSDZWbUdiLzRSNC9JVlBCTVkxTkFHWUxoS3NpQUloQUpDd2JLcEo2TnVxTDUxOUpON2dqRTJCCmZ2MDJUQTZndlZpTEJObW1kbXIxCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
BUCKET_PUBLIC_KEY : "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFSzJrOW5aOGd1bzdKUDJFTFBRWG5Va3FEeWpqSgptWW1wdDlaeTBIUHNpR1hDZEkzU0ZtTHIyMDRLTnprdUlUcHBOVjVQNytiWFJ4aWlZMDROTXJFSVRnPT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t"
]
Expand Down
25 changes: 20 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ ext.readPropertyWithDefault = { paramName, defaultValue ->
}

android {
compileSdkVersion 29
compileSdkVersion 30
buildToolsVersion "29.0.3"

defaultConfig {
applicationId "ch.admin.bag.dp3t"
minSdkVersion 23
targetSdkVersion 29
versionCode 10090
versionName "1.0.9"
targetSdkVersion 30
versionCode 11000
versionName "1.1.0"
resConfigs "en", "fr", "de", "it", "pt", "es", "sq", "bs", "hr", "sr", "rm", "tr", "ti"

buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'
Expand All @@ -66,6 +66,7 @@ android {
buildConfigField 'String', 'CONFIG_URL', '"https://www.pt-d.bfs.admin.ch/"'
buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-d.bfs.admin.ch/"'
buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-d.bfs.admin.ch/"'
buildConfigField 'String', 'STATS_URL', '"https://www.pt-d.bfs.admin.ch/"'
buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.dev.CONFIG_CERTIFICATE}\""
buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.dev.BUCKET_PUBLIC_KEY}\""
applicationIdSuffix '.dev'
Expand All @@ -76,6 +77,7 @@ android {
buildConfigField 'String', 'CONFIG_URL', '"https://www.pt-t.bfs.admin.ch/"'
buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-t.bfs.admin.ch/"'
buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-t.bfs.admin.ch/"'
buildConfigField 'String', 'STATS_URL', '"https://www.pt-t.bfs.admin.ch/"'
buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.test.CONFIG_CERTIFICATE}\""
buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.test.BUCKET_PUBLIC_KEY}\""
applicationIdSuffix '.test'
Expand All @@ -86,6 +88,7 @@ android {
buildConfigField 'String', 'CONFIG_URL', '"https://www.pt-a.bfs.admin.ch/"'
buildConfigField 'String', 'BUCKET_URL', '"https://www.pt-a.bfs.admin.ch/"'
buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-a.bfs.admin.ch/"'
buildConfigField 'String', 'STATS_URL', '"https://www.pt-a.bfs.admin.ch/"'
buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.abnahme.CONFIG_CERTIFICATE}\""
buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.abnahme.BUCKET_PUBLIC_KEY}\""
applicationIdSuffix '.abnahme'
Expand All @@ -96,6 +99,17 @@ android {
buildConfigField 'String', 'CONFIG_URL', '"https://www.pt.bfs.admin.ch/"'
buildConfigField 'String', 'BUCKET_URL', '"https://www.pt.bfs.admin.ch/"'
buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
}
log {
buildConfigField 'boolean', 'DEV_HISTORY', 'true'
buildConfigField 'String', 'AUTH_CODE_URL', '"https://codegen-service.bag.admin.ch/"'
buildConfigField 'String', 'CONFIG_URL', '"https://www.pt.bfs.admin.ch/"'
buildConfigField 'String', 'BUCKET_URL', '"https://www.pt.bfs.admin.ch/"'
buildConfigField 'String', 'REPORT_URL', '"https://www.pt1.bfs.admin.ch/"'
buildConfigField 'String', 'STATS_URL', '"https://www.pt.bfs.admin.ch/"'
buildConfigField 'String', 'CONFIG_CERTIFICATE', "\"${project.backend_certs.prod.CONFIG_CERTIFICATE}\""
buildConfigField 'String', 'BUCKET_PUBLIC_KEY', "\"${project.backend_certs.prod.BUCKET_PUBLIC_KEY}\""
}
Expand Down Expand Up @@ -138,11 +152,12 @@ sonarqube {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])

def dp3t_sdk_version = '1.0.4'
def dp3t_sdk_version = '1.0.5'
devImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version-calibration"
teschtImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
abnahmeImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
prodImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"
logImplementation "org.dpppt:dp3t-sdk-android:$dp3t_sdk_version"

implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
package ch.admin.bag.dp3t.debug;

import ch.admin.bag.dp3t.main.model.DefaultTracingStatusWrapper;
import ch.admin.bag.dp3t.home.model.DefaultTracingStatusWrapper;

public class TracingStatusWrapper extends DefaultTracingStatusWrapper {
// default implementation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import org.dpppt.android.sdk.models.ExposureDay;

import ch.admin.bag.dp3t.debug.model.DebugAppState;
import ch.admin.bag.dp3t.main.model.DefaultTracingStatusWrapper;
import ch.admin.bag.dp3t.main.model.NotificationState;
import ch.admin.bag.dp3t.home.model.DefaultTracingStatusWrapper;
import ch.admin.bag.dp3t.home.model.NotificationState;
import ch.admin.bag.dp3t.storage.SecureStorage;

public class TracingStatusWrapper extends DefaultTracingStatusWrapper {
Expand Down
56 changes: 56 additions & 0 deletions app/src/log/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
~
~ This Source Code Form is subject to the terms of the Mozilla Public
~ License, v. 2.0. If a copy of the MPL was not distributed with this
~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
~
~ SPDX-License-Identifier: MPL-2.0
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="ch.admin.bag.dp3t">

<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.INTERNET" />

<application
android:name="ch.admin.bag.dp3t.MainApplication"
android:allowBackup="false"
android:debuggable="true"
android:fullBackupContent="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_security_config"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/NextStepTheme"
tools:ignore="UnusedAttribute,HardCodedDebugMode"
tools:replace="android:fullBackupContent">

<activity
android:name="ch.admin.bag.dp3t.MainActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait"
tools:ignore="LockedOrientationActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:name="ch.admin.bag.dp3t.onboarding.OnboardingActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait"
tools:ignore="LockedOrientationActivity" />

<activity
android:name="ch.admin.bag.dp3t.inform.InformActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait"
tools:ignore="LockedOrientationActivity" />

</application>

</manifest>
24 changes: 24 additions & 0 deletions app/src/log/java/ch/admin/bag/dp3t/debug/DebugFragment.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*
* SPDX-License-Identifier: MPL-2.0
*/
package ch.admin.bag.dp3t.debug;

import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;

public class DebugFragment extends Fragment {

/**
* DOES NOT (AND MUST NOT) EXIST ON PROD.
*/
public static final boolean EXISTS = false;

public static void startDebugFragment(FragmentManager parentFragmentManager) { }

}
16 changes: 16 additions & 0 deletions app/src/log/java/ch/admin/bag/dp3t/debug/TracingStatusWrapper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
* Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*
* SPDX-License-Identifier: MPL-2.0
*/
package ch.admin.bag.dp3t.debug;

import ch.admin.bag.dp3t.main.model.DefaultTracingStatusWrapper;

public class TracingStatusWrapper extends DefaultTracingStatusWrapper {
// default implementation
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
~ SPDX-License-Identifier: MPL-2.0
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/colorAccent" android:state_enabled="true"/>
<item android:color="@android:color/darker_gray" android:state_enabled="false"/>
</selector>
<network-security-config>
<base-config>
<trust-anchors>
<certificates src="system" />
<!-- Trust user added CAs while debuggable only -->
<certificates src="user" />
</trust-anchors>
</base-config>
</network-security-config>
20 changes: 20 additions & 0 deletions app/src/logDebug/res/xml/network_security_config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
~
~ This Source Code Form is subject to the terms of the Mozilla Public
~ License, v. 2.0. If a copy of the MPL was not distributed with this
~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
~
~ SPDX-License-Identifier: MPL-2.0
-->

<network-security-config>
<base-config>
<trust-anchors>
<certificates src="system" />
<!-- Trust user added CAs while debuggable only -->
<certificates src="user" />
</trust-anchors>
</base-config>
</network-security-config>
17 changes: 6 additions & 11 deletions app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand All @@ -21,11 +20,11 @@

import org.dpppt.android.sdk.DP3T;

import ch.admin.bag.dp3t.main.HomeFragment;
import ch.admin.bag.dp3t.networking.ConfigWorker;
import ch.admin.bag.dp3t.onboarding.OnboardingActivity;
import ch.admin.bag.dp3t.reports.ReportsFragment;
import ch.admin.bag.dp3t.storage.SecureStorage;
import ch.admin.bag.dp3t.util.UrlUtil;
import ch.admin.bag.dp3t.viewmodel.TracingViewModel;

public class MainActivity extends FragmentActivity {
Expand Down Expand Up @@ -61,14 +60,10 @@ protected void onCreate(Bundle savedInstanceState) {
.create();
forceUpdateDialog.setOnShowListener(dialog ->
forceUpdateDialog.getButton(DialogInterface.BUTTON_POSITIVE)
.setOnClickListener(v -> {
String packageName = getPackageName();
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("market://details?id=" + packageName));
if (intent.resolveActivity(getPackageManager()) != null) {
startActivity(intent);
}
}));
.setOnClickListener(v -> {
String packageName = getPackageName();
UrlUtil.openUrl(MainActivity.this, "market://details?id=" + packageName);
}));
forceUpdateDialog.show();
} else if (!forceUpdate && forceUpdateDialog != null) {
forceUpdateDialog.dismiss();
Expand Down Expand Up @@ -136,7 +131,7 @@ private void checkIntentForActions() {
private void showHomeFragment() {
getSupportFragmentManager()
.beginTransaction()
.add(R.id.main_fragment_container, HomeFragment.newInstance())
.add(R.id.main_fragment_container, TabbarHostFragment.newInstance())
.commit();
}

Expand Down
Loading

0 comments on commit 1cc2f7c

Please sign in to comment.