Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

Commit 5f44c06

Browse files
grahamhayesgrahamhayes
committedSep 30, 2021
Add Wallet Android App build to Github CI
- Add upstream repo dgca-wallet-app-android @ 8edef54e6f942a6ad2dc9d2184b98ecf0204c355 - Add 2 internal patches - Change URI to APECOEs staging environment - Allow screenshots and screen sharing for app Signed-off-by: Graham Hayes <[email protected]>
1 parent b9587c4 commit 5f44c06

5 files changed

+188
-0
lines changed
 

‎.github/workflows/upstream-dgca-wallet-app-android.yml

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# Sourced from https://github.com/eu-digital-green-certificates/dgca-verifier-app-android/blob/d312c29132477faeb2a2b69d4adb4b1bab533a81/.github/workflows/ci.yml
2+
3+
# Copyright (C) 2021 T-Systems International GmbH and all other contributors
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
name: "Upstream: dgca-wallet-app-android"
18+
19+
on:
20+
pull_request:
21+
branches:
22+
- 'main'
23+
paths:
24+
- 'upstream/dgca-wallet-app-android'
25+
- 'upstream/patches/dgca-wallet-app-android/**'
26+
- '.github/workflows/upstream-dgca-wallet-app-android.yml'
27+
push:
28+
branches:
29+
- main
30+
paths:
31+
- 'upstream/dgca-wallet-app-android'
32+
- 'upstream/patches/dgca-wallet-app-android/**'
33+
- '.github/workflows/upstream-dgca-wallet-app-android.yml'
34+
35+
jobs:
36+
build:
37+
runs-on: ubuntu-20.04
38+
steps:
39+
- uses: actions/setup-java@v2
40+
with:
41+
java-version: 8
42+
distribution: adopt
43+
- uses: actions/checkout@v2
44+
with:
45+
submodules: true
46+
fetch-depth: 0
47+
- name: patch-app
48+
working-directory: ./upstream/dgca-wallet-app-android
49+
run: >-
50+
for f in ../patches/dgca-wallet-app-android/*.patch; do
51+
patch -p1 < $f;
52+
done;
53+
- name: patch-core
54+
working-directory: ./upstream/dgca-app-core-android
55+
run: >-
56+
for f in ../patches/dgca-app-core-android/*.patch; do
57+
patch -p1 < $f;
58+
done;
59+
- uses: android-actions/setup-android@v2
60+
- uses: actions/cache@v2
61+
with:
62+
path: |
63+
~/.gradle/caches
64+
~/.gradle/wrapper
65+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
66+
- name: build
67+
working-directory: ./upstream/dgca-wallet-app-android
68+
run: |-
69+
./gradlew --no-daemon build -PCONFIG_FILE_NAME="verifier-context.jsonc"
70+
71+
- name: Archive apks
72+
uses: actions/upload-artifact@v2
73+
with:
74+
name: apks
75+
path: |
76+
./upstream/dgca-wallet-app-android/app/build/outputs/apk/acc/release/*
77+
./upstream/dgca-wallet-app-android/app/build/outputs/apk/acc/debug/*
78+
retention-days: 5

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@
2525
[submodule "upstream/dgca-app-core-android"]
2626
path = upstream/dgca-app-core-android
2727
url = https://github.com/eu-digital-green-certificates/dgca-app-core-android.git
28+
[submodule "upstream/dgca-wallet-app-android"]
29+
path = upstream/dgca-wallet-app-android
30+
url = https://github.com/eu-digital-green-certificates/dgca-wallet-app-android

‎upstream/dgca-wallet-app-android

Submodule dgca-wallet-app-android added at 8edef54

‎upstream/patches/dgca-wallet-app-android/0001-APECOE-Patch-Update-Context-API-URLs-and-Keys.patch

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
From 763a3461e007e1ba9f045e5a260542616ba36bf9 Mon Sep 17 00:00:00 2001
2+
From: Kiall Mac Innes <kimacinn@microsoft.com>
3+
Date: Fri, 23 Jul 2021 14:07:17 +0000
4+
Subject: [PATCH 1/2] APECOE Patch: Update Context / API URLs and Keys
5+
6+
Update Context / API URLs and Keys.
7+
---
8+
app/src/acc/assets/wallet-context.jsonc | 25 ++++++++-----------
9+
.../wallet/app/android/di/NetworkModule.kt | 2 +-
10+
2 files changed, 11 insertions(+), 16 deletions(-)
11+
12+
diff --git a/app/src/acc/assets/wallet-context.jsonc b/app/src/acc/assets/wallet-context.jsonc
13+
index e0dcbd4..c82807d 100644
14+
--- a/app/src/acc/assets/wallet-context.jsonc
15+
+++ b/app/src/acc/assets/wallet-context.jsonc
16+
@@ -4,39 +4,34 @@
17+
"default": {
18+
"privacyUrl": "https://publications.europa.eu/en/web/about-us/legal-notices/eu-mobile-apps",
19+
"context": {
20+
- "url": "https://dgca-issuance-web-eu-acc.cfapps.eu10.hana.ondemand.com/dgca-issuance-service/context",
21+
+ "url": "https://dgca-issuance-service.eudgc-ie.apecoe.net/context",
22+
"pubKeys": [
23+
- "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=",
24+
- "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E="
25+
+ "C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHFr8M="
26+
]
27+
},
28+
"endpoints": {
29+
"claim": {
30+
- "url": "https://dgca-issuance-web-eu-acc.cfapps.eu10.hana.ondemand.com/dgca-issuance-service/dgci/wallet/claim",
31+
+ "url": "https://dgca-issuance-service.eudgc-ie.apecoe.net/dgci/wallet/claim",
32+
"pubKeys": [
33+
- "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=",
34+
- "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E="
35+
+ "C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHFr8M="
36+
]
37+
},
38+
"countryList": {
39+
- "url": "https://dgca-issuance-web-eu-acc.cfapps.eu10.hana.ondemand.com/dgca-businessrule-service/countrylist",
40+
+ "url": "https://dgca-businessrule-service.eudgc-ie.apecoe.net/countrylist",
41+
"pubKeys": [
42+
- "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=",
43+
- "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E="
44+
+ "C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHFr8M="
45+
]
46+
},
47+
"rules": {
48+
- "url": "https://dgca-issuance-web-eu-acc.cfapps.eu10.hana.ondemand.com/dgca-businessrule-service/rules",
49+
+ "url": "https://dgca-businessrule-service.eudgc-ie.apecoe.net/rules",
50+
"pubKeys": [
51+
- "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=",
52+
- "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E="
53+
+ "C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHFr8M="
54+
]
55+
},
56+
"valuesets": {
57+
- "url": "https://dgca-issuance-web-eu-acc.cfapps.eu10.hana.ondemand.com/dgca-businessrule-service/valuesets",
58+
+ "url": "https://dgca-businessrule-service.eudgc-ie.apecoe.net/valuesets",
59+
"pubKeys": [
60+
- "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=",
61+
- "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E="
62+
+ "C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHFr8M="
63+
]
64+
}
65+
}
66+
diff --git a/app/src/main/java/dgca/wallet/app/android/di/NetworkModule.kt b/app/src/main/java/dgca/wallet/app/android/di/NetworkModule.kt
67+
index 2c0e7c6..62e309c 100644
68+
--- a/app/src/main/java/dgca/wallet/app/android/di/NetworkModule.kt
69+
+++ b/app/src/main/java/dgca/wallet/app/android/di/NetworkModule.kt
70+
@@ -45,7 +45,7 @@ import javax.inject.Singleton
71+
72+
private const val CONNECT_TIMEOUT = 30L
73+
74+
-const val BASE_URL = "https://dgca-issuance-web.cfapps.eu10.hana.ondemand.com/"
75+
+const val BASE_URL = "https://dgca-issuance-web.eudgc-ie.apecoe.net/"
76+
const val SHA256_PREFIX = "sha256/"
77+
78+
@InstallIn(SingletonComponent::class)
79+
--
80+
2.21.0
81+

‎upstream/patches/dgca-wallet-app-android/0002-Remove-screenshot-protection.patch

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 2ec93fa0b28a8750bd1d5b77eb342a79fc368ec4 Mon Sep 17 00:00:00 2001
2+
From: Graham Hayes <gr@ham.ie>
3+
Date: Tue, 24 Aug 2021 15:21:34 +0100
4+
Subject: [PATCH 2/2] Remove screenshot protection
5+
6+
Signed-off-by: Graham Hayes <gr@ham.ie>
7+
---
8+
app/src/main/java/dgca/wallet/app/android/MainActivity.kt | 1 -
9+
1 file changed, 1 deletion(-)
10+
11+
diff --git a/app/src/main/java/dgca/wallet/app/android/MainActivity.kt b/app/src/main/java/dgca/wallet/app/android/MainActivity.kt
12+
index 28d7b1a..b46c9b9 100644
13+
--- a/app/src/main/java/dgca/wallet/app/android/MainActivity.kt
14+
+++ b/app/src/main/java/dgca/wallet/app/android/MainActivity.kt
15+
@@ -40,7 +40,6 @@ class MainActivity : AppCompatActivity() {
16+
17+
override fun onCreate(savedInstanceState: Bundle?) {
18+
super.onCreate(savedInstanceState)
19+
- window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
20+
21+
binding = ActivityMainBinding.inflate(layoutInflater)
22+
setContentView(binding.root)
23+
--
24+
2.21.0
25+

0 commit comments

Comments
 (0)
This repository has been archived.