Merge pull request #165 from DP-3T/develop

Version 1.0.7

README.md

@@ -24,7 +24,7 @@ The app design, UX and implementation was done by [Ubique](https://www.ubique.ch
 
 This project is truly open-source and we welcome any feedback on the code regarding both the implementation and security aspects.
 
-Bugs or potential problems should be reported using Github issues. We welcome all pull requests that improve the quality the source code. Please note that the app will be available with approved translations in English, German, French, Italian, Romansh, Albanian, Bosnian, Croatian, Portuguese, Serbian and Spanish. Pull requests for additional translations currently won't be merged.
+Bugs or potential problems should be reported using Github issues. We welcome all pull requests that improve the quality of the source code. Please note that the app will be available with approved translations in English, German, French, Italian, Romansh, Albanian, Bosnian, Croatian, Portuguese, Serbian and Spanish. Pull requests for additional translations currently won't be merged.
 
 Platform independent UX and design discussions should be reported in [dp3t-ux-screenflows-ch](https://github.com/DP-3T/dp3t-ux-screenflows-ch)
 
@@ -57,4 +57,4 @@ The app will not be functional unless your Google account is whitelisted for Exp
 To verify that the app distributed on the PlayStore was built by the source code published here, please see the instructions in [REPRODUCIBLE_BUILDS.md](REPRODUCIBLE_BUILDS.md).
 
 ## License
-This project is licensed under the terms of the MPL 2 license. See the [LICENSE](LICENSE) file.
+This project is licensed under the terms of the MPL 2 license. See the [LICENSE](LICENSE) file.

REPRODUCIBLE_BUILDS.md

@@ -50,6 +50,12 @@ cd ~/dp3t-app-android-ch
 adb pull `adb shell pm path ch.admin.bag.dp3t | cut -d':' -f2` swisscovid-store.apk
 ```
 
+If you want to check the version of the APK you are pulling from your device:
+
+```shell
+adb shell dumpsys package ch.admin.bag.dp3t | grep versionName=| cut -d '=' -f 2
+```
+
 ## Compare the two files
 
 1. Make sure you have `python` installed

app/build.gradle

@@ -40,8 +40,8 @@ android {
 		applicationId "ch.admin.bag.dp3t"
 		minSdkVersion 23
 		targetSdkVersion 29
-		versionCode 10050
-		versionName "1.0.5"
+		versionCode 10070
+		versionName "1.0.7"
 		resConfigs "en", "fr", "de", "it", "pt", "es", "sq", "bs", "hr", "sr", "rm"
 
 		buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'
@@ -68,6 +68,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-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'
 		}
 		tescht {
 			buildConfigField 'boolean', 'DEV_HISTORY', 'true'
@@ -77,6 +78,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-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'
 		}
 		abnahme {
 			buildConfigField 'boolean', 'DEV_HISTORY', 'true'
@@ -86,6 +88,7 @@ android {
 			buildConfigField 'String', 'REPORT_URL', '"https://www.pt1-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'
 		}
 		prod {
 			buildConfigField 'boolean', 'DEV_HISTORY', 'false'
@@ -135,7 +138,7 @@ sonarqube {
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 
-	def dp3t_sdk_version = '1.0.0'
+	def dp3t_sdk_version = '1.0.2'
 	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"

app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java

@@ -23,7 +23,7 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import org.dpppt.android.sdk.DP3T;
-import org.dpppt.android.sdk.internal.ExposureDayStorage;
+import org.dpppt.android.sdk.internal.storage.ExposureDayStorage;
 import org.dpppt.android.sdk.models.DayDate;
 import org.dpppt.android.sdk.models.ExposureDay;
 

app/src/main/assets/impressum/bs/impressum.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="bs"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/bs/licence.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="bs"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/de/impressum.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="de"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/de/licence.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="de"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/en/impressum.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="en"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/en/licence.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="en"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/es/impressum.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="es"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/es/licence.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="es"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/fr/impressum.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="fr"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/fr/licence.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="fr"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/hr/impressum.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="hr"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/hr/licence.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="hr"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/it/impressum.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="it"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/it/licence.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="it"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/pt/impressum.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="pt"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/pt/licence.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="pt"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/rm/impressum.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="rm"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/rm/licence.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="rm"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/sq/impressum.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="sq"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/sq/licence.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="sq"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/sr/impressum.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="sr"><head>
     <title> SwissCovid </title>

app/src/main/assets/impressum/sr/licence.html

@@ -1,3 +1,13 @@
+<!--
+  ~ 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
+  -->
+
 <!DOCTYPE html>
 <html lang="sr"><head>
     <title> SwissCovid </title>

app/src/main/java/ch/admin/bag/dp3t/MainActivity.java

@@ -75,7 +75,8 @@ protected void onCreate(Bundle savedInstanceState) {
 				forceUpdateDialog = null;
 			}
 		});
-		ConfigWorker.startConfigWorker(this);
+
+		ConfigWorker.scheduleConfigWorkerIfOutdated(this);
 
 		if (savedInstanceState == null) {
 			boolean onboardingCompleted = secureStorage.getOnboardingCompleted();