Commit 4c4be787f883cf4e65d19b18973b7930ff2fd68c - ausweisapp2

+4

-7

AUTHORS less more

0		Copyright (c) 2014-2018 Governikus GmbH & Co. KG
	0	Copyright (c) 2014-2020 Governikus GmbH & Co. KG
1	1
2	2
3	3	Authors

10	10	Jan Murawski
11	11	Lars Schmertmann
12	12	Jens Trillmann
13
14
15
16
17		Contributors
18		----------------
	13	Jan Möller
	14	Jan Niklas Hasse
	15	Mike Achtelik

+4

-2

CMakeLists.txt less more

39	39	SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "Required macOS version")
40	40	ENDIF()
41	41
42		PROJECT(AusweisApp2 VERSION 1.20.0 LANGUAGES ${LANGUAGES})
	42	PROJECT(AusweisApp2 VERSION 1.20.1 LANGUAGES ${LANGUAGES})
43	43
44	44	# Set TWEAK if not defined in PROJECT_VERSION above to
45	45	# have a valid tweak version without propagating it

66	66	IF(EXISTS "${VENDOR_FILE}")
67	67	FILE(READ "${VENDOR_FILE}" VENDOR)
68	68	STRING(STRIP "${VENDOR}" VENDOR)
	69	ELSEIF(LINUX OR BSD)
	70	SET(VENDOR "") # Qt uses Organization for pathes
69	71	ELSE()
70	72	SET(VENDOR AusweisApp2_CE) # CommunityEdition
71	73	ENDIF()

135	137	RETURN()
136	138	ENDIF()
137	139
138		IF("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
	140	IF(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
139	141	INCLUDE(CTest)
140	142	CONFIGURE_FILE("${CMAKE_DIR}/CTestCustom.cmake.in" "${CMAKE_BINARY_DIR}/CTestCustom.cmake" @ONLY)
141	143	CONFIGURE_FILE("${RESOURCES_DIR}/sonar-project.properties.in" "${CMAKE_BINARY_DIR}/sonar-project.properties" @ONLY)

+35

-35

LICENSE.officially.txt less more

17	17	EUPL © Europäische Union 2007, 2016
18	18
19	19
20		Diese Open-Source-Lizenz für die Europäische Union („EUPL“) gilt für Werke (im Sinne der nachfolgenden Begriffsbestimmung),
	20	Diese Open-Source-Lizenz für die Europäische Union (»EUPL«) gilt für Werke (im Sinne der nachfolgenden Begriffsbestimmung),
21	21	die unter EUPL-Bedingungen zur Verfügung gestellt werden. Das Werk darf nur in der durch diese Lizenz
22	22	gestatteten Form genutzt werden (insoweit eine solche Nutzung dem Urheber vorbehalten ist).
23	23

34	34
35	35	Für diese Lizenz gelten folgende Begriffsbestimmungen:
36	36
37		- „Lizenz“: diese Lizenz.
38
39		- „Originalwerk“: das Werk oder die Software, die vom Lizenzgeber unter dieser Lizenz verbreitet oder zugänglich
	37	- »Lizenz«: diese Lizenz.
	38
	39	- »Originalwerk«: das Werk oder die Software, die vom Lizenzgeber unter dieser Lizenz verbreitet oder zugänglich
40	40	gemacht wird, und zwar als Quellcode und gegebenenfalls auch als ausführbarer Code.
41	41
42		- „Bearbeitungen“: die Werke oder Software, die der Lizenznehmer auf der Grundlage des Originalwerks oder seiner
	42	- »Bearbeitungen«: die Werke oder Software, die der Lizenznehmer auf der Grundlage des Originalwerks oder seiner
43	43	Bearbeitungen schaffen kann. In dieser Lizenz wird nicht festgelegt, wie umfangreich die Änderung oder wie stark die
44	44	Abhängigkeit vom Originalwerk für eine Einstufung als Bearbeitung sein muss; dies bestimmt sich nach dem
45	45	Urheberrecht, das in dem unter Artikel 15 aufgeführten Land anwendbar ist.
46	46
47		- „Werk“: das Originalwerk oder seine Bearbeitungen.
48
49		- „Quellcode“: diejenige Form des Werkes, die zur Auffassung durch den Menschen bestimmt ist und die am besten
	47	- »Werk«: das Originalwerk oder seine Bearbeitungen.
	48
	49	- »Quellcode«: diejenige Form des Werkes, die zur Auffassung durch den Menschen bestimmt ist und die am besten
50	50	geeignet ist, um vom Menschen verstanden und verändert zu werden.
51	51
52		- „Ausführbarer Code“: die — üblicherweise — kompilierte Form des Werks, die von einem Computer als Programm
	52	- »Ausführbarer Code«: die - üblicherweise - kompilierte Form des Werks, die von einem Computer als Programm
53	53	ausgeführt werden soll.
54	54
55		- „Lizenzgeber“: die natürliche oder juristische Person, die das Werk unter der Lizenz verbreitet oder zugänglich
	55	- »Lizenzgeber«: die natürliche oder juristische Person, die das Werk unter der Lizenz verbreitet oder zugänglich
56	56	macht.
57	57
58		- „Bearbeiter“: jede natürliche oder juristische Person, die das Werk unter der Lizenz verändert oder auf andere Weise
	58	- »Bearbeiter«: jede natürliche oder juristische Person, die das Werk unter der Lizenz verändert oder auf andere Weise
59	59	zur Schaffung einer Bearbeitung beiträgt.
60	60
61		- „Lizenznehmer“ („Sie“): jede natürliche oder juristische Person, die das Werk unter den Lizenzbedingungen nutzt.
62
63		- „Verbreitung“ oder „Zugänglichmachung“: alle Formen von Verkauf, Überlassung, Verleih, Vermietung, Verbreitung,
	61	- »Lizenznehmer« (»Sie«): jede natürliche oder juristische Person, die das Werk unter den Lizenzbedingungen nutzt.
	62
	63	- »Verbreitung« oder »Zugänglichmachung«: alle Formen von Verkauf, Überlassung, Verleih, Vermietung, Verbreitung,
64	64	Weitergabe, Übermittlung oder anderweitiger Online- oder Offline-Bereitstellung von Vervielfältigungen des Werks
65	65	oder Zugänglichmachung seiner wesentlichen Funktionen für dritte natürliche oder juristische Personen.
66	66

126	126	sowie diese Lizenz beifügen. Der Lizenznehmer muss auf jedem abgeleiteten Werk deutlich darauf hinweisen, dass das
127	127	Werk geändert wurde, und das Datum der Bearbeitung angeben.
128	128
129		„Copyleft“-Klausel: Der Lizenznehmer darf Vervielfältigungen des Originalwerks oder Bearbeitungen nur unter den
	129	»Copyleft«-Klausel: Der Lizenznehmer darf Vervielfältigungen des Originalwerks oder Bearbeitungen nur unter den
130	130	Bedingungen dieser EUPL oder einer neueren Version dieser Lizenz verbreiten oder zugänglich machen, außer wenn das
131		Originalwerk ausdrücklich nur unter dieser Lizenzversion — z. B. mit der Angabe „Nur EUPL V. 1.2“ — verbreitet
	131	Originalwerk ausdrücklich nur unter dieser Lizenzversion - z. B. mit der Angabe »Nur EUPL V. 1.2« - verbreitet
132	132	werden darf. Der Lizenznehmer (der zum Lizenzgeber wird) darf für das Werk oder die Bearbeitung keine zusätzlichen
133	133	Bedingungen anbieten oder vorschreiben, die die Bedingungen dieser Lizenz verändern oder einschränken.
134	134
135	135	Kompatibilitäts-Klausel: Wenn der Lizenznehmer Bearbeitungen, die auf dem Werk und einem anderen Werk, das
136	136	unter einer kompatiblen Lizenz lizenziert wurde, basieren, oder die Kopien dieser Bearbeitungen verbreitet oder
137		zugänglich macht, kann dies unter den Bedingungen dieser kompatiblen Lizenz erfolgen. Unter „kompatibler Lizenz“ ist
	137	zugänglich macht, kann dies unter den Bedingungen dieser kompatiblen Lizenz erfolgen. Unter »kompatibler Lizenz« ist
138	138	eine im Anhang dieser Lizenz angeführte Lizenz zu verstehen. Sollten die Verpflichtungen des Lizenznehmers aus der
139	139	kompatiblen Lizenz mit denjenigen aus der vorliegenden Lizenz (EUPL) in Konflikt stehen, werden die Verpflichtungen
140	140	aus der kompatiblen Lizenz Vorrang haben.

164	164	7. Gewährleistungsausschluss
165	165
166	166	Die Arbeit an diesem Werk wird laufend fortgeführt; es wird durch unzählige Bearbeiter ständig verbessert. Das Werk ist
167		nicht vollendet und kann daher Fehler („bugs“) enthalten, die dieser Art der Entwicklung inhärent sind.
168
169		Aus den genannten Gründen wird das Werk unter dieser Lizenz „so, wie es ist“ ohne jegliche Gewährleistung zur
170		Verfügung gestellt. Dies gilt unter anderem — aber nicht ausschließlich — für Marktreife, Verwendbarkeit für einen
	167	nicht vollendet und kann daher Fehler (»bugs«) enthalten, die dieser Art der Entwicklung inhärent sind.
	168
	169	Aus den genannten Gründen wird das Werk unter dieser Lizenz »so, wie es ist« ohne jegliche Gewährleistung zur
	170	Verfügung gestellt. Dies gilt unter anderem - aber nicht ausschließlich - für Marktreife, Verwendbarkeit für einen
171	171	bestimmten Zweck, Mängelfreiheit, Richtigkeit sowie Nichtverletzung von anderen Immaterialgüterrechten als dem
172	172	Urheberrecht (vgl. dazu Artikel 6 dieser Lizenz).
173	173

198	198
199	199	10. Annahme der Lizenz
200	200
201		Sie können den Bestimmungen dieser Lizenz zustimmen, indem Sie das Symbol „Lizenz annehmen“ unter dem Fenster
	201	Sie können den Bestimmungen dieser Lizenz zustimmen, indem Sie das Symbol »Lizenz annehmen« unter dem Fenster
202	202	mit dem Lizenztext anklicken oder indem Sie Ihre Zustimmung auf vergleichbare Weise in einer nach anwendbarem
203	203	Recht zulässigen Form geben. Das Anklicken des Symbols gilt als Anzeichen Ihrer eindeutigen und unwiderruflichen
204	204	Annahme der Lizenz und der darin enthaltenen Klauseln und Bedingungen.

267	267
268	268	Anlage
269	269
270		„Kompatible Lizenzen“ nach Artikel 5 der EUPL sind:
	270	»Kompatible Lizenzen« nach Artikel 5 der EUPL sind:
271	271
272	272	- GNU General Public License (GPL) v. 2, v. 3
273	273

287	287
288	288	- European Union Public Licence (EUPL) v. 1.1, v. 1.2
289	289
290		- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) oder Strong Reciprocity (LiLiQ-R+)
	290	- Québec Free and Open-Source Licence - Reciprocity (LiLiQ-R) oder Strong Reciprocity (LiLiQ-R+)
291	291
292	292	- Die Europäische Kommission kann diesen Anhang aktualisieren, um neuere Fassungen der obigen Lizenzen
293	293	aufzunehmen, ohne hierfür eine neue Fassung der EUPL auszuarbeiten, solange diese Lizenzen die in Artikel 2

502	502
503	503	0. Additional Definitions.
504	504
505		As used herein, “this License” refers to version 3 of the GNU Lesser
506		General Public License, and the “GNU GPL” refers to version 3 of the
	505	As used herein, «this License» refers to version 3 of the GNU Lesser
	506	General Public License, and the «GNU GPL» refers to version 3 of the
507	507	GNU General Public License.
508	508
509		“The Library” refers to a covered work governed by this License,
	509	«The Library» refers to a covered work governed by this License,
510	510	other than an Application or a Combined Work as defined below.
511	511
512		An “Application” is any work that makes use of an interface provided
	512	An «Application» is any work that makes use of an interface provided
513	513	by the Library, but which is not otherwise based on the Library.
514	514	Defining a subclass of a class defined by the Library is deemed a mode
515	515	of using an interface provided by the Library.
516	516
517		A “Combined Work” is a work produced by combining or linking an
	517	A «Combined Work» is a work produced by combining or linking an
518	518	Application with the Library. The particular version of the Library
519		with which the Combined Work was made is also called the “Linked
520		Version”.
521
522		The “Minimal Corresponding Source” for a Combined Work means the
	519	with which the Combined Work was made is also called the «Linked
	520	Version».
	521
	522	The «Minimal Corresponding Source» for a Combined Work means the
523	523	Corresponding Source for the Combined Work, excluding any source code
524	524	for portions of the Combined Work that, considered in isolation, are
525	525	based on the Application, and not on the Linked Version.
526	526
527		The “Corresponding Application Code” for a Combined Work means the
	527	The «Corresponding Application Code» for a Combined Work means the
528	528	object code and/or source code for the Application, including any data
529	529	and utility programs needed for reproducing the Combined Work from the
530	530	Application, but excluding the System Libraries of the Combined Work.

639	639
640	640	Each version is given a distinguishing version number. If the Library
641	641	as you received it specifies that a certain numbered version of the
642		GNU Lesser General Public License “or any later version” applies to
	642	GNU Lesser General Public License «or any later version» applies to
643	643	it, you have the option of following the terms and conditions either
644	644	of that published version or of any later version published by the
645	645	Free Software Foundation. If the Library as you received it does not

+35

-35

LICENSE.txt less more

10	10	EUPL © Europäische Union 2007, 2016
11	11
12	12
13		Diese Open-Source-Lizenz für die Europäische Union („EUPL“) gilt für Werke (im Sinne der nachfolgenden Begriffsbestimmung),
	13	Diese Open-Source-Lizenz für die Europäische Union (»EUPL«) gilt für Werke (im Sinne der nachfolgenden Begriffsbestimmung),
14	14	die unter EUPL-Bedingungen zur Verfügung gestellt werden. Das Werk darf nur in der durch diese Lizenz
15	15	gestatteten Form genutzt werden (insoweit eine solche Nutzung dem Urheber vorbehalten ist).
16	16

27	27
28	28	Für diese Lizenz gelten folgende Begriffsbestimmungen:
29	29
30		- „Lizenz“: diese Lizenz.
31
32		- „Originalwerk“: das Werk oder die Software, die vom Lizenzgeber unter dieser Lizenz verbreitet oder zugänglich
	30	- »Lizenz«: diese Lizenz.
	31
	32	- »Originalwerk«: das Werk oder die Software, die vom Lizenzgeber unter dieser Lizenz verbreitet oder zugänglich
33	33	gemacht wird, und zwar als Quellcode und gegebenenfalls auch als ausführbarer Code.
34	34
35		- „Bearbeitungen“: die Werke oder Software, die der Lizenznehmer auf der Grundlage des Originalwerks oder seiner
	35	- »Bearbeitungen«: die Werke oder Software, die der Lizenznehmer auf der Grundlage des Originalwerks oder seiner
36	36	Bearbeitungen schaffen kann. In dieser Lizenz wird nicht festgelegt, wie umfangreich die Änderung oder wie stark die
37	37	Abhängigkeit vom Originalwerk für eine Einstufung als Bearbeitung sein muss; dies bestimmt sich nach dem
38	38	Urheberrecht, das in dem unter Artikel 15 aufgeführten Land anwendbar ist.
39	39
40		- „Werk“: das Originalwerk oder seine Bearbeitungen.
41
42		- „Quellcode“: diejenige Form des Werkes, die zur Auffassung durch den Menschen bestimmt ist und die am besten
	40	- »Werk«: das Originalwerk oder seine Bearbeitungen.
	41
	42	- »Quellcode«: diejenige Form des Werkes, die zur Auffassung durch den Menschen bestimmt ist und die am besten
43	43	geeignet ist, um vom Menschen verstanden und verändert zu werden.
44	44
45		- „Ausführbarer Code“: die — üblicherweise — kompilierte Form des Werks, die von einem Computer als Programm
	45	- »Ausführbarer Code«: die - üblicherweise - kompilierte Form des Werks, die von einem Computer als Programm
46	46	ausgeführt werden soll.
47	47
48		- „Lizenzgeber“: die natürliche oder juristische Person, die das Werk unter der Lizenz verbreitet oder zugänglich
	48	- »Lizenzgeber«: die natürliche oder juristische Person, die das Werk unter der Lizenz verbreitet oder zugänglich
49	49	macht.
50	50
51		- „Bearbeiter“: jede natürliche oder juristische Person, die das Werk unter der Lizenz verändert oder auf andere Weise
	51	- »Bearbeiter«: jede natürliche oder juristische Person, die das Werk unter der Lizenz verändert oder auf andere Weise
52	52	zur Schaffung einer Bearbeitung beiträgt.
53	53
54		- „Lizenznehmer“ („Sie“): jede natürliche oder juristische Person, die das Werk unter den Lizenzbedingungen nutzt.
55
56		- „Verbreitung“ oder „Zugänglichmachung“: alle Formen von Verkauf, Überlassung, Verleih, Vermietung, Verbreitung,
	54	- »Lizenznehmer« (»Sie«): jede natürliche oder juristische Person, die das Werk unter den Lizenzbedingungen nutzt.
	55
	56	- »Verbreitung« oder »Zugänglichmachung«: alle Formen von Verkauf, Überlassung, Verleih, Vermietung, Verbreitung,
57	57	Weitergabe, Übermittlung oder anderweitiger Online- oder Offline-Bereitstellung von Vervielfältigungen des Werks
58	58	oder Zugänglichmachung seiner wesentlichen Funktionen für dritte natürliche oder juristische Personen.
59	59

119	119	sowie diese Lizenz beifügen. Der Lizenznehmer muss auf jedem abgeleiteten Werk deutlich darauf hinweisen, dass das
120	120	Werk geändert wurde, und das Datum der Bearbeitung angeben.
121	121
122		„Copyleft“-Klausel: Der Lizenznehmer darf Vervielfältigungen des Originalwerks oder Bearbeitungen nur unter den
	122	»Copyleft«-Klausel: Der Lizenznehmer darf Vervielfältigungen des Originalwerks oder Bearbeitungen nur unter den
123	123	Bedingungen dieser EUPL oder einer neueren Version dieser Lizenz verbreiten oder zugänglich machen, außer wenn das
124		Originalwerk ausdrücklich nur unter dieser Lizenzversion — z. B. mit der Angabe „Nur EUPL V. 1.2“ — verbreitet
	124	Originalwerk ausdrücklich nur unter dieser Lizenzversion - z. B. mit der Angabe »Nur EUPL V. 1.2« - verbreitet
125	125	werden darf. Der Lizenznehmer (der zum Lizenzgeber wird) darf für das Werk oder die Bearbeitung keine zusätzlichen
126	126	Bedingungen anbieten oder vorschreiben, die die Bedingungen dieser Lizenz verändern oder einschränken.
127	127
128	128	Kompatibilitäts-Klausel: Wenn der Lizenznehmer Bearbeitungen, die auf dem Werk und einem anderen Werk, das
129	129	unter einer kompatiblen Lizenz lizenziert wurde, basieren, oder die Kopien dieser Bearbeitungen verbreitet oder
130		zugänglich macht, kann dies unter den Bedingungen dieser kompatiblen Lizenz erfolgen. Unter „kompatibler Lizenz“ ist
	130	zugänglich macht, kann dies unter den Bedingungen dieser kompatiblen Lizenz erfolgen. Unter »kompatibler Lizenz« ist
131	131	eine im Anhang dieser Lizenz angeführte Lizenz zu verstehen. Sollten die Verpflichtungen des Lizenznehmers aus der
132	132	kompatiblen Lizenz mit denjenigen aus der vorliegenden Lizenz (EUPL) in Konflikt stehen, werden die Verpflichtungen
133	133	aus der kompatiblen Lizenz Vorrang haben.

157	157	7. Gewährleistungsausschluss
158	158
159	159	Die Arbeit an diesem Werk wird laufend fortgeführt; es wird durch unzählige Bearbeiter ständig verbessert. Das Werk ist
160		nicht vollendet und kann daher Fehler („bugs“) enthalten, die dieser Art der Entwicklung inhärent sind.
161
162		Aus den genannten Gründen wird das Werk unter dieser Lizenz „so, wie es ist“ ohne jegliche Gewährleistung zur
163		Verfügung gestellt. Dies gilt unter anderem — aber nicht ausschließlich — für Marktreife, Verwendbarkeit für einen
	160	nicht vollendet und kann daher Fehler (»bugs«) enthalten, die dieser Art der Entwicklung inhärent sind.
	161
	162	Aus den genannten Gründen wird das Werk unter dieser Lizenz »so, wie es ist« ohne jegliche Gewährleistung zur
	163	Verfügung gestellt. Dies gilt unter anderem - aber nicht ausschließlich - für Marktreife, Verwendbarkeit für einen
164	164	bestimmten Zweck, Mängelfreiheit, Richtigkeit sowie Nichtverletzung von anderen Immaterialgüterrechten als dem
165	165	Urheberrecht (vgl. dazu Artikel 6 dieser Lizenz).
166	166

191	191
192	192	10. Annahme der Lizenz
193	193
194		Sie können den Bestimmungen dieser Lizenz zustimmen, indem Sie das Symbol „Lizenz annehmen“ unter dem Fenster
	194	Sie können den Bestimmungen dieser Lizenz zustimmen, indem Sie das Symbol »Lizenz annehmen« unter dem Fenster
195	195	mit dem Lizenztext anklicken oder indem Sie Ihre Zustimmung auf vergleichbare Weise in einer nach anwendbarem
196	196	Recht zulässigen Form geben. Das Anklicken des Symbols gilt als Anzeichen Ihrer eindeutigen und unwiderruflichen
197	197	Annahme der Lizenz und der darin enthaltenen Klauseln und Bedingungen.

260	260
261	261	Anlage
262	262
263		„Kompatible Lizenzen“ nach Artikel 5 der EUPL sind:
	263	»Kompatible Lizenzen« nach Artikel 5 der EUPL sind:
264	264
265	265	- GNU General Public License (GPL) v. 2, v. 3
266	266

280	280
281	281	- European Union Public Licence (EUPL) v. 1.1, v. 1.2
282	282
283		- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) oder Strong Reciprocity (LiLiQ-R+)
	283	- Québec Free and Open-Source Licence - Reciprocity (LiLiQ-R) oder Strong Reciprocity (LiLiQ-R+)
284	284
285	285	- Die Europäische Kommission kann diesen Anhang aktualisieren, um neuere Fassungen der obigen Lizenzen
286	286	aufzunehmen, ohne hierfür eine neue Fassung der EUPL auszuarbeiten, solange diese Lizenzen die in Artikel 2

465	465
466	466	0. Additional Definitions.
467	467
468		As used herein, “this License” refers to version 3 of the GNU Lesser
469		General Public License, and the “GNU GPL” refers to version 3 of the
	468	As used herein, «this License» refers to version 3 of the GNU Lesser
	469	General Public License, and the «GNU GPL» refers to version 3 of the
470	470	GNU General Public License.
471	471
472		“The Library” refers to a covered work governed by this License,
	472	«The Library» refers to a covered work governed by this License,
473	473	other than an Application or a Combined Work as defined below.
474	474
475		An “Application” is any work that makes use of an interface provided
	475	An «Application» is any work that makes use of an interface provided
476	476	by the Library, but which is not otherwise based on the Library.
477	477	Defining a subclass of a class defined by the Library is deemed a mode
478	478	of using an interface provided by the Library.
479	479
480		A “Combined Work” is a work produced by combining or linking an
	480	A «Combined Work» is a work produced by combining or linking an
481	481	Application with the Library. The particular version of the Library
482		with which the Combined Work was made is also called the “Linked
483		Version”.
484
485		The “Minimal Corresponding Source” for a Combined Work means the
	482	with which the Combined Work was made is also called the «Linked
	483	Version».
	484
	485	The «Minimal Corresponding Source» for a Combined Work means the
486	486	Corresponding Source for the Combined Work, excluding any source code
487	487	for portions of the Combined Work that, considered in isolation, are
488	488	based on the Application, and not on the Linked Version.
489	489
490		The “Corresponding Application Code” for a Combined Work means the
	490	The «Corresponding Application Code» for a Combined Work means the
491	491	object code and/or source code for the Application, including any data
492	492	and utility programs needed for reproducing the Combined Work from the
493	493	Application, but excluding the System Libraries of the Combined Work.

602	602
603	603	Each version is given a distinguishing version number. If the Library
604	604	as you received it specifies that a certain numbered version of the
605		GNU Lesser General Public License “or any later version” applies to
	605	GNU Lesser General Public License «or any later version» applies to
606	606	it, you have the option of following the terms and conditions either
607	607	of that published version or of any later version published by the
608	608	Free Software Foundation. If the Library as you received it does not

+0

-49

~~Releasing.rst~~ less more

0		Release
1		=======
2		Folgende Schritte sind notwendig um ein Tag bzw. Release zu bauen.
3
4
5		Tag anbringen
6		-------------
7		#. Mittels "hg update -r stable" auf das jeweilige Changeset wechseln, welches mit einem
8		Tag versehen werden soll.
9
10		#. Mittels "hg status" überprüfen, dass keine weiteren Änderungen in der Working-Copy
11		vorhanden sind.
12
13		#. In der Datei CMakeLists.txt die PROJECT_VERSION im PROJECT entsprechend anpassen.
14
15		#. Mittels "hg tag x.y.z" (Beispiel: hg tag 1.0.0) den Tag anbringen.
16
17		#. Mittels "hg push" ins Main-Repository übertragen.
18
19
20
21		Tag bauen
22		---------
23		Die Release-Jobs müssen nach dem Tag manuell gestartet werden!
24
25		Jenkins erstellt das Release anhand des Parameters 'changeset'. Dort sollte der angebrachte
26		Tag oder die jeweilige Revision übergeben werden.
27		Nachdem die notwendigen Jobs (Windows/macOS/Docs/...) durchgelaufen sind, muss der Job
28		für den AppCast gestartet werden.
29
30		Im Ordner ``resources/jenkins/dsl`` sind die jeweiligen Konfigurationen der Jenkins-Jobs
31		hinterlegt.
32
33
34
35		Probleme & Lösungen
36		-------------------
37		- Das gebaute Package beinhaltet einen Hashwert im Namen
38		- CMake hat erkannt, dass sich die aktuelle Working-Copy nicht auf dem Tag befindet und hängt
39		somit den Hashwert des Changesets an. Mittels "hg id -t" kann man überprüfen, ob man sich auf
40		dem Tag befindet.
41
42		- Mittels "hg update -r x.y.z" sollte man auf den Tag wechseln.
43
44		- Hinter dem Hashwert ist ein +
45		- Das bedeutet, dass "uncommitted changes" während des Builds in der Working-Copy enthalten waren.
46
47		- Dies kann man mittels "hg status" überprüfen.
48

+1

-1

cmake/CompilerFlags.cmake less more

89	89	IF(CMAKE_COMPILER_IS_GNUCXX)
90	90	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -finline-limit=64")
91	91	ELSEIF(CMAKE_VERSION VERSION_LESS "3.13" AND CMAKE_VERSION VERSION_GREATER_EQUAL "3.12")
92		LIST(APPEND CMAKE_CXX_COMPILER_PREDEFINES_COMMAND "--target=${ANDROID_TOOLCHAIN_MACHINE_NAME}")
	92	LIST(APPEND CMAKE_CXX_COMPILER_PREDEFINES_COMMAND "--target=${CMAKE_CXX_ANDROID_TOOLCHAIN_MACHINE}")
93	93	ENDIF()
94	94	SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
95	95	ENDIF()

+1

-1

cmake/CompilerFlagsPersoSim.cmake less more

0		IF("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
	0	IF(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
1	1	IF(PERSOSIM)
2	2	IF(NOT JAVA_EXECUTABLE)
3	3	FIND_PACKAGE(Java COMPONENTS Runtime)

+0

-5

cmake/DefaultFiles.cmake less more

8	8	IF(JENKINS_APPCAST)
9	9	SET(REMOTE_CONFIG_PATH_APPCAST /build)
10	10	SET(REMOTE_CONFIG_PATH_APPCAST_BETA /build)
11		SET(REMOTE_CONFIG_PATH_PROVIDERS /source/resources)
12		SET(REMOTE_CONFIG_PATH_READERS /source/resources)
13	11	ELSE()
14	12	SET(REMOTE_CONFIG_PATH_APPCAST )
15	13	SET(REMOTE_CONFIG_PATH_APPCAST_BETA /beta)
16		SET(REMOTE_CONFIG_PATH_PROVIDERS )
17		SET(REMOTE_CONFIG_PATH_READERS /reader)
18	14	ENDIF()
19		SET(REMOTE_CONFIG_URL_READER_IMAGES ${REMOTE_CONFIG_URL_PROD}/reader)
20	15
21	16	# Copy secure storage file, so that the AusweisApp2 can be started from the build directory.
22	17	CONFIGURE_FILE(${RESOURCES_DIR}/config.json.in ${_destination}/config.json @ONLY)

+10

-4

cmake/Helper.cmake less more

272	272	STRING(REGEX REPLACE "-$" "" ANDROID_TOOLCHAIN_MACHINE_NAME "${ANDROID_TOOLCHAIN_MACHINE_NAME}")
273	273	STRING(REGEX MATCH "/toolchains/(.*)/prebuilt/" _unused "${CMAKE_CXX_ANDROID_TOOLCHAIN_PREFIX}")
274	274	STRING(REGEX REPLACE "-${ANDROID_NDK_TOOLCHAIN_VERSION}$" "" ANDROID_TOOLCHAIN_PREFIX "${CMAKE_MATCH_1}")
	275
275	276	SET(${_prefix} ${ANDROID_TOOLCHAIN_PREFIX} PARENT_SCOPE)
276		SET(${_machine} ${ANDROID_TOOLCHAIN_MACHINE_NAME} PARENT_SCOPE)
	277
	278	IF(ANDROID_USE_LLVM)
	279	SET(${_machine} llvm PARENT_SCOPE)
	280	ELSE()
	281	SET(${_machine} ${ANDROID_TOOLCHAIN_MACHINE_NAME} PARENT_SCOPE)
	282	ENDIF()
277	283	ENDFUNCTION()
278	284
279	285

328	334	SET(multiValueArgs)
329	335	cmake_parse_arguments(_PARAM "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
330	336
331		IF(CMAKE_BUILD_TYPE STREQUAL "MINSIZEREL" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
	337	IF(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
	338	SET(BUILD_TYPE DEBUG)
	339	ELSE()
332	340	SET(BUILD_TYPE RELEASE)
333		ELSE()
334		SET(BUILD_TYPE ${CMAKE_BUILD_TYPE})
335	341	ENDIF()
336	342
337	343	GET_TARGET_PROPERTY(tmp "${_target}" IMPORTED_LOCATION_${BUILD_TYPE})

+12

-6

cmake/Install.cmake less more

244	244	ENDIF()
245	245
246	246	SET(ANDROID_APP_BINARY "${CMAKE_INSTALL_PREFIX}/${ANDROID_DEST}/libAusweisApp2.so")
247		SET(SYMBOL_FOLDER "${CMAKE_BINARY_DIR}/debug.symbols/${CMAKE_ANDROID_ARCH_ABI}")
248		SET(ANDROID_APP_SYMBOLS "${SYMBOL_FOLDER}/libAusweisApp2.so")
	247	SET(SYMBOL_FOLDER "${CMAKE_BINARY_DIR}/debug.symbols")
	248	SET(ANDROID_APP_SYMBOLS "${SYMBOL_FOLDER}/libAusweisApp2-${CMAKE_ANDROID_ARCH_ABI}.so")
249	249
250	250	INSTALL(CODE
251	251	"
252	252	EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" -E make_directory \"${SYMBOL_FOLDER}\")
253	253	EXECUTE_PROCESS(COMMAND \"${CMAKE_OBJCOPY}\" \"--only-keep-debug\" \"${ANDROID_APP_BINARY}\" \"${ANDROID_APP_SYMBOLS}\")
254		" COMPONENT Runtime CONFIGURATIONS RelWithDebInfo)
	254	" COMPONENT Runtime)
255	255
256	256	IF(CMAKE_COMPILER_IS_GNUCXX)
257	257	SET(ANDROID_STL_PATH gnu-libstdc++/${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION})

277	277	CONFIGURE_FILE(${PACKAGING_DIR}/linux/${BUNDLE_IDENTIFIER}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.desktop @ONLY)
278	278	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo COMPONENT Application)
279	279	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications COMPONENT Application)
280		INSTALL(FILES ${RESOURCES_DIR}/images/npa.svg DESTINATION ${DEFAULT_FILE_DESTINATION} COMPONENT Application)
	280	INSTALL(FILES ${RESOURCES_DIR}/images/npa.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps COMPONENT Application RENAME AusweisApp2.svg)
	281	INSTALL(FILES ${RESOURCES_DIR}/images/npa.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/96x96/apps COMPONENT Application RENAME AusweisApp2.png)
281	282	ENDIF()
282	283
283	284

302	303	ENDIF()
303	304
304	305
305		IF(LINUX)
	306	IF(LINUX OR BSD)
306	307	INSTALL(FILES ${QM_FILES} DESTINATION ${TRANSLATION_DESTINATION} COMPONENT Translations)
307	308	ELSEIF(NOT INTEGRATED_SDK)
308	309	INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/translations/ DESTINATION ${TRANSLATION_DESTINATION} COMPONENT Translations)

315	316
316	317	# qt qml plugins
317	318	IF((WIN32 OR MAC) AND TARGET Qt5::Qml)
318		FOREACH(entry QtQuick QtQuick.2 QtQml QtGraphicalEffects Qt)
	319	SET(modules QtQuick QtQuick.2 QtQml QtGraphicalEffects Qt)
	320	IF(WIN32)
	321	LIST(APPEND modules QtWinExtras)
	322	ENDIF()
	323
	324	FOREACH(entry ${modules})
319	325	INSTALL(DIRECTORY ${QT_HOST_PREFIX}/qml/${entry} DESTINATION ${DEFAULT_FILE_DESTINATION}/qml COMPONENT Runtime PATTERN "*.dylib" EXCLUDE)
320	326	ENDFOREACH()
321	327	ENDIF()

+5

-6

cmake/Libraries.cmake less more

26	26	ENDIF()
27	27	ENDIF()
28	28
29		IF(ANDROID OR IOS OR WINDOWS_STORE OR "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
	29	IF(ANDROID OR IOS OR WINDOWS_STORE OR CMAKE_BUILD_TYPE STREQUAL "DEBUG")
30	30	FIND_PACKAGE(Qt5Bluetooth ${MIN_QT_VERSION} REQUIRED)
31	31	FIND_PACKAGE(Qt5Nfc ${MIN_QT_VERSION} REQUIRED)
32	32	ENDIF()

64	64	SET(tmp_crosscompile_enabled TRUE)
65	65	SET(CMAKE_CROSSCOMPILING ON)
66	66	ENDIF()
67		IF(QT_VENDOR STREQUAL "Governikus" OR FORCE_LEGACY_OPENSSL)
68		FIND_PACKAGE(OpenSSL 1.0.2 REQUIRED) # see openssl_rsa_psk.patch
69		ELSE()
70		FIND_PACKAGE(OpenSSL 1.1 REQUIRED)
71		ENDIF()
	67
	68	FIND_PACKAGE(OpenSSL 1.1 REQUIRED)
	69
72	70	IF(tmp_crosscompile_enabled)
73	71	SET(CMAKE_CROSSCOMPILING OFF)
74	72	ENDIF()

95	93	FIND_LIBRARY(IOS_CORETEXT CoreText)
96	94	FIND_LIBRARY(IOS_COREGRAPHICS CoreGraphics)
97	95	FIND_LIBRARY(IOS_SECURITY Security)
	96	FIND_LIBRARY(IOS_NETWORK Network)
98	97	FIND_LIBRARY(IOS_AUDIOTOOLBOX AudioToolbox)
99	98	FIND_LIBRARY(IOS_IMAGEIO ImageIO)
100	99	FIND_LIBRARY(IOS_CORENFC CoreNFC)

+2

-0

cmake/Messages.cmake less more

21	21	MESSAGE(STATUS "CMAKE_ANDROID_ARCH_ABI: ${CMAKE_ANDROID_ARCH_ABI}")
22	22	MESSAGE(STATUS "CMAKE_SYSTEM_VERSION: ${CMAKE_SYSTEM_VERSION}")
23	23	MESSAGE(STATUS "CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION: ${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION}")
	24	MESSAGE(STATUS "CMAKE_CXX_ANDROID_TOOLCHAIN_MACHINE: ${CMAKE_CXX_ANDROID_TOOLCHAIN_MACHINE}")
24	25	MESSAGE(STATUS "ANDROID_TOOLCHAIN_PREFIX: ${ANDROID_TOOLCHAIN_PREFIX}")
25	26	MESSAGE(STATUS "ANDROID_TOOLCHAIN_MACHINE_NAME: ${ANDROID_TOOLCHAIN_MACHINE_NAME}")
	27	MESSAGE(STATUS "ANDROID_USE_LLVM: ${ANDROID_USE_LLVM}")
26	28
27	29	MESSAGE(STATUS "ANDROID_SDK: ${ANDROID_SDK}")
28	30	MESSAGE(STATUS "ANDROID_BUILD_TOOLS_REVISION: ${ANDROID_BUILD_TOOLS_REVISION}")

+32

-13

cmake/Packaging.cmake less more

45	45	SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
46	46	ENDIF()
47	47
	48
	49	FIND_PROGRAM(CONV uconv)
	50	IF(NOT CONV)
	51	FIND_PROGRAM(CONV iconv)
	52	ENDIF()
	53	FIND_PROGRAM(ENSCRIPT enscript)
	54	FIND_PROGRAM(GS gs)
	55
	56	IF(CONV AND ENSCRIPT AND GS)
	57	SET(LICENSE_FILE ${FILENAME}-Lizenz.pdf)
	58
	59	SET(CONV_CMD ${CONV} -f utf-8 -t iso-8859-1 --output license.tmpfile.conv ${CPACK_RESOURCE_FILE_LICENSE})
	60	SET(ENSCRIPT_CMD ${ENSCRIPT} -q -X 88591 -B --word-wrap -t ${PROJECT_NAME} --output license.tmpfile.ps license.tmpfile.conv)
	61	SET(GS_CMD ${GS} -q -sPAPERSIZE=a4 -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=${LICENSE_FILE} license.tmpfile.ps)
	62
	63	ADD_CUSTOM_COMMAND(OUTPUT ${LICENSE_FILE} COMMAND ${CONV_CMD} COMMAND ${ENSCRIPT_CMD} COMMAND ${GS_CMD})
	64	ADD_CUSTOM_TARGET(license DEPENDS ${LICENSE_FILE})
	65	ENDIF()
	66
48	67	IF(APPLE AND NOT IOS)
49		FIND_PROGRAM(ICONV iconv)
50		IF(NOT ICONV)
	68	IF(NOT CONV)
51	69	MESSAGE(FATAL_ERROR "Cannot find 'iconv' to convert LICENSE.txt")
52	70	ENDIF()
53	71
54		EXECUTE_PROCESS(COMMAND ${ICONV} -f UTF-8 -t MAC ${CPACK_RESOURCE_FILE_LICENSE} OUTPUT_FILE "${PROJECT_BINARY_DIR}/LICENSE.txt")
	72	EXECUTE_PROCESS(COMMAND ${CONV} -f UTF-8 -t MAC ${CPACK_RESOURCE_FILE_LICENSE} OUTPUT_FILE "${PROJECT_BINARY_DIR}/LICENSE.txt")
55	73	SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_BINARY_DIR}/LICENSE.txt")
56	74	ENDIF()
57	75
58		IF(${CMAKE_BUILD_TYPE} STREQUAL "RELEASE" OR ${CMAKE_BUILD_TYPE} STREQUAL "MINSIZEREL")
	76	IF(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG" AND NOT CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
59	77	SET(CPACK_STRIP_FILES TRUE)
60	78	ENDIF()
61	79

162	180	SET(CPACK_INSTALL_CMAKE_PROJECTS ${CMAKE_BINARY_DIR};${PROJECT_NAME};ALL;/)
163	181	SET(CPACK_BUNDLE_NAME ${PROJECT_NAME})
164	182	SET(CPACK_BUNDLE_COPYRIGHT ${COPYRIGHT_TEXT})
165		SET(CPACK_BUNDLE_ICON ${RESOURCES_DIR}/images/bundle_icons.icns)
	183	SET(CPACK_BUNDLE_ICON ${RESOURCES_DIR}/images/macos/bundle_icons.icns)
166	184	SET(CPACK_BUNDLE_APPLE_CERT_APP "Developer ID Application: Governikus GmbH & Co. KG (G7EQCJU4BR)")
167	185
168	186	SET(CPACK_BUNDLE_APPLE_CODESIGN_FILES ${ADDITIONAL_BUNDLE_FILES_TO_SIGN})

174	192	ELSE()
175	193	SET(CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER "${CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER} --timestamp=none")
176	194	ENDIF()
177		#SET(CPACK_PACKAGE_ICON ${RESOURCES_DIR}/images/dmg_icons.icns) https://gitlab.kitware.com/cmake/cmake/issues/19517
	195	#SET(CPACK_PACKAGE_ICON ${RESOURCES_DIR}/images/macos/dmg_icons.icns) https://gitlab.kitware.com/cmake/cmake/issues/19517
178	196	SET(CPACK_DMG_VOLUME_NAME ${CPACK_PACKAGE_NAME})
179	197	SET(CPACK_DMG_FORMAT UDBZ)
180		SET(CPACK_DMG_BACKGROUND_IMAGE ${RESOURCES_DIR}/images/dmg_background.png)
	198	SET(CPACK_DMG_BACKGROUND_IMAGE ${RESOURCES_DIR}/images/macos/dmg_background.png)
181	199	SET(CPACK_DMG_SLA_DIR ${MACOS_PACKAGING_DIR}/sla)
182	200	SET(CPACK_DMG_SLA_LANGUAGES English German)
183	201

207	225	FILE(APPEND "${CMAKE_INSTALL_PREFIX}/build.gradle" "${BUILD_GRADLE}")
208	226	OPTION(ANDROID_LINT "Lint Android package" ON)
209	227	IF(NOT ANDROID_LINT)
210		FILE(APPEND "${CMAKE_INSTALL_PREFIX}/build.gradle" "tasks.lint.enabled = false")
	228	FILE(APPEND "${CMAKE_INSTALL_PREFIX}/build.gradle" "tasks.lint.enabled = false\n")
211	229	ENDIF()
212	230
213	231	IF(INTEGRATED_SDK)
214	232	SET(ANDROID_FILE_EXT aar)
	233	FILE(APPEND "${CMAKE_INSTALL_PREFIX}/build.gradle" "android.defaultConfig.consumerProguardFiles 'consumer-rules.pro'\n")
215	234	CONFIGURE_FILE(${PACKAGING_DIR}/android/pom.xml.in ${CMAKE_INSTALL_PREFIX}/${CPACK_PACKAGE_FILE_NAME}.pom @ONLY)
216	235	CONFIGURE_FILE("${PACKAGING_DIR}/android/lint.aar.xml" "${CMAKE_INSTALL_PREFIX}/lint.xml" COPYONLY)
	236	CONFIGURE_FILE("${PACKAGING_DIR}/android/consumer-rules.pro" "${CMAKE_INSTALL_PREFIX}/consumer-rules.pro" COPYONLY)
217	237	ELSE()
218	238	SET(ANDROID_FILE_EXT apk)
219	239	CONFIGURE_FILE("${PACKAGING_DIR}/android/lint.apk.xml" "${CMAKE_INSTALL_PREFIX}/lint.xml" COPYONLY)
220	240	ENDIF()
221	241	MESSAGE(STATUS "Prepare ${ANDROID_FILE_EXT} file generation")
222	242
223		IF(${CMAKE_BUILD_TYPE} STREQUAL "RELEASE" OR ${CMAKE_BUILD_TYPE} STREQUAL "RELWITHDEBINFO" OR ${CMAKE_BUILD_TYPE} STREQUAL "MINSIZEREL")
	243	IF(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
	244	SET(ANDROID_FILE dist-debug.${ANDROID_FILE_EXT})
	245	ELSE()
224	246	SET(DEPLOY_CMD_SIGN --release)
225	247
226	248	IF(INTEGRATED_SDK)

233	255	SET(ANDROID_FILE dist-release-unsigned.apk)
234	256	MESSAGE(WARNING "Cannot sign release build! Set APK_SIGN_KEYSTORE, APK_SIGN_KEYSTORE_ALIAS and APK_SIGN_KEYSTORE_PSW!")
235	257	ENDIF()
236
237		ELSE()
238		SET(ANDROID_FILE dist-debug.${ANDROID_FILE_EXT})
239	258	ENDIF()
240	259
241	260	SET(DEPLOY_CMD ${androiddeployqt} --verbose --gradle --input ${ANDROID_DEPLOYMENT_SETTINGS} --output ${CMAKE_INSTALL_PREFIX} ${DEPLOY_CMD_SIGN})
242	261	SET(SOURCE_ANDROID_FILE ${CMAKE_INSTALL_PREFIX}/build/outputs/${ANDROID_FILE_EXT})
243	262
244	263	IF("${Qt5Core_VERSION}" VERSION_GREATER_EQUAL "5.12.0" AND NOT INTEGRATED_SDK)
245		IF(${CMAKE_BUILD_TYPE} STREQUAL "DEBUG")
	264	IF(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
246	265	SET(SOURCE_ANDROID_FILE ${SOURCE_ANDROID_FILE}/debug)
247	266	ELSE()
248	267	SET(SOURCE_ANDROID_FILE ${SOURCE_ANDROID_FILE}/release)

+31

-7

cmake/Tools.cmake less more

80	80	STRING(REPLACE "uncrustify " "" UNCRUSTIFY_VERSION ${UNCRUSTIFY_VERSION})
81	81	STRING(REPLACE "Uncrustify-" "" UNCRUSTIFY_VERSION ${UNCRUSTIFY_VERSION})
82	82
83		SET(UNCRUSTIFY_NEEDED_VERSION "0.70.1")
	83	SET(UNCRUSTIFY_NEEDED_VERSION "0.71.0")
84	84	IF("${UNCRUSTIFY_VERSION}" STRLESS "${UNCRUSTIFY_NEEDED_VERSION}")
85	85	MESSAGE(WARNING "Uncrustify seems to be too old. Use at least ${UNCRUSTIFY_NEEDED_VERSION}... you are using: ${UNCRUSTIFY_VERSION}")
86	86	ELSE()

134	134	IF(CONVERT)
135	135	SET(BACKGROUND_COLOR "#dcebf6")
136	136
137		ADD_CUSTOM_TARGET(npaicons.docs
138		COMMAND ${CONVERT} -background transparent -units PixelsPerInch -resample 320 -resize 96x96 npa.svg npa_docs.png
	137	ADD_CUSTOM_TARGET(npaicons.general
	138	COMMAND ${CONVERT} -background transparent -units PixelsPerInch -resample 320 -resize 96x96 npa.svg npa.png
139	139	WORKING_DIRECTORY ${RESOURCES_DIR}/images)
140	140
141	141	ADD_CUSTOM_TARGET(npaicons.win

258	258	COMMAND ${CONVERT} -alpha off -background '${BACKGROUND_COLOR}' -resize 1024x1024 npa_beta.svg beta/Images.xcassets/AppIcon.appiconset/icon1024.png
259	259	WORKING_DIRECTORY ${RESOURCES_DIR}/images/iOS/appIcons)
260	260
261		ADD_CUSTOM_TARGET(npaicons DEPENDS npaicons.docs npaicons.win npaicons.android.playstore npaicons.android.legacy npaicons.android.legacy.beta npaicons.android.legacy.preview npaicons.android.adaptive.background npaicons.android.adaptive.foreground npaicons.android.adaptive.foreground.beta npaicons.android.adaptive.foreground.preview npaicons.ios.launchimage npaicons.ios.launchimage.beta npaicons.ios npaicons.ios.beta)
	261	ADD_CUSTOM_TARGET(npaicons DEPENDS npaicons.general npaicons.win npaicons.android.playstore npaicons.android.legacy npaicons.android.legacy.beta npaicons.android.legacy.preview npaicons.android.adaptive.background npaicons.android.adaptive.foreground npaicons.android.adaptive.foreground.beta npaicons.android.adaptive.foreground.preview npaicons.ios.launchimage npaicons.ios.launchimage.beta npaicons.ios npaicons.ios.beta)
262	262
263	263	ADD_CUSTOM_TARGET(readerimages
264	264	COMMAND ${CONVERT} -background none -resize 512x512 img_RemoteReader.svg ${RESOURCES_DIR}/updatable-files/reader/img_RemoteReader.png

272	272	IF(PNGQUANT)
273	273	SET(PNGQUANT_CMD pngquant -f -o)
274	274
275		ADD_CUSTOM_TARGET(pngquant.docs
276		COMMAND ${PNGQUANT_CMD} npa_docs.png -- npa_docs.png
	275	ADD_CUSTOM_TARGET(pngquant.general
	276	COMMAND ${PNGQUANT_CMD} npa.png -- npa.png
277	277	WORKING_DIRECTORY ${RESOURCES_DIR}/images)
278	278
279	279	ADD_CUSTOM_TARGET(pngquant.android.legacy

387	387	COMMAND ${PNGQUANT_CMD} icon1024.png -- icon1024.png
388	388	WORKING_DIRECTORY ${RESOURCES_DIR}/images/iOS/appIcons/beta/Images.xcassets/AppIcon.appiconset)
389	389
390		ADD_CUSTOM_TARGET(pngquant DEPENDS pngquant.docs pngquant.android.legacy pngquant.android.legacy.beta pngquant.android.legacy.preview pngquant.android.adaptive.background pngquant.android.adaptive.foreground pngquant.android.adaptive.foreground.beta pngquant.android.adaptive.foreground.preview pngquant.ios.launchimage pngquant.ios.launchimage.beta pngquant.ios pngquant.ios.beta)
	390	ADD_CUSTOM_TARGET(pngquant DEPENDS pngquant.general pngquant.android.legacy pngquant.android.legacy.beta pngquant.android.legacy.preview pngquant.android.adaptive.background pngquant.android.adaptive.foreground pngquant.android.adaptive.foreground.beta pngquant.android.adaptive.foreground.preview pngquant.ios.launchimage pngquant.ios.launchimage.beta pngquant.ios pngquant.ios.beta)
391	391
392	392	ADD_CUSTOM_TARGET(pngquant.readerimages
393	393	COMMAND ${PNGQUANT_CMD} img_RemoteReader.png -- img_RemoteReader.png

463	463
464	464	ENDIF()
465	465
	466	IF(APPLE AND NOT IOS AND CONVERT)
	467	FIND_PROGRAM(ICONUTIL iconutil)
	468	IF(ICONUTIL)
	469
	470	SET(BUNDLE_ICON_SET_DIR ${CMAKE_CURRENT_BINARY_DIR}/bundle_icons.iconset)
	471
	472	ADD_CUSTOM_TARGET(npaicons.macos.bundle_icons
	473	COMMAND ${CMAKE_COMMAND} -E make_directory ${BUNDLE_ICON_SET_DIR}
	474	COMMAND ${CONVERT} -background transparent -resize 16x16 appIcon.svg ${BUNDLE_ICON_SET_DIR}/icon_16x16.png
	475	COMMAND ${CONVERT} -background transparent -resize 32x32 appIcon.svg ${BUNDLE_ICON_SET_DIR}/icon_16x16@2x.png
	476	COMMAND ${CONVERT} -background transparent -resize 32x32 appIcon.svg ${BUNDLE_ICON_SET_DIR}/icon_32x32.png
	477	COMMAND ${CONVERT} -background transparent -resize 64x64 appIcon.svg ${BUNDLE_ICON_SET_DIR}/icon_32x32@2x.png
	478	COMMAND ${CONVERT} -background transparent -resize 128x128 appIcon.svg ${BUNDLE_ICON_SET_DIR}/icon_128x128.png
	479	COMMAND ${CONVERT} -background transparent -resize 256x256 appIcon.svg ${BUNDLE_ICON_SET_DIR}/icon_128x128@2x.png
	480	COMMAND ${CONVERT} -background transparent -resize 256x256 appIcon.svg ${BUNDLE_ICON_SET_DIR}/icon_256x256.png
	481	COMMAND ${CONVERT} -background transparent -resize 512x512 appIcon.svg ${BUNDLE_ICON_SET_DIR}/icon_256x256@2x.png
	482	COMMAND ${CONVERT} -background transparent -resize 512x512 appIcon.svg ${BUNDLE_ICON_SET_DIR}/icon_512x512.png
	483	COMMAND ${CONVERT} -background transparent -resize 1024x1024 appIcon.svg ${BUNDLE_ICON_SET_DIR}/icon_512x512@2x.png
	484	COMMAND ${ICONUTIL} -c icns --output bundle_icons.icns ${BUNDLE_ICON_SET_DIR}
	485	COMMAND ${CMAKE_COMMAND} -E remove_directory ${BUNDLE_ICON_SET_DIR}
	486	WORKING_DIRECTORY ${RESOURCES_DIR}/images/macos)
	487	ENDIF()
	488	ENDIF()
	489
466	490	INCLUDE(Sphinx)

+12

-0

cmake/android.toolchain.cmake less more

41	41	IF(NOT CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION AND ANDROID_NDK_REVISION VERSION_GREATER_EQUAL "11")
42	42	SET(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang)
43	43	ENDIF()
	44
	45	IF(ANDROID_NDK_REVISION VERSION_GREATER_EQUAL "19")
	46	CMAKE_MINIMUM_REQUIRED(VERSION 3.16.0)
	47	IF(CMAKE_VERSION VERSION_LESS "3.16.4")
	48	MESSAGE(WARNING "Check your cmake: https://gitlab.kitware.com/cmake/cmake/commit/e3d3b7ddeb5922a4d17b962984e698e6387f7544")
	49	ENDIF()
	50
	51	SET(ANDROID_USE_LLVM true)
	52	ELSE()
	53	SET(ANDROID_USE_LLVM false)
	54	ENDIF()
	55
44	56	SET(ANDROID_NDK_TOOLCHAIN_VERSION 4.9)
45	57
46	58	SET(CMAKE_SYSTEM_NAME Android)

+13

-0

cmake/cmd.cmake less more

48	48	ENDFUNCTION()
49	49
50	50
	51	FUNCTION(IMPORT_PATCH)
	52	MESSAGE(STATUS "Import patch...")
	53	IF(CMAKE_VERSION VERSION_LESS "3.12")
	54	FIND_PACKAGE(PythonInterp REQUIRED)
	55	SET(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
	56	ELSE()
	57	FIND_PACKAGE(Python REQUIRED)
	58	ENDIF()
	59
	60	EXECUTE_PROCESS(COMMAND ${Python_EXECUTABLE} "${CMAKE_BINARY_DIR}/resources/jenkins/import.py")
	61	ENDFUNCTION()
51	62
52	63
53	64

61	72	CREATE_HASH()
62	73	ELSEIF(CMD STREQUAL "CHECK_WIX_WARNING")
63	74	CHECK_WIX_WARNING()
	75	ELSEIF(CMD STREQUAL "IMPORT_PATCH")
	76	IMPORT_PATCH()
64	77	ELSE()
65	78	MESSAGE(FATAL_ERROR "Unknown CMD: ${CMD}")
66	79	ENDIF()

+67

-15

docs/installation/README.de.rst less more

12	12
13	13	.. code-block:: winbatch
14	14
15		msiexec /i AusweisApp2-X.YY.Z.msi /quiet INSTALL_ROOT="C:\AusweisApp2" SYSTEMSETTINGS=false DESKTOPSHORTCUT=false AUTOSTART=false AUTOHIDE=false REMINDTOCLOSE=false ASSISTANT=false TRANSPORTPINREMINDER=false UPDATECHECK=false ONSCREENKEYBOARD=true HISTORY=false
	15	msiexec /i AusweisApp2-X.YY.Z.msi /quiet INSTALL_ROOT="C:\AusweisApp2" SYSTEMSETTINGS=false DESKTOPSHORTCUT=false AUTOSTART=false AUTOHIDE=false REMINDTOCLOSE=false ASSISTANT=false TRANSPORTPINREMINDER=false CUSTOMPROXYTYPE="HTTP" CUSTOMPROXYHOST="proxy.example.org" CUSTOMPROXYPORT=1337 UPDATECHECK=false ONSCREENKEYBOARD=true SHUFFLESCREENKEYBOARD=true HISTORY=false ENABLECANALLOWED=true SKIPRIGHTSONCANALLOWED=true
16	16
17	17	INSTALL_ROOT
18	18	Gibt das Installationsverzeichnis an. Ohne Angabe wird der Ordner

61	61	danach gefragt, ob er die Transport-PIN schon geändert hat. Durch
62	62	TRANSPORTPINREMINDER=false kann diese Abfrage deaktiviert werden. Ohne Angabe
63	63	ist die Abfrage aktiviert (true).
	64
	65	CUSTOMPROXYTYPE
	66	Teil der Konfiguration eines Proxys. Gültige Typen sind SOCKS5 und HTTP.
	67	Um einen Proxy zu nutzen müssen alle Parameter gesetzt sein (siehe
	68	CUSTOMPROXYHOST und CUSTOMPROXYPORT). Der Proxy kann nach der Installation
	69	über eine Checkbox in den Einstellungen deaktiviert werden.
	70
	71	CUSTOMPROXYHOST
	72	Teil der Konfiguration eines Proxys. Angabe des Hosts, unter dem der Proxy zu
	73	erreichen ist. Um einen Proxy zu nutzen müssen alle Parameter gesetzt sein
	74	(siehe CUSTOMPROXYTYPE und CUSTOMPROXYPORT). Der Proxy kann nach der
	75	Installation über eine Checkbox in den Einstellungen deaktiviert werden.
	76
	77	CUSTOMPROXYPORT
	78	Teil der Konfiguration eines Proxys. Angabe des Proxyports. Nur Werte von
	79	1 bis 65536 sind gültig. Um einen Proxy zu nutzen müssen alle Parameter
	80	gesetzt sein (siehe CUSTOMPROXYTYPE und CUSTOMPROXYHOST). Der Proxy kann nach
	81	der Installation über eine Checkbox in den Einstellungen deaktiviert werden.
64	82
65	83	UPDATECHECK
66	84	Wird die Benutzeroberfläche der AusweisApp2 geöffnet, wird eine Überprüfung auf

79	97	werden. Durch Setzen von ONSCREENKEYBOARD auf false oder true kann diese
80	98	deaktiviert bzw. aktiviert werden. Der Benutzer kann diese Einstellung anpassen.
81	99
	100	SHUFFLESCREENKEYBOARD
	101	Ist die Bildschirmtastatur aktiviert, können die Zifferntasten zufällig angeordnet werden.
	102	Durch Setzen von SHUFFLESCREENKEYBOARD auf false oder true kann die zufällige Anordnung
	103	deaktiviert bzw. aktiviert werden. Der Benutzer kann diese Einstellung anpassen.
	104
82	105	HISTORY
83	106	Jede Selbstauskunft oder Authentisierung wird im Verlauf gespeichert. Dabei
84	107	werden jedoch keine persönlichen Daten gespeichert, sondern nur der Zeitpunkt,
85	108	der Anbieter und die ausgelesenen Datenfelder (ohne Inhalt). Durch Setzen
86	109	von HISTORY auf false oder true kann der Verlauf deaktiviert bzw. aktiviert
87	110	werden. Der Benutzer kann diese Einstellung anpassen.
	111
	112	ENABLECANALLOWED
	113	Aktiviert die Unterstützung für den CAN-Allowed-Modus (Vor-Ort-Auslesen). Wenn ein entsprechendes
	114	Berechtigungszertifikat vorliegt, muss zum Auslesen die CAN anstelle der PIN eingegeben werden.
	115
	116	SKIPRIGHTSONCANALLOWED
	117	Überspringt die Anzeige des Berechtigungszertifikat im CAN-Allowed-Modus und wechselt direkt zur
	118	CAN-Eingabe.
88	119
89	120	Alternativ kann mit Orca [#orca]_ eine MST-Datei erzeugt werden, die die oben
90	121	genannten Parameter definiert. Die Parameter sind in den Tabellen "Directory"

127	158	<false/>
128	159	<key>transportPinReminder</key>
129	160	<false/>
130		<key>common.autoUpdateCheck</key>
131		<false/>
132		<key>common.keylessPassword</key>
	161	<key>customProxyType</key>
	162	<string>HTTP</string>
	163	<key>customProxyHost</key>
	164	<string>proxy.example.org</string>
	165	<key>customProxyPort</key>
	166	<integer>1337</integer>
	167	<key>autoUpdateCheck</key>
	168	<false/>
	169	<key>keylessPassword</key>
	170	<true/>
	171	<key>shuffleScreenKeyboard</key>
133	172	<true/>
134	173	<key>history.enable</key>
135	174	<false/>
	175	<key>enableCanAllowed</key>
	176	<true/>
	177	<key>skipRightsOnCanAllowed</key>
	178	<true/>
136	179	</dict>
137	180	</plist>
138	181

140	183	Windows-Version wobei die Bennennung der Attribute der folgenden Tabelle zu
141	184	entnehmen ist.
142	185
143		====================== ====================
144		macOS Windows
145		====================== ====================
146		autoCloseWindow AUTOHIDE
147		remindToClose REMINDTOCLOSE
148		showSetupAssistant ASSISTANT
149		transportPinReminder TRANSPORTPINREMINDER
150		common.autoUpdateCheck UPDATECHECK
151		common.keylessPassword ONSCREENKEYBOARD
152		history.enable HISTORY
153		====================== ====================
	186	======================= =======================
	187	macOS Windows
	188	======================= =======================
	189	autoCloseWindow AUTOHIDE
	190	remindToClose REMINDTOCLOSE
	191	showSetupAssistant ASSISTANT
	192	transportPinReminder TRANSPORTPINREMINDER
	193	customProxyType CUSTOMPROXYTYPE
	194	customProxyPort CUSTOMPROXYPORT
	195	customProxyHost CUSTOMPROXYHOST
	196	autoUpdateCheck UPDATECHECK
	197	keylessPassword ONSCREENKEYBOARD
	198	shuffleScreenKeyboard SHUFFLESCREENKEYBOARD
	199	history.enable HISTORY
	200	enableCanAllowed ENABLECANALLOWED
	201	skipRightsOnCanAllowed SKIPRIGHTSONCANALLOWED
	202	======================= =======================
	203
	204	Nach Änderung der Datei kann es notwending sein, ein erneutes Laden der vom
	205	Betriebssystem gecachten Daten zu erzwingen: :code:`killall -u $USER cfprefsd`
154	206
155	207	.. [#msiexecreturnvalues] https://docs.microsoft.com/de-de/windows/desktop/msi/error-codes
156	208	.. [#standardarguments] https://docs.microsoft.com/de-de/windows/desktop/msi/standard-installer-command-line-options

+68

-17

docs/installation/README.en.rst less more

11	11
12	12	.. code-block:: winbatch
13	13
14		msiexec /i AusweisApp2-X.YY.Z.msi /quiet INSTALL_ROOT="C:\AusweisApp2" SYSTEMSETTINGS=false DESKTOPSHORTCUT=false AUTOSTART=false AUTOHIDE=false REMINDTOCLOSE=false ASSISTANT=false TRANSPORTPINREMINDER=false UPDATECHECK=false ONSCREENKEYBOARD=true HISTORY=false
	14	msiexec /i AusweisApp2-X.YY.Z.msi /quiet INSTALL_ROOT="C:\AusweisApp2" SYSTEMSETTINGS=false DESKTOPSHORTCUT=false AUTOSTART=false AUTOHIDE=false REMINDTOCLOSE=false ASSISTANT=false TRANSPORTPINREMINDER=false CUSTOMPROXYTYPE="HTTP" CUSTOMPROXYHOST="proxy.example.org" CUSTOMPROXYPORT=1337 UPDATECHECK=false ONSCREENKEYBOARD=true SHUFFLESCREENKEYBOARD=true HISTORY=false ENABLECANALLOWED=true SKIPRIGHTSONCANALLOWED=true
15	15
16	16	INSTALL_ROOT
17	17	States the installation directory. If not specified, the folder

54	54
55	55	TRANSPORTPINREMINDER
56	56	Prior to the first authentication, the user is asked once whether they have
57		changed their transport PIN. Setting TRANSPORTPINREMINDER=false deactivates this
	57	changed their Transport PIN. Setting TRANSPORTPINREMINDER=false deactivates this
58	58	reminder. Not specified, the reminder is activated (true).
	59
	60	CUSTOMPROXYTYPE
	61	Part of a proxy configuration. Valid values are SOCKS5 and HTTP.
	62	All proxy parameters have to be set to use the proxy (see
	63	CUSTOMPROXYHOST and CUSTOMPROXYPORT). You can disable the proxy after installation
	64	with a checkbox in the settings.
	65
	66	CUSTOMPROXYHOST
	67	Part of a proxy configuration. Sets the Host of the proxy. All proxy parameters have
	68	to be set to use the proxy (see CUSTOMPROXYTYPE and CUSTOMPROXYPORT).
	69	You can disable the proxy after installation with a checkbox in the settings.
	70
	71	CUSTOMPROXYPORT
	72	Part of a proxy configuration. Sets the port of the proxy. Only values between
	73	1 and 65536 are valid. All proxy parameters have to be set to use the proxy (see
	74	CUSTOMPROXYTYPE and CUSTOMPROXYHOST). You can disable the proxy after installation
	75	with a checkbox in the settings.
59	76
60	77	UPDATECHECK
61	78	Upon opening the user interface of the AusweisApp2, an update check is started,

70	87	ONSCREENKEYBOARD
71	88	An on-screen keyboard is available to enter PIN, CAN or PUK. It is deactivated or
72	89	activated by setting ONSCREENKEYBOARD to false or true. Users are able to adjust
73		the settings.
	90	the setting.
	91
	92	SHUFFLESCREENKEYBOARD
	93	If the on-screen keyboard is activated, the number keys can be arranged at random.
	94	By setting SHUFFLESCREENKEYBOARD to false or true, the random arrangement can be
	95	deactivated or activated. Users are able to adjust the setting.
74	96
75	97	HISTORY
76	98	Each authentication is saved in the history. No personal data is saved, only the
77	99	time of authentication, the provider and the selected fields (without
78	100	content). Indicating HISTORY as false or true, the history function is
79	101	deactivated or activated. Users are able to adjust the settings.
	102
	103	ENABLECANALLOWED
	104	Enables support for the CAN allowed mode. If the provider got issued a corresponding authorization
	105	certificate the ID card can be read by entering the CAN instead of the PIN.
	106
	107	SKIPRIGHTSONCANALLOWED
	108	Skips the page with the authorization certificate in the CAN allowed mode and asks directly for
	109	the CAN.
80	110
81	111	Alternatively, Orca [#orca]_ can be used to create an MST file that defines the
82	112	above arguments. The arguments are available in the "Directory" and "Property"

115	145	<false/>
116	146	<key>transportPinReminder</key>
117	147	<false/>
118		<key>common.autoUpdateCheck</key>
119		<false/>
120		<key>common.keylessPassword</key>
	148	<key>customProxyType</key>
	149	<string>HTTP</string>
	150	<key>customProxyHost</key>
	151	<string>proxy.example.org</string>
	152	<key>customProxyPort</key>
	153	<integer>1337</integer>
	154	<key>autoUpdateCheck</key>
	155	<false/>
	156	<key>keylessPassword</key>
	157	<true/>
	158	<key>shuffleScreenKeyboard</key>
121	159	<true/>
122	160	<key>history.enable</key>
123	161	<false/>
	162	<key>enableCanAllowed</key>
	163	<true/>
	164	<key>skipRightsOnCanAllowed</key>
	165	<true/>
124	166	</dict>
125	167	</plist>
126	168
127	169	The description for each value is applicable for both Windows and macOS,
128	170	although the naming of the attributes differs, as shown in the following table:
129	171
130		====================== ====================
131		macOS Windows
132		====================== ====================
133		autoCloseWindow AUTOHIDE
134		remindToClose REMINDTOCLOSE
135		showSetupAssistant ASSISTANT
136		transportPinReminder TRANSPORTPINREMINDER
137		common.autoUpdateCheck UPDATECHECK
138		common.keylessPassword ONSCREENKEYBOARD
139		history.enable HISTORY
140		====================== ====================
	172	======================= =======================
	173	macOS Windows
	174	======================= =======================
	175	autoCloseWindow AUTOHIDE
	176	remindToClose REMINDTOCLOSE
	177	showSetupAssistant ASSISTANT
	178	transportPinReminder TRANSPORTPINREMINDER
	179	customProxyType CUSTOMPROXYTYPE
	180	customProxyPort CUSTOMPROXYPORT
	181	customProxyHost CUSTOMPROXYHOST
	182	autoUpdateCheck UPDATECHECK
	183	keylessPassword ONSCREENKEYBOARD
	184	shuffleScreenKeyboard SHUFFLESCREENKEYBOARD
	185	history.enable HISTORY
	186	enableCanAllowed ENABLECANALLOWED
	187	skipRightsOnCanAllowed SKIPRIGHTSONCANALLOWED
	188	======================= =======================
	189
	190	It might be necessary to force a reload of the data cached by the operating
	191	system: :code:`killall -u $USER cfprefsd`
141	192
142	193	.. [#msiexecreturnvalues] https://docs.microsoft.com/en-us/windows/desktop/msi/error-codes
143	194	.. [#standardarguments] https://docs.microsoft.com/en-us/windows/desktop/msi/standard-installer-command-line-options

+1

-1

docs/installation/conf.py.in less more

151	151
152	152	# The name of an image file (relative to this directory) to place at the top of
153	153	# the title page.
154		latex_logo = '@SPHINX_DOCS_DIR@/../../resources/images/npa_docs.png'
	154	latex_logo = '@SPHINX_DOCS_DIR@/../../resources/images/npa.png'
155	155
156	156	# For "manual" documents, if this is true, then toplevel headings are parts,
157	157	# not chapters.

+1

-1

docs/integration/conf.py.in less more

151	151
152	152	# The name of an image file (relative to this directory) to place at the top of
153	153	# the title page.
154		latex_logo = '@SPHINX_DOCS_DIR@/../../resources/images/npa_docs.png'
	154	latex_logo = '@SPHINX_DOCS_DIR@/../../resources/images/npa.png'
155	155
156	156	# For "manual" documents, if this is true, then toplevel headings are parts,
157	157	# not chapters.

+2

-0

docs/releasenotes/1.20.0.rst less more

23	23
24	24	- Unterstützung von OS X 10.11 wurde eingestellt.
25	25
	26	- Unterstützung von macOS 10.15.
	27
26	28	- Unterstützung von der x86-Architektur unter Android
27	29	wurde eingestellt.
28	30

+35

-0

docs/releasenotes/1.20.1.rst less more

	0	AusweisApp2 1.20.1
	1	^^^^^^^^^^^^^^^^^^
	2
	3	Releasedatum: 23. Juni 2020
	4
	5
	6
	7	Anwender
	8	""""""""
	9	- Die Nutzung von passwortgeschützten Proxys ist nun
	10	auch in der neuen grafischen Oberfläche möglich.
	11
	12	- Auf mobilen Geräten wurde eine Option ergänzt,
	13	um zwischen Hoch- und Querformat zu wechseln.
	14
	15	- Auf Android wurde das Abbrechen einer Authentisierung
	16	beschleunigt und ein dabei auftretender Absturz beseitigt.
	17
	18	- Unter Windows wird bei einer Authentisierung nun auch mit
	19	der neuen grafischen Oberfläche ein Fortschritt in der
	20	Taskleiste angezeigt.
	21
	22	- Kleinere Fehlerbehebungen.
	23
	24
	25	Entwickler
	26	""""""""""
	27	- Erweiterung der firmenweiten Installationen des MSI-Paketes
	28	um die Möglichkeit das Vor-Ort-Auslesen zu aktivieren und
	29	eine Proxy-Konfiguration zu hinterlegen.
	30
	31	- In der mobilen Version führt ein zehnmaliges Anklicken der Lupe
	32	auf der Startseite dazu, dass weitere Optionen in den Einstellungen
	33	sichtbar werden. Dort kann der Testmodus für die Selbstauskunft
	34	oder das Vor-Ort-Auslesen aktiviert werden.

+2

-1

docs/releasenotes/announce.rst less more

1	1	=============
2	2
3	3	Mit der Version 1.22.0 der AusweisApp2 wird die Unterstützung
4		folgender Funktionen eingestellt.
	4	folgender Systeme und Funktionen eingestellt.
5	5
	6	- macOS Sierra 10.12
6	7	- Vorherige grafische Oberfläche
7	8	- Bluetooth (Reiner SCT cyberJack Wave)
8	9

+1

-1

docs/releasenotes/appcast.rst less more

3	3	.. toctree::
4	4	:maxdepth: 1
5	5
6		1.20.0
	6	1.20.1
7	7	announce
8	8	issues

+1

-1

docs/releasenotes/conf.py.in less more

150	150
151	151	# The name of an image file (relative to this directory) to place at the top of
152	152	# the title page.
153		latex_logo = '@SPHINX_DOCS_DIR@/../../resources/images/npa_docs.png'
	153	latex_logo = '@SPHINX_DOCS_DIR@/../../resources/images/npa.png'
154	154
155	155	# For "manual" documents, if this is true, then toplevel headings are parts,
156	156	# not chapters.

+32

-19

docs/releasenotes/issues.rst less more

0	0	Bekannte Fehler
1	1	===============
	2
	3	- Bei der Nutzung eines Smartphones als Kartenleser mit aktiviertem
	4	Tastaturmodus kann bei einer Authentisierung nicht in die PIN-Änderung
	5	gewechselt werden, wenn nur eine fünfstellige PIN vorhanden ist.
	6
	7	- Wird der Screenreader aktiviert, während die AusweisApp2 bereits läuft,
	8	kann es zu Fehlverhalten kommen.
	9
	10
	11	Windows / macOS
	12	---------------
2	13
3	14	.. important::
4	15	Auf Windows wird beim Update einer Version der AusweisApp2 älter

8	19	die ältere Version manuell. Danach kann die bereits installierte,
9	20	aktuelle Version aufgerufen werden.
10	21
11		Die nachfolgende Liste bezieht sich auf die aktuelle Version der AusweisApp2.
12
13		- Mit der NFC-Schnittstelle des iPhone 7 (Plus) unter iOS 13.0 und 13.1 werden
14		viele Ausweise nicht erkannt (hauptsächlich NFC-A) und es kommt zu
15		Abbrüchen der Authentisierung. Aktualisieren Sie auf iOS 13.2 oder höher.
	22	.. important::
	23	Auf Windows kann es beim Update einer Version der AusweisApp2 älter
	24	als Version 1.20.0 auf eine aktuelle Version der AusweisApp2 dazu kommen,
	25	dass die Einstellung der Firewall verloren geht und dadurch ein "Smartphone
	26	als Kartenleser" nicht mehr erkannt wird. Bitte gehen Sie in die
	27	Systemsteuerung Ihres Endgeräts und deinstallieren Sie die AusweisApp2
	28	um danach eine Neuinstallation durchzuführen.
16	29
17	30	- Auf Windows 10 Plattformen mit aktivierter Benutzerkontensteuerung kann
18	31	es bei Benutzern mit eingeschränkten Berechtigungen zu Problemen mit der

28	41	oder eine PIN-Änderung mit Komfort-Kartenleser durchgeführt wird, kann es
29	42	unter Windows und macOS zu einem Absturz kommen.
30	43
31		- Unter Umständen kommt es zu Stabilitätsproblemen der NFC-Schnittstelle
32		auf Android und iOS.
33
34		- Längere Texte können unter Android u.U. bei kleinen Bildschirmgrößen
35		abgeschnitten sein.
36
37	44	- Unter macOS wird der Hinweis bei falscher PIN-Bestätigung während der
38	45	PIN-Änderung nur sehr kurz angezeigt.
39
40		- Bei der Nutzung eines entfernten Kartenlesers mit aktiviertem Tastaturmodus
41		kann bei einer Authentisierung nicht in die PIN-Änderung gewechselt werden,
42		wenn nur eine 5-stellige PIN vorhanden ist.
43	46
44	47	- Unter Windows wird bei der neuen grafischen Oberfläche der
45	48	"Datei speichern unter"-Dialog nicht automatisch bei Beginn einer

53	56
54	57	- Bei einigen Links werden die Steuerzeichen vom Bildschirmleser vorgelesen.
55	58
56		- Wird der Screenreader aktiviert, während die AusweisApp2 bereits läuft,
57		kann es zu Fehlverhalten kommen.
58	59
59		- Die Online-Hilfe für die neue grafische Oberfläche ist noch nicht verfügbar.
	60	Android / iOS
	61	-------------
	62
	63	- Mit der NFC-Schnittstelle des iPhone 7 (Plus) unter iOS 13.0 und 13.1 werden
	64	viele Ausweise nicht erkannt (hauptsächlich NFC-A) und es kommt zu
	65	Abbrüchen der Authentisierung. Aktualisieren Sie auf iOS 13.2 oder höher.
	66
	67	- Unter Umständen kommt es zu Stabilitätsproblemen der NFC-Schnittstelle
	68	auf Android und iOS.
	69
	70	- Längere Texte können unter Android u.U. bei kleinen Bildschirmgrößen
	71	abgeschnitten sein.
60	72
61	73
62		Die nachfolgende Liste bezieht sich auf die alte grafische Oberfläche.
	74	Alte grafische Oberfläche
	75	-------------------------
63	76
64	77	- Bei Erhöhung der Schriftgröße über 175% kommt es zur Nutzungseinschränkung.
65	78

+10

-11

docs/releasenotes/support.rst less more

21	21
22	22	- Windows 10 (64bit)
23	23
24		- Android 5.0 und höher (x86, armeabi-v7a)
	24	- Android 5.0 und höher (armeabi-v7a, arm64-v8a)
25	25
26	26	- iOS 13 und höher
27	27

48	48	Im Rahmen der Qualitätssicherung werden die folgenden Browserversionen
49	49	getestet.
50	50
51		- Firefox 70
	51	- Firefox 75
52	52
53		- Chrome 78
	53	- Chrome 81
54	54
55	55	- Internet Explorer 11
56	56
57		- Safari 13
	57	- Safari 13.1
58	58
59		- Edge 44.5
	59	- Edge 80
60	60
61	61
62	62

101	101	https://www.ausweisapp.bund.de/mobile-geraete/
102	102
103	103
104		Android
105		"""""""
	104	Android / iOS
	105	"""""""""""""
106	106
107	107	Browser
108	108	~~~~~~~

114	114	Anbieter umgesetzten Aktivierung. Daher empfehlen wir einen der
115	115	folgenden Browser zu verwenden.
116	116
117		- Firefox Klar 8
	117	- Chrome 81 (Android)
118	118
119		- Chrome 78
	119	- Firefox 68 (Android)
120	120
121		- Android System WebView 73
122
	121	- Safari 13.1 (iOS)
123	122
124	123
125	124	Kartenleser

+1

-0

docs/releasenotes/versions.rst less more

6	6	:maxdepth: 1
7	7
8	8	1.20.0
	9	1.20.1
9	10
10	11
11	12	Versionszweig 1.18

+2

-2

docs/sdk/android.rst less more

40	40	The integrated AusweisApp2 will be fetched automatically as a dependency by
41	41	your app/build.gradle file.
42	42	It is recommended to always use the latest version by 1.+ of AusweisApp2.
43		But you are free to add a concrete version like 1.16.0.
	43	But you are free to add a concrete version like 1.20.1.
44	44
45	45	.. code-block:: groovy
46	46
47	47	dependencies {
48		implementation 'com.governikus:ausweisapp:1.16.+'
	48	implementation 'com.governikus:ausweisapp:1.20.+'
49	49	}
50	50
51	51

+3

-3

docs/sdk/commands.rst less more

298	298	keypad.
299	299
300	300
301		- value: The personal identification number (PIN) of the card.
	301	- value: The Personal Identification Number (PIN) of the card.
302	302	This must be 6 digits if the :ref:`reader` has no keypad, otherwise
303	303	this parameter must be omitted.
304	304

334	334	keypad.
335	335
336	336
337		- value: The card access number (CAN) of the card.
	337	- value: The Card Access Number (CAN) of the card.
338	338	This must be 6 digits if the :ref:`reader` has no keypad, otherwise
339	339	this parameter must be omitted.
340	340

372	372	keypad.
373	373
374	374
375		- value: The personal unblocking key (PUK) of the card.
	375	- value: The Personal Unblocking Key (PUK) of the card.
376	376	This must be 10 digits if the :ref:`reader` has no keypad, otherwise
377	377	this parameter must be omitted.
378	378

+1

-1

docs/sdk/conf.py.in less more

148	148
149	149	# The name of an image file (relative to this directory) to place at the top of
150	150	# the title page.
151		latex_logo = '@SPHINX_DOCS_DIR@/../../resources/images/npa_docs.png'
	151	latex_logo = '@SPHINX_DOCS_DIR@/../../resources/images/npa.png'
152	152
153	153	# For "manual" documents, if this is true, then toplevel headings are parts,
154	154	# not chapters.

+26

-12

libs/CMakeLists.txt less more

68	68	SET(PERL_EXECUTABLE perl)
69	69	ENDIF()
70	70
71		FIND_HOST_PACKAGE(PythonInterp 2.7 REQUIRED)
72
73	71	FIND_PROGRAM(PATCH_CMD patch CMAKE_FIND_ROOT_PATH_BOTH)
74	72	IF(PATCH_CMD)
75	73	SET(PATCH_OPTIONS -i)
76	74	MESSAGE(STATUS "Using 'patch' command... ${PATCH_CMD}")
77	75	ELSE()
78		SET(PATCH_CMD ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/patch.py --debug -v)
79	76	MESSAGE(STATUS "Cannot find 'patch' command... using patch.py")
	77
	78	IF(CMAKE_VERSION VERSION_LESS "3.12")
	79	FIND_HOST_PACKAGE(PythonInterp REQUIRED)
	80	SET(Python_EXECUTABLE ${PYTHON_EXECUTABLE})
	81	ELSE()
	82	FIND_HOST_PACKAGE(Python REQUIRED)
	83	ENDIF()
	84
	85	SET(PATCH_CMD ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/patch.py --debug -v)
80	86	ENDIF()
81	87	SET(PATCH_CMD ${PATCH_CMD} -p1 ${PATCH_OPTIONS} ${PROJECT_SOURCE_DIR}/patches)
82	88

115	121	SET(QT_DEST_DIR archive) # official_releases
116	122	ENDIF()
117	123	STRING(SUBSTRING ${QT} 0 4 QT_SUBVERSION)
118
119		SET(QT_URL https://download.qt.io/${QT_DEST_DIR}/qt/${QT_SUBVERSION}/${QT}/single)
120		SET(OPENSSL_URL https://www.openssl.org/source)
	124	SET(QT_URL https://download.qt.io/${QT_DEST_DIR}/qt/${QT_SUBVERSION}/${QT}/single/${QT_FILE})
	125
	126	STRING(SUBSTRING ${OPENSSL} 0 5 OPENSSL_SUBVERSION)
	127	SET(OPENSSL_SOURCE https://www.openssl.org/source)
	128	SET(OPENSSL_URL ${OPENSSL_SOURCE}/${OPENSSL_FILE})
	129	SET(OPENSSL_URL_OLD ${OPENSSL_SOURCE}/old/${OPENSSL_SUBVERSION}/${OPENSSL_FILE})
	130
	131
121	132
122	133	SET(ENABLED_TARGETS)
123
124	134
125	135	################################## OpenSSL
126	136	#########################################################################

194	204	ENDIF()
195	205
196	206	ExternalProject_Add(openssl
197		URL ${OPENSSL_URL}/${OPENSSL_FILE}
	207	URL ${OPENSSL_URL} ${OPENSSL_URL_OLD}
198	208	URL_HASH SHA256=${OPENSSL_HASH}
199	209	DOWNLOAD_DIR ${PACKAGES_DIR}
200	210

325	335	ENDIF()
326	336	SET(QT_CONFIGURE_FLAGS ${QT_CONFIGURE_FLAGS} ${QT_CONFIGURE_FLAGS_OTHER}
327	337	-android-sdk ${ANDROID_SDK} -android-ndk ${CMAKE_ANDROID_NDK} -android-ndk-platform android-${CMAKE_SYSTEM_VERSION} -android-ndk-host ${CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG}
328		-android-arch ${CMAKE_ANDROID_ARCH_ABI} -android-toolchain-version ${ANDROID_NDK_TOOLCHAIN_VERSION}
329		-xplatform ${ANDROID_XPLATFORM})
	338	-android-arch ${CMAKE_ANDROID_ARCH_ABI} -xplatform ${ANDROID_XPLATFORM})
330	339
331	340	IF(CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a")
332	341	SET(QT_CONFIGURE_FLAGS ${QT_CONFIGURE_FLAGS} -no-use-gold-linker)

334	343
335	344	SET(QT_ENV export OPENSSL_LIBS=-lcrypto-gov\ -lssl-gov &&)
336	345	ELSEIF(BSD)
337		SET(QT_CONFIGURE_FLAGS ${QT_CONFIGURE_FLAGS} ${QT_CONFIGURE_FLAGS_OTHER})
	346	SET(QT_CONFIGURE_FLAGS ${QT_CONFIGURE_FLAGS} ${QT_CONFIGURE_FLAGS_OTHER} -no-libudev)
338	347	ELSEIF(LINUX)
339	348	SET(QT_CONFIGURE_FLAGS ${QT_CONFIGURE_FLAGS} ${QT_CONFIGURE_FLAGS_OTHER} -no-libproxy)
340	349	ELSE()

347	356
348	357	ExternalProject_Add(qt
349	358	DEPENDS openssl
350		URL ${QT_URL}/${QT_FILE}
	359	URL ${QT_URL}
351	360	URL_HASH SHA256=${QT_HASH}
352	361	DOWNLOAD_DIR ${PACKAGES_DIR}
353	362
354	363	PATCH_COMMAND ${QT_PATCH_COMMAND}
	364	${PATCH_CMD}/qt-Port-python-check-to-configure-system.patch &&
355	365	${PATCH_CMD}/qt-Disable-unused-imageformats.patch &&
356	366	${PATCH_CMD}/qt-Add-work-around-for-freebsd-build.patch &&
357	367	${PATCH_CMD}/qt-Remove-Qt-Labs-specific-plugins-from-the-build.patch &&

363	373	${PATCH_CMD}/qt-Filesystem-avoid-crashes-on-exit-in-case-the-locale-.patch &&
364	374	${PATCH_CMD}/qt-Revert-Android-Stick-with-buildToolsVersion-28.0.3.patch &&
365	375	${PATCH_CMD}/qt-Remove-dead-code-to-fix-a-lint-warning.patch &&
	376	${PATCH_CMD}/qt-Fix-llvm-strip.patch &&
	377	${PATCH_CMD}/qt-Handle-exceptions-when-accessing-android-clipboard.patch &&
	378	${PATCH_CMD}/qt-Fix-build-with-macOS-10.15-and-deployment-10.12.patch &&
	379	${PATCH_CMD}/qt-Pass-SDK-root-to-the-linker-as-isysroot-not-Wl-sysli.patch &&
366	380	${CMAKE_COMMAND} -E touch qtbase/.gitignore
367	381	CONFIGURE_COMMAND ${QT_ENV} ${QT_CONFIGURE} ${QT_CONFIGURE_FLAGS} ${QT_CONFIGURE_FLAGS_SKIP_MODULES}
368	382	BUILD_COMMAND ${MAKE} ${MAKE_JOBS}

+291

-130

libs/patch.py less more

1	1	"""
2	2	Patch utility to apply unified diffs
3	3
4		Brute-force line-by-line non-recursive parsing
	4	Brute-force line-by-line non-recursive parsing
5	5
6	6	Copyright (c) 2008-2016 anatoly techtonik
7	7	Available under the terms of MIT license
8	8
9		https://github.com/techtonik/python-patch/
10
	9	---
	10	The MIT License (MIT)
	11
	12	Copyright (c) 2019 JFrog LTD
	13
	14	Permission is hereby granted, free of charge, to any person obtaining a copy of this software
	15	and associated documentation files (the "Software"), to deal in the Software without
	16	restriction, including without limitation the rights to use, copy, modify, merge, publish,
	17	distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
	18	Software is furnished to do so, subject to the following conditions:
	19
	20	The above copyright notice and this permission notice shall be included in all copies or
	21	substantial portions of the Software.
	22
	23	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
	24	INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
	25	PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
	26	ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
	27	ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
	28	SOFTWARE.
11	29	"""
12	30	from __future__ import print_function
13	31
14		__author__ = "anatoly techtonik <techtonik@gmail.com>"
15		__version__ = "1.16"
	32	__author__ = "Conan.io <info@conan.io>"
	33	__version__ = "1.17.4"
	34	__license__ = "MIT"
	35	__url__ = "https://github.com/conan-io/python-patch"
16	36
17	37	import copy
18	38	import logging
19	39	import re
	40	import tempfile
	41	import codecs
20	42
21	43	# cStringIO doesn't support unicode in 2.5
22	44	try:

33	55	import posixpath
34	56	import shutil
35	57	import sys
	58	import stat
36	59
37	60
38	61	PY3K = sys.version_info >= (3, 0)

52	75
53	76	# [ ] figure out how to print non-utf-8 filenames without
54	77	# information loss
55		return b.decode('utf-8')
	78	return b.decode('utf-8')
56	79
57	80
58	81	#------------------------------------------------
59	82	# Logging is controlled by logger named after the
60		# module name (e.g. 'patch' for patch.py module)
61
62		logger = logging.getLogger(__name__)
	83	# module name (e.g. 'patch' for patch_ng.py module)
	84
	85	logger = logging.getLogger("patch_ng")
63	86
64	87	debug = logger.debug
65	88	info = logger.info
66	89	warning = logger.warning
	90	error = logger.error
67	91
68	92	class NullHandler(logging.Handler):
69	93	""" Copied from Python 2.7 to avoid getting

154	178	filename = re.sub(b'^[\\\\/]+', b'', filename)
155	179	return filename
156	180
	181
	182	def safe_unlink(filepath):
	183	os.chmod(filepath, stat.S_IWUSR \| stat.S_IWGRP \| stat.S_IWOTH)
	184	os.unlink(filepath)
	185
	186
157	187	#-----------------------------------------------
158	188	# Main API functions
159	189

203	233	# --- /Utility function ---
204	234
205	235
	236	def decode_text(text):
	237	encodings = {codecs.BOM_UTF8: "utf_8_sig",
	238	codecs.BOM_UTF16_BE: "utf_16_be",
	239	codecs.BOM_UTF16_LE: "utf_16_le",
	240	codecs.BOM_UTF32_BE: "utf_32_be",
	241	codecs.BOM_UTF32_LE: "utf_32_le",
	242	b'\x2b\x2f\x76\x38': "utf_7",
	243	b'\x2b\x2f\x76\x39': "utf_7",
	244	b'\x2b\x2f\x76\x2b': "utf_7",
	245	b'\x2b\x2f\x76\x2f': "utf_7",
	246	b'\x2b\x2f\x76\x38\x2d': "utf_7"}
	247	for bom in sorted(encodings, key=len, reverse=True):
	248	if text.startswith(bom):
	249	try:
	250	return text[len(bom):].decode(encodings[bom])
	251	except UnicodeDecodeError:
	252	continue
	253	decoders = ["utf-8", "Windows-1252"]
	254	for decoder in decoders:
	255	try:
	256	return text.decode(decoder)
	257	except UnicodeDecodeError:
	258	continue
	259	logger.warning("can't decode %s" % str(text))
	260	return text.decode("utf-8", "ignore") # Ignore not compatible characters
	261
	262
	263	def to_file_bytes(content):
	264	if PY3K:
	265	if not isinstance(content, bytes):
	266	content = bytes(content, "utf-8")
	267	elif isinstance(content, unicode):
	268	content = content.encode("utf-8")
	269	return content
	270
	271
	272	def load(path, binary=False):
	273	""" Loads a file content """
	274	with open(path, 'rb') as handle:
	275	tmp = handle.read()
	276	return tmp if binary else decode_text(tmp)
	277
	278
	279	def save(path, content, only_if_modified=False):
	280	"""
	281	Saves a file with given content
	282	Params:
	283	path: path to write file to
	284	content: contents to save in the file
	285	only_if_modified: file won't be modified if the content hasn't changed
	286	"""
	287	try:
	288	os.makedirs(os.path.dirname(path))
	289	except Exception:
	290	pass
	291
	292	new_content = to_file_bytes(content)
	293
	294	if only_if_modified and os.path.exists(path):
	295	old_content = load(path, binary=True)
	296	if old_content == new_content:
	297	return
	298
	299	with open(path, "wb") as handle:
	300	handle.write(new_content)
	301
	302
206	303	class Hunk(object):
207	304	""" Parsed hunk data container (hunk starts with @@ -R +R @@) """
208	305

215	312	self.desc=''
216	313	self.text=[]
217	314
218		# def apply(self, estream):
219		# """ write hunk data into enumerable stream
220		# return strings one by one until hunk is
221		# over
222		#
223		# enumerable stream are tuples (lineno, line)
224		# where lineno starts with 0
225		# """
226		# pass
227
228	315
229	316	class Patch(object):
230	317	""" Patch for a single file.
231	318	If used as an iterable, returns hunks.
232	319	"""
233	320	def __init__(self):
234		self.source = None
	321	self.source = None
235	322	self.target = None
236	323	self.hunks = []
237	324	self.hunkends = []

337	424
338	425	# regexp to match start of hunk, used groups - 1,3,4,6
339	426	re_hunk_start = re.compile(b"^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@")
340
	427
341	428	self.errors = 0
342	429	# temp buffers for header and filenames info
343	430	header = []

373	460	else:
374	461	info("%d unparsed bytes left at the end of stream" % len(b''.join(header)))
375	462	self.warnings += 1
376		# TODO check for \No new line at the end..
	463	# TODO check for \No new line at the end..
377	464	# TODO test for unparsed bytes
378	465	# otherwise error += 1
379	466	# this is actually a loop exit

406	493	p.hunkends["lf"] += 1
407	494	elif line.endswith(b"\r"):
408	495	p.hunkends["cr"] += 1
409
	496
410	497	if line.startswith(b"-"):
411	498	hunkactual["linessrc"] += 1
412	499	elif line.startswith(b"+"):

476	563	# XXX header += srcname
477	564	# double source filename line is encountered
478	565	# attempt to restart from this second line
479		re_filename = b"^--- ([^\t]+)"
480		match = re.match(re_filename, line)
	566
	567	# Files dated at Unix epoch don't exist, e.g.:
	568	# '1970-01-01 01:00:00.000000000 +0100'
	569	# They include timezone offsets.
	570	# .. which can be parsed (if we remove the nanoseconds)
	571	# .. by strptime() with:
	572	# '%Y-%m-%d %H:%M:%S %z'
	573	# .. but unfortunately this relies on the OSes libc
	574	# strptime function and %z support is patchy, so we drop
	575	# everything from the . onwards and group the year and time
	576	# separately.
	577	re_filename_date_time = b"^--- ([^\t]+)(?:\s([0-9-]+)\s([0-9:]+)\|.*)"
	578	match = re.match(re_filename_date_time, line)
481	579	# todo: support spaces in filenames
482	580	if match:
483	581	srcname = match.group(1).strip()
	582	date = match.group(2)
	583	time = match.group(3)
	584	if (date == b'1970-01-01' or date == b'1969-12-31') and time.split(b':',1)[1] == b'00:00':
	585	srcname = b'/dev/null'
484	586	else:
485	587	warning("skipping invalid filename at line %d" % (lineno+1))
486	588	self.errors += 1

502	604	headscan = True
503	605	else:
504	606	if tgtname != None:
505		# XXX seems to be a dead branch
	607	# XXX seems to be a dead branch
506	608	warning("skipping invalid patch - double target at line %d" % (lineno+1))
507	609	self.errors += 1
508	610	srcname = None

515	617	filenames = False
516	618	headscan = True
517	619	else:
518		re_filename = b"^\+\+\+ ([^\t]+)"
519		match = re.match(re_filename, line)
	620	re_filename_date_time = b"^\+\+\+ ([^\t]+)(?:\s([0-9-]+)\s([0-9:]+)\|.*)"
	621	match = re.match(re_filename_date_time, line)
520	622	if not match:
521	623	warning("skipping invalid patch - no target filename at line %d" % (lineno+1))
522	624	self.errors += 1

525	627	filenames = False
526	628	headscan = True
527	629	else:
	630	tgtname = match.group(1).strip()
	631	date = match.group(2)
	632	time = match.group(3)
	633	if (date == b'1970-01-01' or date == b'1969-12-31') and time.split(b':',1)[1] == b'00:00':
	634	tgtname = b'/dev/null'
528	635	if p: # for the first run p is None
529	636	self.items.append(p)
530	637	p = Patch()
531	638	p.source = srcname
532	639	srcname = None
533		p.target = match.group(1).strip()
	640	p.target = tgtname
	641	tgtname = None
534	642	p.header = header
535	643	header = []
536	644	# switch to hunkhead state

589	697	warning("error: no patch data found!")
590	698	return False
591	699	else: # extra data at the end of file
592		pass
	700	pass
593	701	else:
594	702	warning("error: patch stream is incomplete!")
595	703	self.errors += 1

615	723	# --------
616	724
617	725	self._normalize_filenames()
618
	726
619	727	return (self.errors == 0)
620	728
621	729	def _detect_type(self, p):

653	761	break
654	762	if p.header[idx].startswith(b'diff --git a/'):
655	763	if (idx+1 < len(p.header)
656		and re.match(b'index \\w{7}..\\w{7} \\d{6}', p.header[idx+1])):
	764	and re.match(b'(?:index \\w{7}..\\w{7} \\d{6}\|new file mode \\d*)', p.header[idx+1])):
657	765	if DVCS:
658	766	return GIT
659	767
660	768	# HG check
661		#
	769	#
662	770	# - for plain HG format header is like "diff -r b2d9961ff1f5 filename"
663	771	# - for Git-style HG patches it is "diff --git a/oldname b/newname"
664	772	# - filename starts with a/, b/ or is equal to /dev/null
665	773	# - exported changesets also contain the header
666	774	# # HG changeset patch
667	775	# # User name@example.com
668		# ...
	776	# ...
669	777	# TODO add MQ
670	778	# TODO add revision info
671	779	if len(p.header) > 0:

688	796
689	797	[x] always use forward slashes to be crossplatform
690	798	(diff/patch were born as a unix utility after all)
691
	799
692	800	return None
693	801	"""
694	802	if debugmode:
695	803	debug("normalize filenames")
696	804	for i,p in enumerate(self.items):
697	805	if debugmode:
698		debug(" patch type = " + p.type)
699		debug(" source = " + p.source)
700		debug(" target = " + p.target)
	806	debug(" patch type = %s" % p.type)
	807	debug(" source = %s" % p.source)
	808	debug(" target = %s" % p.target)
701	809	if p.type in (HG, GIT):
702		# TODO: figure out how to deal with /dev/null entries
703	810	debug("stripping a/ and b/ prefixes")
704		if p.source != '/dev/null':
	811	if p.source != b'/dev/null':
705	812	if not p.source.startswith(b"a/"):
706	813	warning("invalid source filename")
707	814	else:
708	815	p.source = p.source[2:]
709		if p.target != '/dev/null':
	816	if p.target != b'/dev/null':
710	817	if not p.target.startswith(b"b/"):
711	818	warning("invalid target filename")
712	819	else:

729	836	while p.target.startswith(b".." + sep):
730	837	p.target = p.target.partition(sep)[2]
731	838	# absolute paths are not allowed
732		if xisabs(p.source) or xisabs(p.target):
	839	if (xisabs(p.source) and p.source != b'/dev/null') or \
	840	(xisabs(p.target) and p.target != b'/dev/null'):
733	841	warning("error: absolute paths are not allowed - file no.%d" % (i+1))
734	842	self.warnings += 1
735		if xisabs(p.source):
	843	if xisabs(p.source) and p.source != b'/dev/null':
736	844	warning("stripping absolute path from source name '%s'" % p.source)
737	845	p.source = xstrip(p.source)
738		if xisabs(p.target):
	846	if xisabs(p.target) and p.target != b'/dev/null':
739	847	warning("stripping absolute path from target name '%s'" % p.target)
740	848	p.target = xstrip(p.target)
741
	849
742	850	self.items[i].source = p.source
743	851	self.items[i].target = p.target
744	852

794	902	hist = "+"int(iwidth) + "-"int(dwidth)
795	903	# -- /calculating +- histogram --
796	904	output += (format % (tostr(names[i]), str(insert[i] + delete[i]), hist))
797
	905
798	906	output += (" %d files changed, %d insertions(+), %d deletions(-), %+d bytes"
799	907	% (len(names), sum(insert), sum(delete), delta))
800	908	return output
801	909
802	910
803		def findfile(self, old, new):
804		""" return name of file to be patched or None """
805		if exists(old):
806		return old
	911	def findfiles(self, old, new):
	912	""" return tuple of source file, target file """
	913	if old == b'/dev/null':
	914	handle, abspath = tempfile.mkstemp(suffix='pypatch')
	915	abspath = abspath.encode()
	916	# The source file must contain a line for the hunk matching to succeed.
	917	os.write(handle, b' ')
	918	os.close(handle)
	919	if not exists(new):
	920	handle = open(new, 'wb')
	921	handle.close()
	922	return abspath, new
	923	elif exists(old):
	924	return old, old
807	925	elif exists(new):
808		return new
	926	return new, new
	927	elif new == b'/dev/null':
	928	return None, None
809	929	else:
810	930	# [w] Google Code generates broken patches with its online editor
811	931	debug("broken patch from Google Code, stripping prefixes..")

814	934	debug(" %s" % old)
815	935	debug(" %s" % new)
816	936	if exists(old):
817		return old
	937	return old, old
818	938	elif exists(new):
819		return new
820		return None
821
822
823		def apply(self, strip=0, root=None):
	939	return new, new
	940	return None, None
	941
	942	def _strip_prefix(self, filename):
	943	if filename.startswith(b'a/') or filename.startswith(b'b/'):
	944	return filename[2:]
	945	return filename
	946
	947	def decode_clean(self, path, prefix):
	948	path = path.decode("utf-8").replace("\\", "/")
	949	if path.startswith(prefix):
	950	path = path[2:]
	951	return path
	952
	953	def strip_path(self, path, base_path, strip=0):
	954	tokens = path.split("/")
	955	if len(tokens) > 1:
	956	tokens = tokens[strip:]
	957	path = "/".join(tokens)
	958	if base_path:
	959	path = os.path.join(base_path, path)
	960	return path
	961	# account for new and deleted files, upstream dep won't fix them
	962
	963
	964
	965
	966	def apply(self, strip=0, root=None, fuzz=False):
824	967	""" Apply parsed patch, optionally stripping leading components
825	968	from file paths. `root` parameter specifies working dir.
	969	:param strip: Strip patch path
	970	:param root: Folder to apply the patch
	971	:param fuzz: Accept fuzzy patches
826	972	return True on success
827	973	"""
	974	items = []
	975	for item in self.items:
	976	source = self.decode_clean(item.source, "a/")
	977	target = self.decode_clean(item.target, "b/")
	978	if "dev/null" in source:
	979	target = self.strip_path(target, root, strip)
	980	hunks = [s.decode("utf-8") for s in item.hunks[0].text]
	981	new_file = "".join(hunk[1:] for hunk in hunks)
	982	save(target, new_file)
	983	elif "dev/null" in target:
	984	source = self.strip_path(source, root, strip)
	985	safe_unlink(source)
	986	else:
	987	items.append(item)
	988	self.items = items
	989
828	990	if root:
829	991	prevdir = os.getcwd()
830	992	os.chdir(root)

848	1010	debug("stripping %s leading component(s) from:" % strip)
849	1011	debug(" %s" % p.source)
850	1012	debug(" %s" % p.target)
851		old = pathstrip(p.source, strip)
852		new = pathstrip(p.target, strip)
	1013	old = p.source if p.source == b'/dev/null' else pathstrip(p.source, strip)
	1014	new = p.target if p.target == b'/dev/null' else pathstrip(p.target, strip)
853	1015	else:
854	1016	old, new = p.source, p.target
855	1017
856		filename = self.findfile(old, new)
857
858		if not filename:
859		if len(p.hunks)==1 and p.hunks[0].startsrc==0 and p.hunks[0].linessrc==0:
860		filename=new
861		debug("patch creates new file "+filename)
862		# create directory
863		filenameDir=os.path.join(os.path.dirname(filename), ".")
864		if not exists(filenameDir):
865		os.makedirs(filenameDir)
866		# create empty file
867		open(filename, "a").close()
868		else:
869		warning("source/target file does not exist:\n --- %s\n +++ %s" % (old, new))
870		errors += 1
871		continue
872		if not isfile(filename):
873		warning("not a file - %s" % filename)
	1018	filenameo, filenamen = self.findfiles(old, new)
	1019
	1020	if not filenameo or not filenamen:
	1021	error("source/target file does not exist:\n --- %s\n +++ %s" % (old, new))
874	1022	errors += 1
875	1023	continue
	1024	if not isfile(filenameo):
	1025	error("not a file - %s" % filenameo)
	1026	errors += 1
	1027	continue
876	1028
877	1029	# [ ] check absolute paths security here
878		debug("processing %d/%d:\t %s" % (i+1, total, filename))
	1030	debug("processing %d/%d:\t %s" % (i+1, total, filenamen))
879	1031
880	1032	# validate before patching
881		f2fp = open(filename, 'rb')
	1033	f2fp = open(filenameo, 'rb')
882	1034	hunkno = 0
883	1035	hunk = p.hunks[hunkno]
884	1036	hunkfind = []
885	1037	hunkreplace = []
886	1038	validhunks = 0
887	1039	canpatch = False
888
889	1040	for lineno, line in enumerate(f2fp):
890	1041	if lineno+1 < hunk.startsrc:
891	1042	continue

898	1049	# todo \ No newline at end of file
899	1050
900	1051	# check hunks in source file
901		if lineno+1 < hunk.startsrc+len(hunkfind)-1:
	1052	if lineno+1 < hunk.startsrc+len(hunkfind):
902	1053	if line.rstrip(b"\r\n") == hunkfind[hunklineno]:
903		hunklineno+=1
	1054	hunklineno += 1
904	1055	else:
905		info("file %d/%d:\t %s" % (i+1, total, filename))
906		info(" hunk no.%d doesn't match source file at line %d" % (hunkno+1, lineno+1))
907		info(" expected: %s" % hunkfind[hunklineno])
908		info(" actual : %s" % line.rstrip(b"\r\n"))
909		# not counting this as error, because file may already be patched.
910		# check if file is already patched is done after the number of
911		# invalid hunks if found
912		# TODO: check hunks against source/target file in one pass
913		# API - check(stream, srchunks, tgthunks)
914		# return tuple (srcerrs, tgterrs)
915
916		# continue to check other hunks for completeness
917		hunkno += 1
918		if hunkno < len(p.hunks):
919		hunk = p.hunks[hunkno]
920		continue
	1056	warning("file %d/%d:\t %s" % (i+1, total, filenamen))
	1057	warning(" hunk no.%d doesn't match source file at line %d" % (hunkno+1, lineno+1))
	1058	warning(" expected: %s" % hunkfind[hunklineno])
	1059	warning(" actual : %s" % line.rstrip(b"\r\n"))
	1060	if fuzz:
	1061	hunklineno += 1
921	1062	else:
922		break
	1063	# not counting this as error, because file may already be patched.
	1064	# check if file is already patched is done after the number of
	1065	# invalid hunks if found
	1066	# TODO: check hunks against source/target file in one pass
	1067	# API - check(stream, srchunks, tgthunks)
	1068	# return tuple (srcerrs, tgterrs)
	1069
	1070	# continue to check other hunks for completeness
	1071	hunkno += 1
	1072	if hunkno < len(p.hunks):
	1073	hunk = p.hunks[hunkno]
	1074	continue
	1075	else:
	1076	break
923	1077
924	1078	# check if processed line is the last line
925		if lineno+1 == hunk.startsrc+len(hunkfind)-1:
926		debug(" hunk no.%d for file %s -- is ready to be patched" % (hunkno+1, filename))
	1079	if len(hunkfind) == 0 or lineno+1 == hunk.startsrc+len(hunkfind)-1:
	1080	debug(" hunk no.%d for file %s -- is ready to be patched" % (hunkno+1, filenamen))
927	1081	hunkno+=1
928	1082	validhunks+=1
929	1083	if hunkno < len(p.hunks):

934	1088	canpatch = True
935	1089	break
936	1090	else:
937		if hunk.startsrc==0 and hunk.linessrc==0 and len(p.hunks)==1:
938		debug(" patch represents a new file")
939		validhunks=1
940		canpatch=True
941		elif hunkno < len(p.hunks):
942		warning("premature end of source file %s at hunk %d" % (filename, hunkno+1))
	1091	if hunkno < len(p.hunks):
	1092	error("premature end of source file %s at hunk %d" % (filenameo, hunkno+1))
943	1093	errors += 1
944	1094
945	1095	f2fp.close()
946	1096
947	1097	if validhunks < len(p.hunks):
948		if self._match_file_hunks(filename, p.hunks):
949		warning("already patched %s" % filename)
	1098	if self._match_file_hunks(filenameo, p.hunks):
	1099	warning("already patched %s" % filenameo)
950	1100	else:
951		warning("source file is different - %s" % filename)
952		errors += 1
	1101	if fuzz:
	1102	warning("source file is different - %s" % filenameo)
	1103	else:
	1104	error("source file is different - %s" % filenameo)
	1105	errors += 1
953	1106	if canpatch:
954		backupname = filename+b".orig"
	1107	backupname = filenamen+b".orig"
955	1108	if exists(backupname):
956	1109	warning("can't backup original file to %s - aborting" % backupname)
	1110	errors += 1
957	1111	else:
958		shutil.move(filename, backupname)
959		if self.write_hunks(backupname, filename, p.hunks):
960		info("successfully patched %d/%d:\t %s" % (i+1, total, filename))
961		os.unlink(backupname)
	1112	shutil.move(filenamen, backupname)
	1113	if self.write_hunks(backupname if filenameo == filenamen else filenameo, filenamen, p.hunks):
	1114	info("successfully patched %d/%d:\t %s" % (i+1, total, filenamen))
	1115	safe_unlink(backupname)
	1116	if new == b'/dev/null':
	1117	# check that filename is of size 0 and delete it.
	1118	if os.path.getsize(filenamen) > 0:
	1119	warning("expected patched file to be empty as it's marked as deletion:\t %s" % filenamen)
	1120	safe_unlink(filenamen)
962	1121	else:
963	1122	errors += 1
964		warning("error patching file %s" % filename)
965		shutil.copy(filename, filename+".invalid")
966		warning("invalid version is saved to %s" % filename+".invalid")
	1123	warning("error patching file %s" % filenamen)
	1124	shutil.copy(filenamen, filenamen+".invalid")
	1125	warning("invalid version is saved to %s" % filenamen+".invalid")
967	1126	# todo: proper rejects
968		shutil.move(backupname, filename)
	1127	shutil.move(backupname, filenamen)
969	1128
970	1129	if root:
971	1130	os.chdir(prevdir)

1050	1209
1051	1210	def patch_stream(self, instream, hunks):
1052	1211	""" Generator that yields stream patched with hunks iterable
1053
	1212
1054	1213	Converts lineends in hunk lines to the best suitable format
1055	1214	autodetected from input
1056	1215	"""

1094	1253	continue
1095	1254	else:
1096	1255	if not hline.startswith(b"+"):
1097		get_line()
	1256	yield get_line()
1098	1257	srclineno += 1
	1258	continue
1099	1259	line2write = hline[1:]
1100	1260	# detect if line ends are consistent in source file
1101	1261	if sum([bool(lineends[x]) for x in lineends]) == 1:

1103	1263	yield line2write.rstrip(b"\r\n")+newline
1104	1264	else: # newlines are mixed
1105	1265	yield line2write
1106
	1266
1107	1267	for line in instream:
1108	1268	yield line
1109	1269
1110	1270
1111	1271	def write_hunks(self, srcname, tgtname, hunks):
1112		if len(hunks)==1 and hunks[0].starttgt==0 and hunks[0].linestgt==0:
1113		debug("Removing target file %s" % tgtname)
1114		return True
1115
1116	1272	src = open(srcname, "rb")
1117	1273	tgt = open(tgtname, "wb")
1118	1274

1161	1317	help="strip N path components from filenames")
1162	1318	opt.add_option("--revert", action="store_true",
1163	1319	help="apply patch in reverse order (unpatch)")
	1320	opt.add_option("-f", "--fuzz", action="store_true", dest="fuzz", help="Accept fuuzzy patches")
1164	1321	(options, args) = opt.parse_args()
1165	1322
1166	1323	if not args and sys.argv[-1:] != ['--']:

1195	1352	print(patch.diffstat())
1196	1353	sys.exit(0)
1197	1354
	1355	if not patch:
	1356	error("Could not parse patch")
	1357	sys.exit(-1)
	1358
1198	1359	#pprint(patch)
1199	1360	if options.revert:
1200	1361	patch.revert(options.strip, root=options.directory) or sys.exit(-1)
1201	1362	else:
1202		patch.apply(options.strip, root=options.directory) or sys.exit(-1)
1203
1204		# todo: document and test line ends handling logic - patch.py detects proper line-endings
	1363	patch.apply(options.strip, root=options.directory, fuzz=options.fuzz) or sys.exit(-1)
	1364
	1365	# todo: document and test line ends handling logic - patch_ng.py detects proper line-endings
1205	1366	# for inserted hunks and issues a warning if patched file has incosistent line ends
1206	1367
1207	1368

+37

-0

libs/patches/qt-Fix-build-with-macOS-10.15-and-deployment-10.12.patch less more

	0	From 4df28b1a8bc64ddbc3eaeb921c31a48bd6ce13a0 Mon Sep 17 00:00:00 2001
	1	From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
	2	Date: Thu, 26 Mar 2020 12:52:22 +0100
	3	Subject: [PATCH] Fix build with macOS 10.15 and deployment 10.12
	4
	5	io/qfilesystemengine_unix.cpp:1420:9: error: 'futimens' is only available on macOS 10.13 or newer [-Werror,-Wunguarded-availability-new]
	6	if (futimens(fd, ts) == -1) {
	7	^~~~~~~~
	8	/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/include/sys/stat.h:396:9: note: 'futimens' has been marked as being introduced in macOS 10.13 here, but the deployment target is macOS 10.12.0
	9	int futimens(int __fd, const struct timespec __times[2]) __API_AVAILABLE(macosx(10.13), ios(11.0), tvos(11.0), watchos(4.0));
	10	^
	11	io/qfilesystemengine_unix.cpp:1420:9: note: enclose 'futimens' in a __builtin_available check to silence this warning
	12	if (futimens(fd, ts) == -1) {
	13	^~~~~~~~
	14
	15	Change-Id: Ib52adf7b1ec4f1057d8cb260a00da509429cfaed
	16	---
	17	src/corelib/configure.json \| 3 ++-
	18	1 file changed, 2 insertions(+), 1 deletion(-)
	19
	20	diff --git x/qtbase/src/corelib/configure.json y/qtbase/src/corelib/configure.json
	21	index de8d26a12b..4de6cc19f3 100644
	22	--- x/qtbase/src/corelib/configure.json
	23	+++ y/qtbase/src/corelib/configure.json
	24	@@ -343,7 +343,8 @@
	25	"# Block futimens() on Apple platforms unless it's available on ALL",
	26	"# deployment targets. This simplifies the logic at the call site",
	27	"# dramatically, as it isn't strictly needed compared to futimes().",
	28	- "darwin: QMAKE_CXXFLAGS += -Werror=unguarded-availability"
	29	+ "darwin: QMAKE_CXXFLAGS += -Werror=unguarded-availability -Werror=unguarded-availability-new",
	30	+ "CONFIG += warn_on"
	31	]
	32	}
	33	},
	34	--
	35	2.26.0
	36

+26

-0

libs/patches/qt-Fix-llvm-strip.patch less more

	0	From 8b04c8961fd3b93416674fe03b341b53da974d90 Mon Sep 17 00:00:00 2001
	1	From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
	2	Date: Tue, 4 Feb 2020 09:37:39 +0100
	3	Subject: [PATCH] Fix llvm strip
	4
	5	Change-Id: If5c5a961757255c4e233b0935887adb6faa3564d
	6	---
	7	src/tools/androiddeployqt/main.cpp \| 2 +-
	8	1 file changed, 1 insertion(+), 1 deletion(-)
	9
	10	diff --git x/qtbase/src/tools/androiddeployqt/main.cpp y/qtbase/src/tools/androiddeployqt/main.cpp
	11	index 6a6f8034e3..332975bca9 100644
	12	--- x/qtbase/src/tools/androiddeployqt/main.cpp
	13	+++ y/qtbase/src/tools/androiddeployqt/main.cpp
	14	@@ -1915,7 +1915,7 @@ bool stripFile(const Options &options, const QString &fileName)
	15	}
	16
	17	if (options.useLLVM)
	18	- strip = QString::fromLatin1("%1 -strip-all %2").arg(shellQuote(strip), shellQuote(fileName));
	19	+ strip = QString::fromLatin1("%1 --strip-all %2").arg(shellQuote(strip), shellQuote(fileName));
	20	else
	21	strip = QString::fromLatin1("%1 %2").arg(shellQuote(strip), shellQuote(fileName));
	22
	23	--
	24	2.25.0
	25

+202

-0

libs/patches/qt-Handle-exceptions-when-accessing-android-clipboard.patch less more

	0	From 29435a6a279c8a005aeca72a2079c2f844078822 Mon Sep 17 00:00:00 2001
	1	From: Mike Achtelik <mike.achtelik@gmail.com>
	2	Date: Thu, 6 Feb 2020 13:14:38 +0100
	3	Subject: [PATCH] Handle exceptions when accessing android clipboard
	4
	5	In some circumstances android throws an exception or returns null,
	6	when trying to access the clipboard.
	7
	8	Fixes: QTBUG-80689
	9	Change-Id: I92c134e2a002fc648ff966e15a19eb3307c428a1
	10	Reviewed-by: BogDan Vatra <bogdan@kdab.com>
	11	---
	12	.../org/qtproject/qt5/android/QtNative.java \| 128 +++++++++++-------
	13	1 file changed, 78 insertions(+), 50 deletions(-)
	14
	15	diff --git x/qtbase/src/android/jar/src/org/qtproject/qt5/android/QtNative.java y/qtbase/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
	16	index 1d2b70ab5f..a13c233712 100644
	17	--- x/qtbase/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
	18	+++ y/qtbase/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
	19	@@ -724,54 +724,66 @@ public class QtNative
	20
	21	public static boolean hasClipboardText()
	22	{
	23	- if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	24	- ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	25	- for (int i = 0; i < primaryClip.getItemCount(); ++i)
	26	- if (primaryClip.getItemAt(i).getText() != null)
	27	- return true;
	28	+ try {
	29	+ if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	30	+ ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	31	+ for (int i = 0; i < primaryClip.getItemCount(); ++i)
	32	+ if (primaryClip.getItemAt(i).getText() != null)
	33	+ return true;
	34	+ }
	35	+ } catch (Exception e) {
	36	+ Log.e(QtTAG, "Failed to get clipboard data", e);
	37	}
	38	return false;
	39	}
	40
	41	private static String getClipboardText()
	42	{
	43	- if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	44	- ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	45	- for (int i = 0; i < primaryClip.getItemCount(); ++i)
	46	- if (primaryClip.getItemAt(i).getText() != null)
	47	- return primaryClip.getItemAt(i).getText().toString();
	48	+ try {
	49	+ if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	50	+ ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	51	+ for (int i = 0; i < primaryClip.getItemCount(); ++i)
	52	+ if (primaryClip.getItemAt(i).getText() != null)
	53	+ return primaryClip.getItemAt(i).getText().toString();
	54	+ }
	55	+ } catch (Exception e) {
	56	+ Log.e(QtTAG, "Failed to get clipboard data", e);
	57	}
	58	return "";
	59	}
	60
	61	private static void updatePrimaryClip(ClipData clipData)
	62	{
	63	- if (m_usePrimaryClip) {
	64	- ClipData clip = m_clipboardManager.getPrimaryClip();
	65	- if (Build.VERSION.SDK_INT >= 26) {
	66	- if (m_addItemMethod == null) {
	67	- Class[] cArg = new Class[2];
	68	- cArg[0] = ContentResolver.class;
	69	- cArg[1] = ClipData.Item.class;
	70	+ try {
	71	+ if (m_usePrimaryClip) {
	72	+ ClipData clip = m_clipboardManager.getPrimaryClip();
	73	+ if (Build.VERSION.SDK_INT >= 26) {
	74	+ if (m_addItemMethod == null) {
	75	+ Class[] cArg = new Class[2];
	76	+ cArg[0] = ContentResolver.class;
	77	+ cArg[1] = ClipData.Item.class;
	78	+ try {
	79	+ m_addItemMethod = m_clipboardManager.getClass().getMethod("addItem", cArg);
	80	+ } catch (Exception e) {
	81	+ }
	82	+ }
	83	+ }
	84	+ if (m_addItemMethod != null) {
	85	try {
	86	- m_addItemMethod = m_clipboardManager.getClass().getMethod("addItem", cArg);
	87	+ m_addItemMethod.invoke(m_activity.getContentResolver(), clipData.getItemAt(0));
	88	} catch (Exception e) {
	89	+ e.printStackTrace();
	90	}
	91	+ } else {
	92	+ clip.addItem(clipData.getItemAt(0));
	93	}
	94	- }
	95	- if (m_addItemMethod != null) {
	96	- try {
	97	- m_addItemMethod.invoke(m_activity.getContentResolver(), clipData.getItemAt(0));
	98	- } catch (Exception e) {
	99	- e.printStackTrace();
	100	- }
	101	+ m_clipboardManager.setPrimaryClip(clip);
	102	} else {
	103	- clip.addItem(clipData.getItemAt(0));
	104	+ m_clipboardManager.setPrimaryClip(clipData);
	105	+ m_usePrimaryClip = true;
	106	}
	107	- m_clipboardManager.setPrimaryClip(clip);
	108	- } else {
	109	- m_clipboardManager.setPrimaryClip(clipData);
	110	- m_usePrimaryClip = true;
	111	+ } catch (Exception e) {
	112	+ Log.e(QtTAG, "Failed to set clipboard data", e);
	113	}
	114	}
	115
	116	@@ -785,22 +797,30 @@ public class QtNative
	117
	118	public static boolean hasClipboardHtml()
	119	{
	120	- if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	121	- ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	122	- for (int i = 0; i < primaryClip.getItemCount(); ++i)
	123	- if (primaryClip.getItemAt(i).getHtmlText() != null)
	124	- return true;
	125	+ try {
	126	+ if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	127	+ ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	128	+ for (int i = 0; i < primaryClip.getItemCount(); ++i)
	129	+ if (primaryClip.getItemAt(i).getHtmlText() != null)
	130	+ return true;
	131	+ }
	132	+ } catch (Exception e) {
	133	+ Log.e(QtTAG, "Failed to get clipboard data", e);
	134	}
	135	return false;
	136	}
	137
	138	private static String getClipboardHtml()
	139	{
	140	- if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	141	- ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	142	- for (int i = 0; i < primaryClip.getItemCount(); ++i)
	143	- if (primaryClip.getItemAt(i).getHtmlText() != null)
	144	- return primaryClip.getItemAt(i).getHtmlText().toString();
	145	+ try {
	146	+ if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	147	+ ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	148	+ for (int i = 0; i < primaryClip.getItemCount(); ++i)
	149	+ if (primaryClip.getItemAt(i).getHtmlText() != null)
	150	+ return primaryClip.getItemAt(i).getHtmlText().toString();
	151	+ }
	152	+ } catch (Exception e) {
	153	+ Log.e(QtTAG, "Failed to get clipboard data", e);
	154	}
	155	return "";
	156	}
	157	@@ -816,11 +836,15 @@ public class QtNative
	158
	159	public static boolean hasClipboardUri()
	160	{
	161	- if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	162	- ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	163	- for (int i = 0; i < primaryClip.getItemCount(); ++i)
	164	- if (primaryClip.getItemAt(i).getUri() != null)
	165	- return true;
	166	+ try {
	167	+ if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	168	+ ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	169	+ for (int i = 0; i < primaryClip.getItemCount(); ++i)
	170	+ if (primaryClip.getItemAt(i).getUri() != null)
	171	+ return true;
	172	+ }
	173	+ } catch (Exception e) {
	174	+ Log.e(QtTAG, "Failed to get clipboard data", e);
	175	}
	176	return false;
	177	}
	178	@@ -828,11 +852,15 @@ public class QtNative
	179	private static String[] getClipboardUris()
	180	{
	181	ArrayList<String> uris = new ArrayList<String>();
	182	- if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	183	- ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	184	- for (int i = 0; i < primaryClip.getItemCount(); ++i)
	185	- if (primaryClip.getItemAt(i).getUri() != null)
	186	- uris.add(primaryClip.getItemAt(i).getUri().toString());
	187	+ try {
	188	+ if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
	189	+ ClipData primaryClip = m_clipboardManager.getPrimaryClip();
	190	+ for (int i = 0; i < primaryClip.getItemCount(); ++i)
	191	+ if (primaryClip.getItemAt(i).getUri() != null)
	192	+ uris.add(primaryClip.getItemAt(i).getUri().toString());
	193	+ }
	194	+ } catch (Exception e) {
	195	+ Log.e(QtTAG, "Failed to get clipboard data", e);
	196	}
	197	String[] strings = new String[uris.size()];
	198	strings = uris.toArray(strings);
	199	--
	200	2.21.1 (Apple Git-122.3)
	201

+65

-0

libs/patches/qt-Pass-SDK-root-to-the-linker-as-isysroot-not-Wl-sysli.patch less more

	0	From 682242433d10462b58c53f473eec3f9c0574aee8 Mon Sep 17 00:00:00 2001
	1	From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <torarnv@gmail.com>
	2	Date: Fri, 27 Mar 2020 11:53:35 +0100
	3	Subject: Pass SDK root to the linker as -isysroot, not -Wl,-syslibroot
	4
	5	The former option to clang will result in more options to the linker,
	6	such as the newly introduced -platform_version, which writes the
	7	SDK version to the resulting binary. By using the syslibroot flag
	8	directly we were missing the platform version, and binaries were
	9	left without an SDK version set, resulting in failed validation
	10	of the binary. Going with the clang driver gives us the right
	11	behavior for free.
	12
	13	Fixes: QTBUG-83100
	14	Change-Id: I98bc9ba644dae4bcc7a6a88481556bae185ce5fa
	15	Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
	16	Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
	17	---
	18	configure \| 5 +----
	19	mkspecs/features/mac/default_post.prf \| 4 ++--
	20	2 files changed, 3 insertions(+), 6 deletions(-)
	21
	22	diff --git x/qtbase/configure y/qtbase/configure
	23	index ef7bad1bfc..f9407ef587 100755
	24	--- x/qtbase/configure
	25	+++ y/qtbase/configure
	26	@@ -271,12 +271,9 @@ macSDKify()
	27	val=$(echo $sdk_val $(echo $val \| cut -s -d ' ' -f 2-))
	28	echo "$var=$val"
	29	;;
	30	- QMAKE_CFLAGS=\|QMAKE_CXXFLAGS=)
	31	+ QMAKE_CFLAGS=\|QMAKE_CXXFLAGS=\|QMAKE_LFLAGS=*)
	32	echo "$line -isysroot $sysroot $version_min_flag"
	33	;;
	34	- QMAKE_LFLAGS=*)
	35	- echo "$line -Wl,-syslibroot,$sysroot $version_min_flag"
	36	- ;;
	37	*)
	38	echo "$line"
	39	;;
	40	diff --git x/qtbase/mkspecs/features/mac/default_post.prf y/qtbase/mkspecs/features/mac/default_post.prf
	41	index 26bd3e2e98..a2eaf447d2 100644
	42	--- x/qtbase/mkspecs/features/mac/default_post.prf
	43	+++ y/qtbase/mkspecs/features/mac/default_post.prf
	44	@@ -196,7 +196,7 @@ macx-xcode {
	45	-isysroot$$xcodeSDKInfo(Path, $$sdk)
	46	QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \
	47	-Xarch_$${arch} \
	48	- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk)
	49	+ -isysroot$$xcodeSDKInfo(Path, $$sdk)
	50
	51	QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch})
	52	QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch})
	53	@@ -217,7 +217,7 @@ macx-xcode {
	54	version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
	55	QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
	56	QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
	57	- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag
	58	+ QMAKE_LFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
	59	}
	60
	61	# Enable precompiled headers for multiple architectures
	62	--
	63	2.26.0
	64

+156

-0

libs/patches/qt-Port-python-check-to-configure-system.patch less more

	0	From 8beb047fdda99325cdecfbf15b6ce3f5b5ef5ffc Mon Sep 17 00:00:00 2001
	1	From: Kai Koehne <kai.koehne@qt.io>
	2	Date: Thu, 7 May 2020 10:35:35 +0200
	3	Subject: [PATCH] Port python check to configure system
	4
	5	Also check for py, python2, python3 executables.
	6
	7	Task-number: QTBUG-72926
	8	Fixes: QTBUG-84038
	9	Pick-to: 5.15
	10	Change-Id: I844db4dd630d9b3025eca529ee57565b600ebbac
	11	Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
	12	---
	13	qtdeclarative.pro \| 8 --------
	14	src/3rdparty/masm/masm.pri \| 4 ++--
	15	src/qml/configure.json \| 21 +++++++++++++++++++++
	16	src/qml/configure.pri \| 22 ++++++++++++++++++++++
	17	src/qml/qml.pro \| 6 +++++-
	18	5 files changed, 50 insertions(+), 11 deletions(-)
	19	create mode 100644 src/qml/configure.pri
	20
	21	diff --git x/qtdeclarative/qtdeclarative.pro y/qtdeclarative/qtdeclarative.pro
	22	index 5b94da9b69..e924331929 100644
	23	--- x/qtdeclarative/qtdeclarative.pro
	24	+++ y/qtdeclarative/qtdeclarative.pro
	25	@@ -1,10 +1,2 @@
	26	CONFIG += tests_need_tools examples_need_tools
	27	load(qt_parts)
	28	-
	29	-!python_available {
	30	- py_out = $$system('python -c "print(1)"')
	31	- !equals(py_out, 1): error("Building QtQml requires Python.")
	32	- tmp = python_available
	33	- CONFIG += $$tmp
	34	- cache(CONFIG, add, tmp)
	35	-}
	36	diff --git x/qtdeclarative/src/3rdparty/masm/masm.pri y/qtdeclarative/src/3rdparty/masm/masm.pri
	37	index 0e63ac2ce5..00b5aac9f8 100644
	38	--- x/qtdeclarative/src/3rdparty/masm/masm.pri
	39	+++ y/qtdeclarative/src/3rdparty/masm/masm.pri
	40	@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
	41	udis86.output = udis86_itab.h
	42	udis86.input = ITAB
	43	udis86.CONFIG += no_link
	44	- udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
	45	+ udis86.commands = $$QMAKE_PYTHON $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
	46	QMAKE_EXTRA_COMPILERS += udis86
	47
	48	udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
	49	@@ -113,7 +113,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
	50	retgen.script = $$PWD/yarr/create_regex_tables
	51	retgen.input = retgen.script
	52	retgen.CONFIG += no_link
	53	-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
	54	+retgen.commands = $$QMAKE_PYTHON $$retgen.script > ${QMAKE_FILE_OUT}
	55	QMAKE_EXTRA_COMPILERS += retgen
	56
	57	# Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
	58	diff --git x/qtdeclarative/src/qml/configure.json y/qtdeclarative/src/qml/configure.json
	59	index 17d1f800ac..3e773651b3 100644
	60	--- x/qtdeclarative/src/qml/configure.json
	61	+++ y/qtdeclarative/src/qml/configure.json
	62	@@ -23,6 +23,11 @@
	63	],
	64	"qmake": "CONFIG += c++11"
	65	}
	66	+ },
	67	+ "qml-python": {
	68	+ "label": "python",
	69	+ "type": "detectPython",
	70	+ "log": "location"
	71	}
	72	},
	73
	74	@@ -123,9 +128,25 @@
	75	"section": "QML",
	76	"condition": "features.thread",
	77	"output": [ "privateFeature" ]
	78	+ },
	79	+ "qml-python": {
	80	+ "label": "python",
	81	+ "condition": "tests.qml-python",
	82	+ "output": [
	83	+ "privateFeature",
	84	+ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.qml-python.location" }
	85	+ ]
	86	}
	87	},
	88
	89	+ "report": [
	90	+ {
	91	+ "type": "error",
	92	+ "condition": "!features.qml-python",
	93	+ "message": "Python is required to build QtQml."
	94	+ }
	95	+ ],
	96	+
	97	"summary": [
	98	{
	99	"section": "Qt QML",
	100	diff --git x/qtdeclarative/src/qml/configure.pri y/qtdeclarative/src/qml/configure.pri
	101	new file mode 100644
	102	index 0000000000..2ab5f9454d
	103	--- /dev/null
	104	+++ y/qtdeclarative/src/qml/configure.pri
	105	@@ -0,0 +1,22 @@
	106	+equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe
	107	+
	108	+defineTest(qtConfTest_detectPython) {
	109	+ PYTHON_NAMES = python$$EXE_SUFFIX python2$${EXE_SUFFIX} python3$${EXE_SUFFIX} py$${EXE_SUFFIX}
	110	+ for (name, PYTHON_NAMES) {
	111	+ python_path = $$qtConfFindInPath("$$name")
	112	+ !isEmpty(python_path): \
	113	+ break()
	114	+ }
	115	+ isEmpty(python_path) {
	116	+ qtLog("No $$PYTHON_NAMES are found in PATH. Giving up.")
	117	+ return(false)
	118	+ }
	119	+
	120	+ # Make tests.python.location available in configure.json.
	121	+ $${1}.location = $$shell_path($$python_path)
	122	+ export($${1}.location)
	123	+ $${1}.cache += location
	124	+ export($${1}.cache)
	125	+
	126	+ return(true)
	127	+}
	128	diff --git x/qtdeclarative/src/qml/qml.pro y/qtdeclarative/src/qml/qml.pro
	129	index d2170ac40b..390c9e5990 100644
	130	--- x/qtdeclarative/src/qml/qml.pro
	131	+++ y/qtdeclarative/src/qml/qml.pro
	132	@@ -7,6 +7,9 @@ qtConfig(qml-network): \
	133	TRACEPOINT_PROVIDER = $$PWD/qtqml.tracepoints
	134	CONFIG += qt_tracepoints
	135
	136	+!qtConfig(qml-python): \
	137	+ error(Python is required to build QtQml.)
	138	+
	139	DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
	140
	141	msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x66000000
	142	@@ -81,8 +84,9 @@ qtConfig(qml-animation) {
	143	}
	144	include(types/types.pri)
	145	include(../3rdparty/masm/masm-defs.pri)
	146	-include(../3rdparty/masm/masm.pri)
	147
	148	MODULE_PLUGIN_TYPES = \
	149	qmltooling
	150	load(qt_module)
	151	+
	152	+include(../3rdparty/masm/masm.pri)
	153	--
	154	2.26.2
	155

+1

-1

resources/CMakeLists.txt less more

11	11
12	12	SET(QRC_FILES "ausweisapp.qrc")
13	13
14		IF(IOS OR ANDROID OR ${CMAKE_BUILD_TYPE} STREQUAL "DEBUG")
	14	IF(IOS OR ANDROID OR CMAKE_BUILD_TYPE STREQUAL "DEBUG")
15	15	LIST(APPEND QRC_FILES "ausweisapp_mobile.qrc")
16	16	ENDIF()
17	17

+0

-1

resources/asan_blacklist less more

1	1	# LSAN_OPTIONS=suppressions=/home/dev/AusweisApp2.src/resources/asan_blacklist ./AusweisApp2
2	2
3	3	leak:g_malloc*
4		leak:CRYPTO_malloc
5	4	leak:libxcb*
6	5	leak:QQuick*
7	6	leak:QKde*

+1

-0

resources/ausweisapp_desktop.qrc less more

13	13	<file>images/html_message_section.jpg</file>
14	14	<file>images/search_icon.svg</file>
15	15	<file>images/search_cancel.svg</file>
	16	<file>images/macos/appIcon.svg</file>
16	17	<file>images/desktop/bell.svg</file>
17	18	<file>images/desktop/id_card.png</file>
18	19	<file>images/desktop/pin_letter_pinpuk_different_page.svg</file>

+2

-0

resources/ausweisapp_mobile.qrc less more

12	12	<file>images/android/navigation/bewerten.svg</file>
13	13	<file>images/android/navigation/tutorial.svg</file>
14	14	<file>images/android/search_icon.svg</file>
	15	<file>images/android/stay_primary_landscape-24px.svg</file>
	16	<file>images/android/stay_primary_portrait-24px.svg</file>
15	17	<file>images/iOS/search_icon.svg</file>
16	18	<file>images/iOS/search_cancel.svg</file>
17	19	<file>images/iOS/more/icon_mehr_settings.svg</file>

+2

-1

resources/config.json.in less more

41	41	"_comment_5": "array of certificates for checking the authenticity of updates; DER format, hex encoded",
42	42	"updateCertificates": [
43	43	"3082083a30820722a003020102020900d5b6a4dc1fd8854a300d06092a864886f70d01010b05003081df310b300906035504061302444531253023060355040a0c1c542d53797374656d7320496e7465726e6174696f6e616c20476d6248311f301d060355040b0c16542d53797374656d732054727573742043656e746572311c301a06035504080c134e6f7264726865696e205765737466616c656e310e300c06035504110c0535373235303110300e06035504070c074e65747068656e3120301e06035504090c17556e7465726520496e647573747269657374722e2032303126302406035504030c1d54656c65536563205365727665725061737320436c6173732032204341301e170d3137313230313130343733325a170d3230313230363233353935395a308180310b30090603550406130244453121301f060355040a0c18476f7665726e696b757320476d6248202620436f2e204b47310b3009060355040b13025345310f300d060355040813064272656d656e310f300d060355040713064272656d656e311f301d060355040313166170706c2e676f7665726e696b75732d6173702e646530820222300d06092a864886f70d01010105000382020f003082020a0282020100c1d969514392105ce65b089b7357f75356f076b21168233d1eb57ae81f826c74258ec4814c48a3e99633fcac1fb444412cba421c1569d21b6317b6614b096203ab5b605128671764d30186dec09716d2173bfab911a9ad3d2d0b850ff2595dd9c72113bd64879c39c39b3debbfdd7f8d68e8d1bdaf2cca0508583bd59b965ec5f4950e4fbbe48b7be351237d478253bc34ac5aed9448f5ae31878067bdad75179cb776ef19f8e49e62b830de8279142233030189c20008345553847b7edc6471bf7c15c98b087159b44faa5a35fe16adc285e4d8266fab49b7b4e7fbcbd91767e05dbb45a5564cb11abcbeb0ff66869ca72dd7919eae796340fb5b26fb8ecc65b8380d3eb30e46150725e2156ad156773a79b482133b846b247868a6d3fcc18f96cfc6044fb7678fd79c04fb580b7bfb86e3252554b9a97dfd6fb9ae0e0d8d663a56b471d37752fc88a172151494553d78a39ade4669076e5ddfa13fd684b7eb800efedf9af8f90d4bab6d80378b950d43ef6de6f9ca5dccb81ecbbf820126d90923c5b87462af2acf0fc460599b2d7022e488f20069e2b3e80e057ebbd1454891929c2e0252688a1c0e801eb8bec795251087a755a6edcd22759a5c1869550d63b0596cb5ac20a7e5cb11f5412598990092cbe058b4ec67b98dd9ed2b2a5f8b7994e92b89a1ef51517beb2e2594cb8007d514f988968c52246a18945fba0adf0203010001a382035430820350301f0603551d2304183016801494c87446f53ab4464826f82bca341e5626041200300e0603551d0f0101ff0404030205a0301d0603551d250416301406082b0601050507030206082b06010505070301301d0603551d0e041604148c76a1377b9cad8059a5d4126a53bc633671ca1c305a0603551d20045330513045060a2b06010401bd470d17013037303506082b060105050702011629687474703a2f2f7777772e74656c657365632e64652f736572766572706173732f6370732e68746d6c3008060667810c010202308201030603551d1f0481fb3081f83040a03ea03c863a687474703a2f2f63726c2e736572766572706173732e74656c657365632e64652f726c2f536572766572506173735f436c6173735f322e63726c3081b3a081b0a081ad8681aa6c6461703a2f2f6c6461702e736572766572706173732e74656c657365632e64652f434e3d54656c6553656325323053657276657250617373253230436c6173732532303225323043412c4f553d542d53797374656d73253230547275737425323043656e7465722c4f3d542d53797374656d73253230496e7465726e6174696f6e616c253230476d62482c433d44453f43657274696669636174655265766f636174696f6e4c6973743082014906082b060105050701010482013b30820137303306082b060105050730018627687474703a2f2f6f6373702e736572766572706173732e74656c657365632e64652f6f63737072305206082b060105050730028646687474703a2f2f63726c2e736572766572706173732e74656c657365632e64652f6372742f54656c655365635f536572766572506173735f436c6173735f325f43412e6365723081ab06082b0601050507300286819e6c6461703a2f2f6c6461702e736572766572706173732e74656c657365632e64652f434e3d54656c6553656325323053657276657250617373253230436c6173732532303225323043412c4f553d542d53797374656d73253230547275737425323043656e7465722c4f3d542d53797374656d73253230496e7465726e6174696f6e616c253230476d62482c433d44453f63414365727469666963617465300c0603551d130101ff0402300030210603551d11041a301882166170706c2e676f7665726e696b75732d6173702e6465300d06092a864886f70d01010b050003820101006376f829a32345d2d590176bf2294d9ab6fe44e6c7db3b467bd597eebda4121d6e8795ec33de253ff9f271857c4a1ddf4b80b080464a51741a53de5137be13fc482e41b3649afbb571bfec2a894022d933ca60c691a99f31fe40209e7ca2e7fcd15d33baf8c1d20e107750cbd8628bc883af062a622f29c36574decaf97ef00471bbbe81380042ab82e46788491e4f77e58168f154d5210748263bfb8b2c3c82937436f758e1b2360c22458803a304eb90a4617bdcaa591176f4002e63dce3c9a3c7dcec83472dec70346544105118227fce63bae6a6686950846f65f30de621c1e5d6b7b20f3ce7d8ebbd95667c89123adb9efcbdd5ea1ba6e71b152bea43d3",
	44	"308209bd308208a5a003020102021038c4a7f3fe70d99c56f0df1ebef6a97d300d06092a864886f70d01010b05003081df310b300906035504061302444531253023060355040a0c1c542d53797374656d7320496e7465726e6174696f6e616c20476d6248311f301d060355040b0c16542d53797374656d732054727573742043656e746572311c301a06035504080c134e6f7264726865696e205765737466616c656e310e300c06035504110c0535373235303110300e06035504070c074e65747068656e3120301e06035504090c17556e7465726520496e647573747269657374722e2032303126302406035504030c1d54656c65536563205365727665725061737320436c6173732032204341301e170d3230303631373038303034345a170d3232303632323233353935395a308180310b30090603550406130244453121301f060355040a0c18476f7665726e696b757320476d6248202620436f2e204b47310b3009060355040b13025345310f300d060355040813064272656d656e310f300d060355040713064272656d656e311f301d060355040313166170706c2e676f7665726e696b75732d6173702e646530820222300d06092a864886f70d01010105000382020f003082020a0282020100c1d969514392105ce65b089b7357f75356f076b21168233d1eb57ae81f826c74258ec4814c48a3e99633fcac1fb444412cba421c1569d21b6317b6614b096203ab5b605128671764d30186dec09716d2173bfab911a9ad3d2d0b850ff2595dd9c72113bd64879c39c39b3debbfdd7f8d68e8d1bdaf2cca0508583bd59b965ec5f4950e4fbbe48b7be351237d478253bc34ac5aed9448f5ae31878067bdad75179cb776ef19f8e49e62b830de8279142233030189c20008345553847b7edc6471bf7c15c98b087159b44faa5a35fe16adc285e4d8266fab49b7b4e7fbcbd91767e05dbb45a5564cb11abcbeb0ff66869ca72dd7919eae796340fb5b26fb8ecc65b8380d3eb30e46150725e2156ad156773a79b482133b846b247868a6d3fcc18f96cfc6044fb7678fd79c04fb580b7bfb86e3252554b9a97dfd6fb9ae0e0d8d663a56b471d37752fc88a172151494553d78a39ade4669076e5ddfa13fd684b7eb800efedf9af8f90d4bab6d80378b950d43ef6de6f9ca5dccb81ecbbf820126d90923c5b87462af2acf0fc460599b2d7022e488f20069e2b3e80e057ebbd1454891929c2e0252688a1c0e801eb8bec795251087a755a6edcd22759a5c1869550d63b0596cb5ac20a7e5cb11f5412598990092cbe058b4ec67b98dd9ed2b2a5f8b7994e92b89a1ef51517beb2e2594cb8007d514f988968c52246a18945fba0adf0203010001a38204d0308204cc301f0603551d2304183016801494c87446f53ab4464826f82bca341e5626041200300e0603551d0f0101ff0404030205a0301d0603551d250416301406082b0601050507030206082b06010505070301301d0603551d0e041604148c76a1377b9cad8059a5d4126a53bc633671ca1c305a0603551d20045330513045060a2b06010401bd470d17013037303506082b060105050702011629687474703a2f2f7777772e74656c657365632e64652f736572766572706173732f6370732e68746d6c3008060667810c010202304b0603551d1f044430423040a03ea03c863a687474703a2f2f63726c2e736572766572706173732e74656c657365632e64652f726c2f536572766572506173735f436c6173735f322e63726c30819906082b0601050507010104818c308189303306082b060105050730018627687474703a2f2f6f6373702e736572766572706173732e74656c657365632e64652f6f63737072305206082b060105050730028646687474703a2f2f63726c2e736572766572706173732e74656c657365632e64652f6372742f54656c655365635f536572766572506173735f436c6173735f325f43412e636572300c0603551d130101ff0402300030210603551d11041a301882166170706c2e676f7665726e696b75732d6173702e6465308202e3060a2b06010401d679020402048202d3048202cf02cd0075006f5376ac31f03119d89900a45115ff77151c11d902c10029068db2089a37d91300000172c14b6a75000004030046304402202a43e32288685dcf68d5aeb92d57b872add7cc72996c76a5ad6239f079f74ec302200ec88ef96b0d9ca431ecefa02bc0e0df93da47e65a74464db22587fcdaec93b900760046a555eb75fa912030b5a28969f4f37d112c4174befd49b885abf2fc70fe6d4700000172c14b6a370000040300473045022100ed6c7e61ef499e52db80e98952929af88a2caf8ea145ef0be18e6a4f03b6055d022034b2ed865610ba163b2271511e0d06b0a4e1d93719b2179be250d68b7ebb2f680075002979bef09e393921f056739f63a577e5be577d9c600af8f94d5d265c255dc78400000172c14b6a6b00000403004630440220474c62e50c058e3145b7a0f07c3b7487f84e71f5c4eadc0f818c169f73c786c1022028d88d20e6752bd3115228b8f60c9a1d2827cc7a3bd9efbc99b141dbeb9e71e600770041c8cab1df22464a10c6a13a0942875e4e318b1b03ebeb4bc768f090629606f600000172c14b6b2e0000040300483046022100b41d0dc708e20b24b410e49182ddcd2d61f9fb57fbccf9db4869389697ba596c022100e643f804f2405057e18fe387bcedef3e55e4cd4afa97a78da8e4fdfcf62b5d3b0075005581d4c2169036014aea0b9b573c53f0c0e43878702508172fa3aa1d0713d30c00000172c14b6b7e000004030046304402207056254b251f9e726b7dbe5e9e747abd4a19a54a1dffb1923d0b77e97a1bd70702204cbd7a226661bf21f2544f65f4a8b8d5703771f6c65c5c7468f3370e216e08c80075002245450759552456963fa12ff1f76d86e0232663adc04b7f5dc6835c6ee20f0200000172c14b6c7200000403004630440220117f1c9168138721382af8f67d14b431c9cd4d42d4dedf78dcd5cf4c0e202a1f022027a1647c220aaba18dc27e7e3d8a95af349ab677061c41ce727d187290881a4d300d06092a864886f70d01010b05000382010100c71fe410a8bb145abc060c364bd8585d29cc1c3f594781a99e713d72b997f08a84679246b239ce499d920fc8cb18469e79b00511754a9c27193776fe790ec36a3489cb3f1f4f1389fd04cb69709c81e00ba2b207fae4158ddab46eed546ecb5a8881fc4f189ba9ec4eece3d342a57e6e98636faf96bf71681aba0da23239c005475d2aabdb07ff5a8539bb357fd9493a3b4c8decf73804c66347d0d85600abfacdee45c3cf818ada8aaed31a4653ddb8fa1361f82babde55f461ce8faadd97e6d30f8c5c459bd0531b87ed6ad2d580f65733664fa0345b138f45207fcd32270cf8be035ce5078b438d0b47d17e9f3424a40b3f627d7b77dc9e1af1725f151ffd",
44	45	"3082093a30820822a0030201020210042e5dd11e0c69cdec3882747019081c300d06092a864886f70d01010b05003081df310b300906035504061302444531253023060355040a0c1c542d53797374656d7320496e7465726e6174696f6e616c20476d6248311f301d060355040b0c16542d53797374656d732054727573742043656e746572311c301a06035504080c134e6f7264726865696e205765737466616c656e310e300c06035504110c0535373235303110300e06035504070c074e65747068656e3120301e06035504090c17556e7465726520496e647573747269657374722e2032303126302406035504030c1d54656c65536563205365727665725061737320436c6173732032204341301e170d3139303330373131343530325a170d3231303331323233353935395a3074310b30090603550406130244453121301f060355040a0c18476f7665726e696b757320476d6248202620436f2e204b47310b3009060355040b13025345310f300d060355040813064272656d656e310f300d060355040713064272656d656e3113301106035504030c0a2a2e676f766b672e646530820222300d06092a864886f70d01010105000382020f003082020a0282020100b03a180c094b52a862ef5fce194147f705d3340d79282a103a14d14fabe3d849a62df93b5f09eed3ad60e6ae5570a3823370aeeb888df9e0fc9a513be26308d783cc7cefd4ef43337e2c854b03ef399c647a19d31c39fe2b1d08c9cc27462ba5e43bc97e494ac62059496579967fa3fe8b1111e016d6dd37eda00e5617bb571cbb042e6750d17dd3acf1055b8dd6a1130214992a673bfc671e2586355378dfbb14a2910d37faa221178cb2dba0e87544ed6acbb2344ac439dbd16c05e1c0f76fa757305c0c38f3ccab420fd49603717986c8d748ce4ea2863260da6a832df53bb6247ada2431239b0a9815b89d6bb0f58a4da508695637c0b10368260cbf7dd8d469fb81d21b560a25125e9cfc8ae09a8b9e7a1cc688a8e49c045f1dc397a7c28e637b11c5205d8375ccfb627b071a813665de2fe172de97671dfecce44d9545a6f083cff4c7e2df4780b9073b19ca93b97561ca0c9bc5687ec0a1de993b199eca2576e820f26ce043fbab092f6e0bbc510b14d4b2489733e28cd38f40928cce16f4f3b6bba6277cff19312ad5771507ae729b6c083924c53d1c1fc33e370af1a0060307b3ef83880886334133c2e645bbf7f14a26acbce1609daceac1ed8d5d2bff8d8ed095a7af79f608134256f1e4a34650225595dd9fa5746448417d7a2f8f0c5ef001b5e4780e6d8caf818b314fb708447f70f3844d39a7ff437ebbf6a70203010001a382045a30820456301f0603551d2304183016801494c87446f53ab4464826f82bca341e5626041200300e0603551d0f0101ff0404030205a0301d0603551d250416301406082b0601050507030206082b06010505070301301d0603551d0e04160414db05538bd26c0bea1bcb5cde439b81e6ab8aa40b305a0603551d20045330513045060a2b06010401bd470d17013037303506082b060105050702011629687474703a2f2f7777772e74656c657365632e64652f736572766572706173732f6370732e68746d6c3008060667810c010202304b0603551d1f044430423040a03ea03c863a687474703a2f2f63726c2e736572766572706173732e74656c657365632e64652f726c2f536572766572506173735f436c6173735f322e63726c30819906082b0601050507010104818c308189303306082b060105050730018627687474703a2f2f6f6373702e736572766572706173732e74656c657365632e64652f6f63737072305206082b060105050730028646687474703a2f2f63726c2e736572766572706173732e74656c657365632e64652f6372742f54656c655365635f536572766572506173735f436c6173735f325f43412e636572300c0603551d130101ff04023000301f0603551d1104183016820a2a2e676f766b672e64658208676f766b672e64653082026f060a2b06010401d6790204020482025f0482025b02590076006f5376ac31f03119d89900a45115ff77151c11d902c10029068db2089a37d9130000016957f896900000040300473045022046b42ef57f79c932690c6558eb52f354b8e4f5c49c7dc50616a351dbbe823785022100957c17a3f70a7ee20a920a29bb123e186b425a4c0c4dbd5372ab5163abe88284007600ee4bbdb775ce60bae142691fabe19e66a30f7e5fb072d88300c47b897aa8fdcb0000016957f89686000004030047304502210085921f55932ee2b42b7b6cd1b9627f9d376485024210f8f4358d60ebc25b6d6d022069f72703fc8d7added3f8cc041aee457d011e22425ecdfbebcfd1b312c0ad6220077005581d4c2169036014aea0b9b573c53f0c0e43878702508172fa3aa1d0713d30c0000016957f897e400000403004830460221009c4b1fdcfde4bacba79665a77da038ab42399578dbc80c9ce21ab5054217edf2022100d23970d124e0f1ee384f6cc2e53d76df6069190dc91b9be5be24219898081ad9007600a4b90990b418581487bb13a2cc67700a3c359804f91bdfb8e377cd0ec80ddc100000016957f8968c000004030047304502210099ca67064864c67ab92b4f13c11fd8be58453585f80e4e3d9a1d18a191aba1670220603bc43ad9700dd891e1bb135b2cd0fad041a6f63bed0d9c778a3e96d6082f33007600bbd9dfbc1f8a71b593942397aa927b473857950aab52e81a909664368e1ed1850000016957f896870000040300473045022100e6810cf7ec2ee244d5ae516246973f46c7710bf075c923b21451abc6622b9dee02202ccd410f907ba8176bcb12198f1b0821cf95a550e2486a0292cadca7a670dac2300d06092a864886f70d01010b05000382010100103ab77dff430d59dcd9d5c94b9c2ea44d829d0a70777c42a137ea627eca87881ce9131f00ea7282f7fe7cd7ac8f154f84622023183aac3f02ce4a5925cfb771961e114b78cec3950c0a4aa7726c01ba69c60cf3a4c68ea63e92f8dd0bf2f1e033bb91c536df9945ba281abae1bde75f920f94df2fa2c2ff708a57291114889e374eb9c8f7da0bb8a0d19bda964b3ac32e174cbb9d956c9693f0a6326a80d7019cbc8e54949981d5bf231f85c6ff5be5bc0fcaeb637bf84a8be424ebe2cefdef4c89d2a4682efda5c8010e432977d26e6f30e7e9ed13f612fea99dbd9799e6460ca780a109ff3dc7a86887479832baac8589aebeadf50759077aadfd2d467d06"
45	46	],
46	47

171	172	},
172	173
173	174	"updateServer": {
174		"baseUrl": "@REMOTE_CONFIG_URL@/updatable-files"
	175	"baseUrl": "@REMOTE_CONFIG_URL_PROD@/updatable-files"
175	176	},
176	177
177	178	"whitelistServer": {

+5

-0

resources/images/android/stay_primary_landscape-24px.svg less more

	0	<?xml version="1.0" encoding="UTF-8" ?>
	1	<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
	2	<path d="M0 0h24v24H0z" fill="none" />
	3	<path d="M1.01 7L1 17c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2H3c-1.1 0-1.99.9-1.99 2zM19 7v10H5V7h14z" />
	4	</svg>

+5

-0

resources/images/android/stay_primary_portrait-24px.svg less more

	0	<?xml version="1.0" encoding="UTF-8" ?>
	1	<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
	2	<path d="M0 0h24v24H0z" fill="none" />
	3	<path d="M17 1.01L7 1c-1.1 0-1.99.9-1.99 2v18c0 1.1.89 2 1.99 2h10c1.1 0 2-.9 2-2V3c0-1.1-.9-1.99-2-1.99zM17 19H7V5h10v14z" />
	4	</svg>

~~resources/images/bundle_icons.icns~~ less more

Binary diff not shown

~~resources/images/dmg_background.png~~ less more

Binary diff not shown

~~resources/images/dmg_icons.icns~~ less more

Binary diff not shown

+18

-0

resources/images/macos/appIcon.svg less more

	0	<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
	1	<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" viewBox="-4 -4 45 45">
	2	<defs>
	3	<linearGradient x1="0" y1="0" x2="1" y2="0" id="greenGradient1">
	4	<stop style="stop-color:#58ab27;stop-opacity:1" offset="0" />
	5	<stop style="stop-color:#93c36c;stop-opacity:1" offset="0.78019702" />
	6	</linearGradient>
	7	<linearGradient x1="0" y1="0" x2="1" y2="0" id="greenGradient2" xlink:href="#greenGradient1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,-26.61169,26.61169,0,5.06287,31.67544)" spreadMethod="pad" />
	8	<linearGradient x1="0" y1="0" x2="1" y2="0" id="blueGradient1">
	9	<stop style="stop-color:#88bce2;stop-opacity:1" offset="0" />
	10	<stop style="stop-color:#5489c2;stop-opacity:1" offset="1" />
	11	</linearGradient>
	12	<linearGradient x1="0" y1="0" x2="1" y2="0" id="blueGradient2" xlink:href="#blueGradient1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,26.61169,26.61169,0,19.60739,5.06376)" spreadMethod="pad" />
	13	</defs>
	14	<rect x="0.55" y="0.55" width="35.9" height="35.9" rx="4.45" ry="4.45" style="fill:#FFFFFF; stroke-width:1.1; stroke:#5489c2;" />
	15	<path d="M 17.25 5.058 v 4.832 a 8.7 8.7 0 0 0 0 17.22 v 4.832 a 13.5 13.5 0 0 1 0 -26.884 z" style="fill:url(#greenGradient2);" />
	16	<path d="M 19.75 5.058 v 4.832 a 8.7 8.7 0 0 1 0 17.22 v 4.832 a 13.5 13.5 0 0 0 0 -26.884 z" style="fill:url(#blueGradient2);" />
	17	</svg>

resources/images/macos/bundle_icons.icns less more

Binary diff not shown

resources/images/macos/dmg_background.png less more

Binary diff not shown

resources/images/macos/dmg_icons.icns less more

Binary diff not shown

resources/images/npa.png less more

Binary diff not shown

+14

-16

resources/images/npa.svg less more

0		<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1		<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="768" height="768" viewBox="0 0 37 37" id="svg2696">
2		<defs id="defs2698">
3		<linearGradient x1="0" y1="0" x2="1" y2="0" id="linearGradient2559">
4		<stop style="stop-color:#58ab27;stop-opacity:1" offset="0"/>
5		<stop style="stop-color:#93c36c;stop-opacity:1" offset="0.78019702"/>
	0	<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
	1	<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="768" height="768" viewBox="0 0 37 37">
	2	<defs>
	3	<linearGradient x1="0" y1="0" x2="1" y2="0" id="greenGradient1">
	4	<stop style="stop-color:#58ab27;stop-opacity:1" offset="0" />
	5	<stop style="stop-color:#93c36c;stop-opacity:1" offset="0.78019702" />
6	6	</linearGradient>
7		<linearGradient x1="0" y1="0" x2="1" y2="0" id="linearGradient2688" xlink:href="#linearGradient2559" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,-26.61169,26.61169,0,5.06287,31.67544)" spreadMethod="pad"/>
8		<linearGradient x1="0" y1="0" x2="1" y2="0" id="linearGradient2583">
9		<stop style="stop-color:#88bce2;stop-opacity:1" offset="0"/>
10		<stop style="stop-color:#5489c2;stop-opacity:1" offset="1"/>
	7	<linearGradient x1="0" y1="0" x2="1" y2="0" id="greenGradient2" xlink:href="#greenGradient1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,-26.61169,26.61169,0,5.06287,31.67544)" spreadMethod="pad" />
	8	<linearGradient x1="0" y1="0" x2="1" y2="0" id="blueGradient1">
	9	<stop style="stop-color:#88bce2;stop-opacity:1" offset="0" />
	10	<stop style="stop-color:#5489c2;stop-opacity:1" offset="1" />
11	11	</linearGradient>
12		<linearGradient x1="0" y1="0" x2="1" y2="0" id="linearGradient2683" xlink:href="#linearGradient2583" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,26.61169,26.61169,0,19.60739,5.06376)" spreadMethod="pad"/>
	12	<linearGradient x1="0" y1="0" x2="1" y2="0" id="blueGradient2" xlink:href="#blueGradient1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,26.61169,26.61169,0,19.60739,5.06376)" spreadMethod="pad" />
13	13	</defs>
14		<rect x="0" y="0" width="37" height="37" rx="5" ry="5" style="fill:#5489c2" />
15		<rect x="1.1" y="1.1" width="34.8" height="34.8" rx="3.9" ry="3.9" style="fill:#ffffff" />
16		<path d="M 18.5 5 L 18.5 9.8 A 8.7 8.7 0 0 0 18.5 27.2 L 18.5 32 A 13.5 13.5 0 0 1 18.5 5" style="fill:url(#linearGradient2688);stroke:none"/>
17		<path d="M 18.5 5 L 18.5 9.8 A 8.7 8.7 0 0 1 18.5 27.2 L 18.5 32 A 13.5 13.5 0 0 0 18.5 5" style="fill:url(#linearGradient2683);stroke:none"/>
18		<rect x="17.25" y="4" width="2.5" height="30" style="fill:#ffffff" />
	14	<rect x="0.55" y="0.55" width="35.9" height="35.9" rx="4.45" ry="4.45" style="fill:#FFFFFF; stroke-width:1.1; stroke:#5489c2;" />
	15	<path d="M 17.25 5.058 v 4.832 a 8.7 8.7 0 0 0 0 17.22 v 4.832 a 13.5 13.5 0 0 1 0 -26.884 z" style="fill:url(#greenGradient2);" />
	16	<path d="M 19.75 5.058 v 4.832 a 8.7 8.7 0 0 1 0 17.22 v 4.832 a 13.5 13.5 0 0 0 0 -26.884 z" style="fill:url(#blueGradient2);" />
19	17	</svg>

~~resources/images/npa_docs.png~~ less more

Binary diff not shown

+8

-3

resources/jenkins/docker/android/Dockerfile less more

1	1	MAINTAINER Governikus KG <ausweisapp2@governikus.com>
2	2
3	3	ARG ANDROID_SDK_TOOLS=4333796
4		ARG ANDROID_NDK_VERSION=r18b
	4	ARG ANDROID_NDK_VERSION=r21d
	5	ARG CMAKE=3.17.3
5	6	ENV NAME=Android LABELS="Android" PACKAGES_DIR=/home/governikus/packages
6	7
7	8	RUN apt-get update && \
8		apt-get -y install g++ cmake make ccache ninja-build perl unzip gradle maven patch openjdk-8-jdk-headless && \
	9	apt-get -y install g++ make ccache ninja-build perl unzip gradle maven patch openjdk-8-jdk-headless && \
9	10	ln -s /usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/java-8-openjdk && \
10	11	rm -rf /var/lib/apt/lists/*
	12
	13	# CMake 3.16 is required for NDK r19+
	14	RUN wget https://github.com/Kitware/CMake/releases/download/v$CMAKE/cmake-$CMAKE-Linux-x86_64.sh -O /tmp/cmake.sh && \
	15	sh /tmp/cmake.sh --prefix=/usr --skip-license --exclude-subdir && rm /tmp/cmake.sh
11	16
12	17	ENV ANDROID_HOME /opt/android-sdk
13	18	RUN mkdir -p /tmp/dl/sdk && cd /tmp/dl/sdk && wget -O sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-$ANDROID_SDK_TOOLS.zip && \
14	19	unzip sdk.zip && mkdir -p $ANDROID_HOME && mv tools/ $ANDROID_HOME
15		RUN yes \| $ANDROID_HOME/tools/bin/sdkmanager "build-tools;29.0.2" "platform-tools" "platforms;android-29"
	20	RUN yes \| $ANDROID_HOME/tools/bin/sdkmanager "build-tools;29.0.3" "platform-tools" "platforms;android-29"
16	21
17	22	ENV ANDROID_NDK_HOME /opt/android-ndk
18	23	ENV ANDROID_NDK=${ANDROID_NDK_HOME}

+2

-2

resources/jenkins/docker/docs/Dockerfile less more

2	2
3	3	ENV NAME=Docs LABELS=Docs
4	4
5		RUN apk --no-cache add cmake make py3-sphinx py3-setuptools icu-libs poppler zziplib texlive-full && \
6		pip3 install doc8 cloud_sptheme
	5	RUN apk --no-cache add cmake make py3-pip py3-sphinx py3-setuptools icu poppler zziplib enscript ghostscript texlive-full && \
	6	pip3 install doc8 cloud_sptheme sphinx_rtd_theme
7	7
8	8	USER governikus
9	9

+2

-2

resources/jenkins/docker/linux/Dockerfile less more

2	2
3	3	ENV NAME=Linux LABELS="Linux g++ clang++" PACKAGES_DIR=/home/governikus/packages
4	4
5		RUN apk --no-cache add cmake make g++ clang clang-analyzer ccache gcovr cloc cppcheck pkgconf ninja pcsc-lite-dev binutils-gold lld \
6		py3-setuptools mesa-dev libx11-dev libxkbcommon-dev xcb-util-wm-dev xcb-util-image-dev xcb-util-keysyms-dev && \
	5	RUN apk --no-cache add cmake make g++ clang clang-analyzer ccache gcovr cloc clazy cppcheck pkgconf ninja pcsc-lite-dev binutils-gold lld \
	6	py3-setuptools py3-jsonschema mesa-dev libx11-dev libxkbcommon-dev xcb-util-wm-dev xcb-util-image-dev xcb-util-keysyms-dev && \
7	7	ln -s /usr/libexec/c++-analyzer /usr/local/bin && ln -s /usr/libexec/ccc-analyzer /usr/local/bin
8	8
9	9	USER governikus

+3

-4

resources/jenkins/docker/swarm/Dockerfile less more

0		FROM alpine:3.11
	0	FROM alpine:3.12
1	1	MAINTAINER Governikus KG <ausweisapp2@governikus.com>
2	2
3		ARG JENKINS_SWARM_VERSION=3.17
	3	ARG JENKINS_SWARM_VERSION=3.21
4	4	ENV EXECUTOR=3 LABELS= NAME= PASSWORD=
5	5
6	6	RUN adduser governikus -s /bin/sh -D
7		RUN apk --no-cache add openjdk8-jre tini mercurial py3-hglib wget && \
8		ln -s /usr/bin/python3 /usr/bin/python
	7	RUN apk --no-cache add openjdk8-jre tini mercurial py3-hglib wget
9	8	RUN wget -O /swarm-client.jar https://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/swarm-client/$JENKINS_SWARM_VERSION/swarm-client-$JENKINS_SWARM_VERSION.jar
10	9
11	10	ADD swarm.sh /

+4

-3

resources/jenkins/docker/swarm-ubuntu/Dockerfile less more

0		FROM ubuntu:19.04
	0	FROM ubuntu:20.04
1	1	MAINTAINER Governikus KG <ausweisapp2@governikus.com>
2	2
3		ARG JENKINS_SWARM_VERSION=3.17
	3	ARG JENKINS_SWARM_VERSION=3.21
4	4	ENV EXECUTOR=3 LABELS= NAME= PASSWORD=
5	5
6	6	RUN useradd -m governikus
7	7	RUN apt-get update && \
8		apt-get -y install openjdk-8-jre-headless tini mercurial python-hglib wget && \
	8	apt-get -y install openjdk-8-jre-headless tini python3-pip wget && \
	9	pip3 install rbtools mercurial python-hglib && \
9	10	rm -rf /var/lib/apt/lists/*
10	11	RUN wget -O /swarm-client.jar https://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/swarm-client/$JENKINS_SWARM_VERSION/swarm-client-$JENKINS_SWARM_VERSION.jar
11	12

+20

-0

resources/jenkins/docker/vanilla/Dockerfile less more

	0	FROM ubuntu:swarm
	1	MAINTAINER Governikus KG <ausweisapp2@governikus.com>
	2
	3	ENV NAME=Vanilla LABELS="Vanilla"
	4	ENV DEBIAN_FRONTEND noninteractive
	5
	6	RUN apt-get update && \
	7	apt-get -y install cmake make g++ clazy clang clang-tidy ccache gcovr cloc pkg-config ninja-build binutils-gold lld \
	8	tree libpcsclite-dev libhttp-parser-dev libssl-dev libudev-dev \
	9	qml-module-qt-labs-platform qml-module-qtquick-controls2 qml-module-qtquick-controls2 qml-module-qttest \
	10	qml-module-qtgraphicaleffects qml-module-qtquick-layouts qml-module-qtqml-models2 \
	11	qtdeclarative5-dev qtquickcontrols2-5-dev qttools5-dev libqt5svg5-dev \
	12	libqt5websockets5-dev qtconnectivity5-dev && \
	13	rm -rf /var/lib/apt/lists/*
	14
	15	USER governikus
	16	RUN mkdir -p /home/governikus/.ccache && mkdir -p /home/governikus/workspace
	17
	18	ENTRYPOINT ["/usr/bin/tini", "--"]
	19	CMD /swarm.sh

+2

-2

resources/jenkins/dsl/Builds/Build_Android.groovy less more

11	11	name: 'Android_APK_' + ARCH,
12	12	libraries: ['Android_' + ARCH],
13	13	label: 'Android',
14		artifacts: 'build/dist/*/AusweisApp2-.apk,build/debug.symbols/**/libAusweisApp2.so'
	14	artifacts: 'build/dist/*/AusweisApp2-.apk,build/debug.symbols/libAusweisApp2-*.so'
15	15	).generate(this)
16	16
17	17

62	62	name: 'Android_AAR',
63	63	libraries: neededLibraries,
64	64	label: 'Android',
65		artifacts: 'build//dist//ausweisapp-.aar,build//dist//ausweisapp-.pom,build//dist//ausweisapp-.jar,build/dist/libs/*/debug.symbols/libAusweisApp2.so'
	65	artifacts: 'build//dist//ausweisapp-.aar,build//dist//ausweisapp-.pom,build//dist//ausweisapp-.jar,build//debug.symbols/libAusweisApp2-.so'
66	66	).generate(this)
67	67
68	68

+3

-1

resources/jenkins/dsl/Builds/Build_Docs.groovy less more

3	3	(
4	4	name: 'Docs',
5	5	label: 'Docs',
6		artifacts: 'build/docs/*/.pdf,build/docs/*/.tar.xz,build/docs/notes/singlehtml/**/appcast.html'
	6	artifacts: 'build/.pdf,build/docs//.pdf,build/docs/*/.tar.xz,build/docs/notes/singlehtml/**/appcast.html'
7	7	).generate(this)
8	8
9	9

26	26	shell('cd build; make inte.latex.pdf')
27	27
28	28	shell('cd build; make doc8')
	29
	30	shell('cd build; make license')
29	31	}
30	32	}

+2

-2

resources/jenkins/dsl/Releases/Release_Android.groovy less more

11	11	name: 'Android_APK_' + ARCH,
12	12	libraries: ['Android_' + ARCH],
13	13	label: 'Android',
14		artifacts: 'build/dist/*/AusweisApp2-.apk,build/debug.symbols/**/libAusweisApp2.so'
	14	artifacts: 'build/dist/*/AusweisApp2-.apk,build/debug.symbols/libAusweisApp2-*.so'
15	15	).generate(this)
16	16
17	17

61	61	name: 'Android_AAR',
62	62	libraries: neededLibraries,
63	63	label: 'Android',
64		artifacts: 'build//dist//ausweisapp-.aar,build//dist//ausweisapp-.pom,build//dist//ausweisapp-.jar,build/dist/libs/*/debug.symbols/libAusweisApp2.so'
	64	artifacts: 'build//dist//ausweisapp-.aar,build//dist//ausweisapp-.pom,build//dist//ausweisapp-.jar,build//debug.symbols/libAusweisApp2-.so'
65	65	).generate(this)
66	66
67	67	j.with

+3

-1

resources/jenkins/dsl/Releases/Release_Docs.groovy less more

3	3	(
4	4	name: 'Docs',
5	5	label: 'Docs',
6		artifacts: 'build/docs/*/.pdf,build/docs/*/.tar.xz,build/docs/notes/singlehtml/**/appcast.html'
	6	artifacts: 'build/.pdf,build/docs//.pdf,build/docs/*/.tar.xz,build/docs/notes/singlehtml/**/appcast.html'
7	7	).generate(this)
8	8
9	9

29	29	shell('cd build; make inst.latex.pdf')
30	30
31	31	shell('cd build; make inte.latex.pdf')
	32
	33	shell('cd build; make license')
32	34	}
33	35	}

+2

-2

resources/jenkins/dsl/Reviews/Review_Android.groovy less more

19	19	{
20	20	steps
21	21	{
22		shell('cd source; python resources/jenkins/import.py')
	22	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
23	23
24	24	shell(strip("""\
25	25	cd build;

68	68	{
69	69	steps
70	70	{
71		shell('cd source; python resources/jenkins/import.py')
	71	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
72	72	}
73	73	}
74	74

+4

-2

resources/jenkins/dsl/Reviews/Review_Docs.groovy less more

3	3	(
4	4	name: 'Docs',
5	5	label: 'Docs',
6		artifacts: 'build/docs/*/.pdf,build/docs/*/.tar.xz,build/docs/notes/singlehtml/**/appcast.html'
	6	artifacts: 'build/.pdf,build/docs//.pdf,build/docs/*/.tar.xz,build/docs/notes/singlehtml/**/appcast.html'
7	7	).generate(this)
8	8
9	9

13	13
14	14	steps
15	15	{
16		shell('cd source; python resources/jenkins/import.py')
	16	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
17	17
18	18	shell('cd build; cmake -Werror=dev ../source -DCMAKE_BUILD_TYPE=release -Dtools.only=true')
19	19

30	30	shell('cd build; make inte.latex.pdf')
31	31
32	32	shell('cd build; make doc8')
	33
	34	shell('cd build; make license')
33	35	}
34	36	}

+1

-1

resources/jenkins/dsl/Reviews/Review_FreeBSD.groovy less more

23	23
24	24	steps
25	25	{
26		shell('cd source; python resources/jenkins/import.py')
	26	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
27	27
28	28	shell(strip('''\
29	29	cd build;

+1

-1

resources/jenkins/dsl/Reviews/Review_Libs_Android.groovy less more

14	14	{
15	15	steps
16	16	{
17		shell('cd source; python resources/jenkins/import.py')
	17	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
18	18
19	19	shell("cd build; cmake ../source/libs -DCMAKE_BUILD_TYPE=release -DCMAKE_TOOLCHAIN_FILE=../source/cmake/android.toolchain.cmake -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DPACKAGES_DIR=\${PACKAGES_DIR} -DCMAKE_ANDROID_ARCH_ABI=${ARCH}")
20	20

+1

-1

resources/jenkins/dsl/Reviews/Review_Libs_FreeBSD.groovy less more

10	10	{
11	11	steps
12	12	{
13		shell('cd source; python resources/jenkins/import.py')
	13	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
14	14
15	15	shell("cd build; cmake ../source/libs -DCMAKE_BUILD_TYPE=debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DPACKAGES_DIR=\${PACKAGES_DIR}")
16	16

+1

-1

resources/jenkins/dsl/Reviews/Review_Libs_Linux.groovy less more

10	10	{
11	11	steps
12	12	{
13		shell('cd source; python resources/jenkins/import.py')
	13	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
14	14
15	15	shell("cd build; cmake ../source/libs -DCMAKE_BUILD_TYPE=release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DPACKAGES_DIR=\${PACKAGES_DIR}")
16	16

+1

-1

resources/jenkins/dsl/Reviews/Review_Libs_MacOS.groovy less more

10	10	{
11	11	steps
12	12	{
13		shell('cd source; python resources/jenkins/import.py')
	13	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
14	14
15	15	shell("cd build; cmake ../source/libs -DCMAKE_BUILD_TYPE=release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DPACKAGES_DIR=\${PACKAGES_DIR}")
16	16

+1

-1

resources/jenkins/dsl/Reviews/Review_Libs_Win32_GNU.groovy less more

18	18
19	19	steps
20	20	{
21		batchFile('cd source & python resources/jenkins/import.py')
	21	batchFile('cd source & cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
22	22
23	23	batchFile("cd build & cmake ../source/libs -DCMAKE_BUILD_TYPE=release -DPACKAGES_DIR=%PACKAGES_DIR% -G\"MinGW Makefiles\" -DWIN_SIGN_KEYSTORE=%WIN_SIGN_KEYSTORE% -DWIN_SIGN_KEYSTORE_PSW=%WIN_SIGN_KEYSTORE_PSW% -DWIN_SIGN_SUBJECT_NAME=%WIN_SIGN_SUBJECT_NAME%")
24	24

+1

-1

resources/jenkins/dsl/Reviews/Review_Libs_Win32_MSVC.groovy less more

10	10	{
11	11	steps
12	12	{
13		batchFile('cd source & python resources/jenkins/import.py')
	13	batchFile('cd source & cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
14	14
15	15	batchFile('''\
16	16	cd build

+1

-1

resources/jenkins/dsl/Reviews/Review_Libs_iOS.groovy less more

10	10	{
11	11	steps
12	12	{
13		shell('cd source; python resources/jenkins/import.py')
	13	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
14	14
15	15	shell('security unlock-keychain \${KEYCHAIN_CREDENTIALS} \${HOME}/Library/Keychains/login.keychain-db')
16	16

+1

-1

resources/jenkins/dsl/Reviews/Review_Linux.groovy less more

30	30
31	31	steps
32	32	{
33		shell('cd source; python resources/jenkins/import.py')
	33	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
34	34
35	35	shell(strip('''\
36	36	cd build;

+1

-1

resources/jenkins/dsl/Reviews/Review_MacOS.groovy less more

15	15	{
16	16	steps
17	17	{
18		shell('cd source; python resources/jenkins/import.py')
	18	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
19	19
20	20	shell('security unlock-keychain ${KEYCHAIN_CREDENTIALS} ${HOME}/Library/Keychains/login.keychain-db')
21	21

+1

-1

resources/jenkins/dsl/Reviews/Review_MacOS_DMG.groovy less more

13	13	{
14	14	steps
15	15	{
16		shell('cd source; python resources/jenkins/import.py')
	16	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
17	17
18	18	shell('security unlock-keychain ${KEYCHAIN_CREDENTIALS} ${HOME}/Library/Keychains/login.keychain-db')
19	19

+1

-1

resources/jenkins/dsl/Reviews/Review_Source.groovy less more

13	13
14	14	steps
15	15	{
16		shell('cd source; python resources/jenkins/import.py')
	16	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
17	17
18	18	shell('cd build; cmake -Werror=dev ../source -DCMAKE_BUILD_TYPE=release -Dtools.only=true')
19	19	shell('cd build; make package_source')

+1

-1

resources/jenkins/dsl/Reviews/Review_Win32_GNU.groovy less more

15	15	{
16	16	steps
17	17	{
18		batchFile('cd source & python resources/jenkins/import.py')
	18	batchFile('cd source & cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
19	19
20	20	batchFile(strip("""\
21	21	cd build &

+1

-1

resources/jenkins/dsl/Reviews/Review_Win32_GNU_MSI.groovy less more

13	13	{
14	14	steps
15	15	{
16		batchFile('cd source & python resources/jenkins/import.py')
	16	batchFile('cd source & cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
17	17
18	18	batchFile(strip("""\
19	19	cd build &

+1

-1

resources/jenkins/dsl/Reviews/Review_Win32_MSVC.groovy less more

14	14	{
15	15	steps
16	16	{
17		batchFile('cd source & python resources/jenkins/import.py')
	17	batchFile('cd source & cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
18	18
19	19	batchFile('''\
20	20	cd build

+1

-1

resources/jenkins/dsl/Reviews/Review_Win32_MSVC_MSI.groovy less more

12	12	{
13	13	steps
14	14	{
15		batchFile('cd source & python resources/jenkins/import.py')
	15	batchFile('cd source & cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
16	16
17	17	batchFile('''\
18	18	cd build

+1

-1

resources/jenkins/dsl/Reviews/Review_iOS_IPA.groovy less more

13	13	{
14	14	steps
15	15	{
16		shell('cd source; python resources/jenkins/import.py')
	16	shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
17	17
18	18	shell('security unlock-keychain \${KEYCHAIN_CREDENTIALS} \${HOME}/Library/Keychains/login.keychain-db')
19	19

+1

-1

resources/jenkins/dsl/View_Releases.groovy less more

1	1	{
2	2	jobs
3	3	{
4		regex('Release(.)*')
	4	regex(/Release.*/)
5	5	}
6	6
7	7	columns

+9

-4

resources/jenkins/dsl/View_Review.groovy less more

1	1	{
2	2	jobs
3	3	{
4		regex('(.)_Review_(.)')
	4	regex(/._Review_./)
5	5	}
6	6
7	7	categorizationCriteria
8	8	{
9		regexGroupingRule('([a-z\|0-9\|.])+_Review_(.)*', 'Branches')
	9	regexGroupingRule(/^[a-z0-9.]+_Review_/, 'Branches')
10	10	}
11	11
12	12	categorizationCriteria
13	13	{
14		regexGroupingRule('Review_Libs', 'Libraries')
	14	regexGroupingRule(/Review_Libs/, 'Libraries')
15	15	}
16	16
17	17	categorizationCriteria
18	18	{
19		regexGroupingRule('(.)*__Review_Trigger', 'Sub-Trigger')
	19	regexGroupingRule(/__Review_Trigger/, 'Sub-Trigger')
	20	}
	21
	22	categorizationCriteria
	23	{
	24	regexGroupingRule(/^[A-Z]\w*_Review_/, 'Tools')
20	25	}
21	26
22	27	columns

+1

-1

resources/jenkins/dsl/View_Seeder.groovy less more

1	1	{
2	2	jobs
3	3	{
4		regex('(.)Seeder(.)')
	4	regex(/.Seeder./)
5	5	}
6	6
7	7	columns

+3

-3

resources/jenkins/dsl/Views/View_Branch.groovy less more

1	1	{
2	2	jobs
3	3	{
4		regex("${MERCURIAL_REVISION_BRANCH}_(.)*")
	4	regex(/${MERCURIAL_REVISION_BRANCH}_.*/)
5	5	}
6	6
7	7	categorizationCriteria
8	8	{
9		regexGroupingRule('^[a-z\|0-9\|.]*_Libs_', '_Libraries_')
10		regexGroupingRule('_Review_', '_Reviews_')
	9	regexGroupingRule(/^[a-z0-9.]+_Libs_/, '_Libraries_')
	10	regexGroupingRule(/_Review_/, '_Reviews_')
11	11	}
12	12
13	13	columns

+1

-1

resources/jenkins/dsl/common/Appcast.groovy less more

8	8	{
9	9	String name = 'Appcast'
10	10	String label= 'Common'
11		String artifacts = 'build/.msi,build/.dmg,build/.tar.gz,build/.sha256,build/Appcast.,build/ReleaseNotes.html,build/docs//.pdf,build/docs/*/.tar.xz,source/resources/default-*'
	11	String artifacts = 'build/.msi,build/.dmg,build/.tar.gz,build/.sha256,build/Appcast.,build/ReleaseNotes.html,build/.pdf,build/docs/*/.pdf,build/docs/*/.tar.xz'
12	12	String trigger = null
13	13	List oldBuilds = [-1, 5]
14	14	boolean sendMail = false

+1

-1

resources/jenkins/dsl/common/Build.groovy less more

126	126	if(getReleaseJob())
127	127	tag('${changeset}')
128	128	else
129		branch(dslFactory.MERCURIAL_REVISION_BRANCH)
	129	tag(dslFactory.MERCURIAL_REVISION_BRANCH)
130	130
131	131	subdirectory('source')
132	132	if(getDisableChangelog())

+1

-1

resources/jenkins/dsl/common/Library.groovy less more

9	9	String artifacts = 'build/Toolchain_*'
10	10	String namePrefix = 'Libs_' // See copyArtifacts in Build.groovy
11	11	String trigger = null
12		List oldBuilds = [-1, 10]
	12	List oldBuilds = [-1, 5]
13	13	int timeout = -1
14	14	int weight = 2
15	15	}

+1

-1

resources/jenkins/dsl/config.xml less more

3	3	<description></description>
4	4	<keepDependencies>false</keepDependencies>
5	5	<scm class="hudson.plugins.mercurial.MercurialSCM" plugin="mercurial@1.54">
6		<source>https://hg.governikus.de/AusweisApp2</source>
	6	<source>https://hg.govkg.de/AusweisApp/AusweisApp2</source>
7	7	<modules>resources/jenkins/dsl/</modules>
8	8	<revisionType>BRANCH</revisionType>
9	9	<revision>default</revision>

+56

-2

resources/jenkins/import.py less more

4	4
5	5	import os
6	6	import sys
	7
	8	patchy = None
	9
	10	try:
	11	from rbtools.commands.patch import Patch
	12
	13	class PatchHelper(Patch):
	14	def __init__(self):
	15	super(PatchHelper, self).__init__()
	16	parser = self.create_arg_parser([])
	17	self.options = parser.parse_args([])
	18	self.root = None
	19	if self.options.server is None:
	20	self.options.server = os.environ.get('REVIEWBOARD_SERVER')
	21
	22	def download(self, request_id, diff_rev=None):
	23	if request_id is None:
	24	print('ID of review request cannot be undefined')
	25	return None
	26
	27	if self.root is None:
	28	if self.options.server is None:
	29	print('Cannot find Review Board! Provide .reviewboardrc?')
	30	return None
	31	_, self.root = self.get_api(self.options.server)
	32
	33	print('Download patch revision {} '
	34	'of review request {}'.format(diff_rev, request_id))
	35	diff, _, _ = self.get_patch(request_id, self.root, diff_rev)
	36	return diff
	37
	38	def save(self, file, request_id=None, diff_rev=None):
	39	if request_id is None:
	40	request_id = os.environ.get('REVIEWBOARD_REVIEW_ID')
	41
	42	if diff_rev is None:
	43	diff_rev = os.environ.get('REVIEWBOARD_DIFF_REVISION')
	44
	45	diff = self.download(request_id, diff_rev)
	46
	47	if diff is not None:
	48	with open(file, 'wb') as f:
	49	f.write(diff)
	50	f.flush()
	51
	52	patchy = PatchHelper()
	53	except Exception:
	54	print('Cannot import rbtools')
	55	pass
7	56
8	57
9	58	def main():

17	66
18	67	patch = b(sys.argv[1]) if len(sys.argv) == 2 else b('../patch.diff')
19	68	if not os.path.isfile(patch):
20		print('Patch file "{}" does not exists'.format(patch))
21		return -1
	69	if patchy is not None:
	70	print('Try to ask Review Board for patch file')
	71	patchy.save(patch)
	72
	73	if not os.path.isfile(patch):
	74	print('Patch file "{}" does not exists'.format(patch))
	75	return -1
22	76
23	77	cfg = ['extensions.hgext.purge=',
24	78	'extensions.hgext.strip=',

+204

-0

resources/json-schemas/supported-providers.json less more

	0	{
	1	"$schema": "https://json-schema.org/draft/2019-09/schema",
	2	"title": "JSON schema for AusweisApp2's supported-providers.json file",
	3	"type": "object",
	4	"properties": {
	5	"$schema": {
	6	"type": "string"
	7	},
	8	"callcosts": {
	9	"description": "Costs for calling telefon numbers",
	10	"type": "array",
	11	"items": {
	12	"type": "object",
	13	"properties": {
	14	"prefixes": {
	15	"type": "array",
	16	"items": {
	17	"type": "string",
	18	"pattern": "^[0-9]+$"
	19	}
	20	},
	21	"free-seconds": {
	22	"type": "integer"
	23	},
	24	"landline": {
	25	"type": "object",
	26	"properties": {
	27	"per-call": {
	28	"type": "number"
	29	},
	30	"per-minute": {
	31	"type": "number"
	32	}
	33	},
	34	"additionalProperties": false
	35	},
	36	"mobile": {
	37	"type": "object",
	38	"properties": {
	39	"per-call": {
	40	"type": "number"
	41	},
	42	"per-minute": {
	43	"type": "number"
	44	}
	45	},
	46	"additionalProperties": false
	47	}
	48	},
	49	"required": [
	50	"prefixes"
	51	],
	52	"additionalProperties": false
	53	}
	54	},
	55	"provider": {
	56	"description": "List of providers",
	57	"type": "array",
	58	"items": {
	59	"type": "object",
	60	"properties": {
	61	"shortName": {
	62	"description": "Name of the provider displayed in the provider list for example",
	63	"type": "object",
	64	"properties": {
	65	"": {
	66	"type": "string"
	67	}
	68	},
	69	"required": [
	70	""
	71	],
	72	"additionalProperties": false
	73	},
	74	"longName": {
	75	"description": "Complete name of the provider",
	76	"type": "object",
	77	"properties": {
	78	"": {
	79	"type": "string"
	80	}
	81	},
	82	"required": [
	83	""
	84	],
	85	"additionalProperties": false
	86	},
	87	"shortDescription": {
	88	"type": "object",
	89	"properties": {
	90	"": {
	91	"type": "string"
	92	}
	93	},
	94	"required": [
	95	""
	96	],
	97	"additionalProperties": false
	98	},
	99	"longDescription": {
	100	"type": "object",
	101	"properties": {
	102	"": {
	103	"type": "string"
	104	}
	105	},
	106	"required": [
	107	""
	108	],
	109	"additionalProperties": false
	110	},
	111	"subjectUrls": {
	112	"description": "Foo",
	113	"type": "array",
	114	"items": {
	115	"type": "string",
	116	"format": "uri",
	117	"pattern": "^https://"
	118	}
	119	},
	120	"phone": {
	121	"type": "string",
	122	"pattern": "^\\+49 [0-9 ]{6,}$"
	123	},
	124	"mobileDesign": {
	125	"type": "boolean"
	126	},
	127	"address": {
	128	"type": "string",
	129	"format": "uri",
	130	"pattern": "^https://"
	131	},
	132	"homepage": {
	133	"type": "string",
	134	"format": "uri",
	135	"pattern": "^https://"
	136	},
	137	"email": {
	138	"type": "string",
	139	"format": "email"
	140	},
	141	"postalAddress": {
	142	"type": "string",
	143	"pattern": "^([\\w\\. \$\$äöüÄÖÜß\\-\\/,:&–]\|(<br\\/>))+$"
	144	},
	145	"category": {
	146	"type": "string",
	147	"enum": [
	148	"citizen",
	149	"finance",
	150	"insurance",
	151	"other"
	152	]
	153	},
	154	"image": {
	155	"type": "string",
	156	"pattern": "\\.(jpg\|png\|svg)$"
	157	},
	158	"icon": {
	159	"type": "string",
	160	"pattern": "\\.(jpg\|png\|svg)$"
	161	},
	162	"subjectUrlInfo": {
	163	"type": "string",
	164	"minLength": 1
	165	},
	166	"exclude": {
	167	"type": "array",
	168	"items": {
	169	"type": "string",
	170	"enum": [
	171	"ios"
	172	]
	173	}
	174	}
	175	},
	176	"required": [
	177	"shortName",
	178	"address",
	179	"homepage",
	180	"category"
	181	],
	182	"oneOf": [
	183	{
	184	"required": [
	185	"subjectUrls"
	186	]
	187	},
	188	{
	189	"required": [
	190	"subjectUrlInfo"
	191	]
	192	}
	193	],
	194	"additionalProperties": false
	195	}
	196	}
	197	},
	198	"required": [
	199	"callcosts",
	200	"provider"
	201	],
	202	"additionalProperties": false
	203	}

+0

-1

resources/packaging/android/AndroidManifest.xml.aar.in less more

19	19	android:label="@string/app_name"
20	20	android:allowBackup="true"
21	21	android:fullBackupContent="@xml/backup_rules">
22		<meta-data android:name="android.max_aspect" android:value="2.1" />
23	22
24	23	<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
25	24

+1

-1

resources/packaging/android/AndroidManifest.xml.apk.in less more

30	30	android:theme="@style/AppTheme"
31	31	android:allowBackup="true"
32	32	android:fullBackupContent="@xml/backup_rules">
33		<meta-data android:name="android.max_aspect" android:value="2.1" />
	33	<meta-data android:name="android.max_aspect" android:value="2.4" />
34	34
35	35	<receiver android:name="com.governikus.ausweisapp2.UpdateReceiver" >
36	36	<intent-filter>

+2

-0

resources/packaging/android/consumer-rules.pro less more

	0	-keep class com.governikus.** { *; }
	1	-keep class org.qtproject.** { *; }

+1

-0

resources/packaging/android/libAusweisApp2.so-deployment-settings.json.in less more

6	6	"toolchain-prefix": "@ANDROID_TOOLCHAIN_PREFIX@",
7	7	"tool-prefix": "@ANDROID_TOOLCHAIN_MACHINE_NAME@",
8	8	"toolchain-version": "@ANDROID_NDK_TOOLCHAIN_VERSION@",
	9	"useLLVM": @ANDROID_USE_LLVM@,
9	10	"ndk-host": "@CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG@",
10	11	"target-architecture": "@CMAKE_ANDROID_ARCH_ABI@",
11	12	"android-package-source-directory": "@ANDROID_PACKAGE_SRC_DIR@",

+3

-3

resources/packaging/linux/com.governikus.ausweisapp2.desktop.in less more

0	0	[Desktop Entry]
1	1	Version=1.0
2	2	Type=Application
3		Exec=@CMAKE_INSTALL_FULL_BINDIR@/AusweisApp2
4		Icon=@CMAKE_INSTALL_FULL_DATADIR@/@VENDOR@/AusweisApp2/npa.svg
	3	Exec=AusweisApp2
	4	Icon=AusweisApp2
5	5	StartupNotify=true
6	6	Terminal=false
7		Categories=Utility;Accessibility;
	7	Categories=System;Security;
8	8	GenericName=Authentication App
9	9	Keywords=nPA,eID,eAT,Personalausweis,Aufenthaltstitel,Identity,Card
10	10	Name=AusweisApp2

+0

-1

resources/packaging/linux/com.governikus.ausweisapp2.metainfo.xml.in less more

16	16	<category>Utility</category>
17	17	</categories>
18	18	<url type="homepage">https://www.ausweisapp.bund.de/</url>
19		<url type="contact">mailto:support@ausweisapp.de</url>
20	19	<launchable type="desktop-id">com.governikus.ausweisapp2.desktop</launchable>
21	20	<provides>
22	21	<binary>AusweisApp2</binary>

+6

-0

resources/packaging/win/WIX.template.in less more

71	71	<ComponentRef Id="RemindToClose"/>
72	72	<ComponentRef Id="Assistant"/>
73	73	<ComponentRef Id="TransportPinReminder"/>
	74	<ComponentRef Id="CustomProxyType"/>
	75	<ComponentRef Id="CustomProxyHost" />
	76	<ComponentRef Id="CustomProxyPort"/>
74	77	<ComponentRef Id="UpdateCheck"/>
75	78	<ComponentRef Id="OnScreenKeyboard"/>
	79	<ComponentRef Id="ShuffleScreenKeyboard"/>
	80	<ComponentRef Id="EnableCanAllowed"/>
	81	<ComponentRef Id="SkipRightsOnCanAllowed"/>
76	82	<ComponentRef Id="History"/>
77	83	</FeatureRef>
78	84

+72

-22

resources/packaging/win/runtime_settings.wxs less more

5	5
6	6	<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
7	7	<Fragment>
8		<Property Id="AUTOSTART" Value="undefined" />
9		<Property Id="AUTOHIDE" Value="undefined" />
10		<Property Id="REMINDTOCLOSE" Value="undefined" />
11		<Property Id="ASSISTANT" Value="undefined" />
12		<Property Id="TRANSPORTPINREMINDER" Value="undefined"/>
13		<Property Id="UPDATECHECK" Value="undefined"/>
14		<Property Id="ONSCREENKEYBOARD" Value="undefined"/>
15		<Property Id="HISTORY" Value="undefined"/>
	8	<Property Id="AUTOSTART" Secure="yes"/>
	9	<Property Id="AUTOHIDE" Secure="yes"/>
	10	<Property Id="REMINDTOCLOSE" Secure="yes"/>
	11	<Property Id="ASSISTANT" Secure="yes"/>
	12	<Property Id="TRANSPORTPINREMINDER" Secure="yes"/>
	13	<Property Id="CUSTOMPROXYTYPE" Secure="yes"/>
	14	<Property Id="CUSTOMPROXYHOST" Secure="yes"/>
	15	<Property Id="CUSTOMPROXYPORT" Secure="yes"/>
	16	<Property Id="UPDATECHECK" Secure="yes"/>
	17	<Property Id="ONSCREENKEYBOARD" Secure="yes"/>
	18	<Property Id="SHUFFLESCREENKEYBOARD" Secure="yes"/>
	19	<Property Id="ENABLECANALLOWED" Secure="yes"/>
	20	<Property Id="SKIPRIGHTSONCANALLOWED" Secure="yes"/>
	21	<Property Id="HISTORY" Secure="yes"/>
	22
	23	<WixVariable Id="CompanyRootKey" Value="Software\$(var.CPACK_PACKAGE_VENDOR)\$(var.CPACK_PACKAGE_NAME)"/>
16	24
17	25	<DirectoryRef Id="TARGETDIR">
18	26	<Component Id="AutoStart" Guid="*">

23	31	</Component>
24	32
25	33	<Component Id="AutoHide" Guid="*">
26		<Condition>AUTOHIDE = "true" OR AUTOHIDE = "false"</Condition>
27		<RegistryKey Root="HKLM" Key="Software\$(var.CPACK_PACKAGE_VENDOR)\$(var.CPACK_PACKAGE_NAME)">
	34	<Condition>AUTOHIDE</Condition>
	35	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
28	36	<RegistryValue Name="autoCloseWindow" Type="string" Value="[AUTOHIDE]" KeyPath="yes"/>
29	37	</RegistryKey>
30	38	</Component>
31	39
32	40	<Component Id="RemindToClose" Guid="*">
33		<Condition>REMINDTOCLOSE = "true" OR REMINDTOCLOSE = "false"</Condition>
34		<RegistryKey Root="HKLM" Key="Software\$(var.CPACK_PACKAGE_VENDOR)\$(var.CPACK_PACKAGE_NAME)">
	41	<Condition>REMINDTOCLOSE</Condition>
	42	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
35	43	<RegistryValue Name="remindToClose" Type="string" Value="[REMINDTOCLOSE]" KeyPath="yes"/>
36	44	</RegistryKey>
37	45	</Component>
38	46
39	47	<Component Id="Assistant" Guid="*">
40		<Condition>ASSISTANT = "true" OR ASSISTANT = "false"</Condition>
41		<RegistryKey Root="HKLM" Key="Software\$(var.CPACK_PACKAGE_VENDOR)\$(var.CPACK_PACKAGE_NAME)">
	48	<Condition>ASSISTANT</Condition>
	49	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
42	50	<RegistryValue Name="showSetupAssistant" Type="string" Value="[ASSISTANT]" KeyPath="yes"/>
43	51	</RegistryKey>
44	52	</Component>
45	53
46	54	<Component Id="TransportPinReminder" Guid="*">
47		<Condition>TRANSPORTPINREMINDER = "true" OR TRANSPORTPINREMINDER = "false"</Condition>
48		<RegistryKey Root="HKLM" Key="Software\$(var.CPACK_PACKAGE_VENDOR)\$(var.CPACK_PACKAGE_NAME)">
	55	<Condition>TRANSPORTPINREMINDER</Condition>
	56	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
49	57	<RegistryValue Name="transportPinReminder" Type="string" Value="[TRANSPORTPINREMINDER]" KeyPath="yes"/>
50	58	</RegistryKey>
51	59	</Component>
52	60
	61	<Component Id="CustomProxyType" Guid="*">
	62	<Condition>CUSTOMPROXYTYPE</Condition>
	63	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
	64	<RegistryValue Name="customProxyType" Type="string" Value="[CUSTOMPROXYTYPE]" KeyPath="yes"/>
	65	</RegistryKey>
	66	</Component>
	67
	68	<Component Id="CustomProxyHost" Guid="*">
	69	<Condition>CUSTOMPROXYHOST</Condition>
	70	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
	71	<RegistryValue Name="customProxyHost" Type="string" Value="[CUSTOMPROXYHOST]" KeyPath="yes"/>
	72	</RegistryKey>
	73	</Component>
	74
	75	<Component Id="CustomProxyPort" Guid="*">
	76	<Condition>CUSTOMPROXYPORT</Condition>
	77	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
	78	<RegistryValue Name="customProxyPort" Type="string" Value="[CUSTOMPROXYPORT]" KeyPath="yes"/>
	79	</RegistryKey>
	80	</Component>
	81
53	82	<Component Id="UpdateCheck" Guid="*">
54		<Condition>UPDATECHECK = "true" OR UPDATECHECK = "false"</Condition>
55		<RegistryKey Root="HKLM" Key="Software\$(var.CPACK_PACKAGE_VENDOR)\$(var.CPACK_PACKAGE_NAME)\common">
	83	<Condition>UPDATECHECK</Condition>
	84	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
56	85	<RegistryValue Name="autoUpdateCheck" Type="string" Value="[UPDATECHECK]" KeyPath="yes"/>
57	86	</RegistryKey>
58	87	</Component>
59	88
60	89	<Component Id="OnScreenKeyboard" Guid="*">
61		<Condition>ONSCREENKEYBOARD = "true" OR ONSCREENKEYBOARD = "false"</Condition>
62		<RegistryKey Root="HKLM" Key="Software\$(var.CPACK_PACKAGE_VENDOR)\$(var.CPACK_PACKAGE_NAME)\common">
	90	<Condition>ONSCREENKEYBOARD</Condition>
	91	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
63	92	<RegistryValue Name="keylessPassword" Type="string" Value="[ONSCREENKEYBOARD]" KeyPath="yes"/>
64	93	</RegistryKey>
65	94	</Component>
66	95
	96	<Component Id="ShuffleScreenKeyboard" Guid="*">
	97	<Condition>SHUFFLESCREENKEYBOARD</Condition>
	98	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
	99	<RegistryValue Name="shuffleScreenKeyboard" Type="string" Value="[SHUFFLESCREENKEYBOARD]" KeyPath="yes"/>
	100	</RegistryKey>
	101	</Component>
	102
	103	<Component Id="EnableCanAllowed" Guid="*">
	104	<Condition>ENABLECANALLOWED</Condition>
	105	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
	106	<RegistryValue Name="enableCanAllowed" Type="string" Value="[ENABLECANALLOWED]" KeyPath="yes"/>
	107	</RegistryKey>
	108	</Component>
	109
	110	<Component Id="SkipRightsOnCanAllowed" Guid="*">
	111	<Condition>SKIPRIGHTSONCANALLOWED</Condition>
	112	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)">
	113	<RegistryValue Name="skipRightsOnCanAllowed" Type="string" Value="[SKIPRIGHTSONCANALLOWED]" KeyPath="yes"/>
	114	</RegistryKey>
	115	</Component>
	116
67	117	<Component Id="History" Guid="*">
68		<Condition>HISTORY = "true" OR HISTORY = "false"</Condition>
69		<RegistryKey Root="HKLM" Key="Software\$(var.CPACK_PACKAGE_VENDOR)\$(var.CPACK_PACKAGE_NAME)\history">
	118	<Condition>HISTORY</Condition>
	119	<RegistryKey Root="HKLM" Key="!(wix.CompanyRootKey)\history">
70	120	<RegistryValue Name="enable" Type="string" Value="[HISTORY]" KeyPath="yes"/>
71	121	</RegistryKey>
72	122	</Component>

+72

-19

resources/qml/+desktop/main.qml less more

9	9	import Governikus.SelfAuthenticationView 1.0
10	10	import Governikus.IdentifyView 1.0
11	11	import Governikus.ChangePinView 1.0
	12	import Governikus.ProgressView 1.0
12	13	import Governikus.ProviderView 1.0
13	14	import Governikus.MoreView 1.0
14	15	import Governikus.SettingsView 1.0

16	17	import Governikus.UpdateView 1.0
17	18	import Governikus.View 1.0
18	19	import Governikus.Type.ApplicationModel 1.0
	20	import Governikus.Type.AuthModel 1.0
19	21	import Governikus.Type.UiModule 1.0
20	22	import Governikus.Type.SettingsModel 1.0
21	23	import Governikus.Type.SelfAuthModel 1.0

27	29	import QtQuick 2.10
28	30	import QtQuick.Controls 2.3
29	31	import QtGraphicalEffects 1.0
30		import Qt.labs.platform 1.1
	32	import Qt.labs.platform 1.1 as Labs
31	33
32	34
33	35	ApplicationWindow {
34	36	id: appWindow
35	37
36		function openSaveFileDialog(pOnAcceptedCallback, pDefaultFilename, pSuffix) {
37		//: LABEL DESKTOP_QML
38		saveFileDialog.nameFilters = [qsTr("Text files") + " (*." + pSuffix + ")"]
	38	function openSaveFileDialog(pOnAcceptedCallback, pDefaultFilename, pFileType, pSuffix) {
	39	saveFileDialog.nameFilters = "%1 (*.%2)".arg(pFileType).arg(pSuffix)
39	40	saveFileDialog.defaultSuffix = pSuffix
40	41	saveFileDialog.currentFile = saveFileDialog.folder + "/" + pDefaultFilename
41	42	saveFileDialog.acceptedCallback = pOnAcceptedCallback

70	71	onHeightChanged: d.setScaleFactor()
71	72
72	73	onClosing: {
	74	if (ApplicationModel.currentWorkflow !== "") {
	75	abortWorkflowWarning.open()
	76	close.accepted = false
	77	return
	78	}
	79
73	80	if (SettingsModel.remindUserToClose) {
74	81	closeWarning.open()
75	82	close.accepted = false
76	83	} else {
77		hide()
78		plugin.hide()
	84	d.hideUiAndTaskbarEntry()
79	85	}
80	86	}
81	87	onVisibilityChanged: if (visibility !== ApplicationWindow.Minimized) d.lastVisibility = visibility

94	100
95	101	property int activeView: SectionPage.Views.Main
96	102	property int lastVisibility: ApplicationWindow.Windowed
97		readonly property int initialWidth: ApplicationModel.dpiScale * 1600
98		readonly property int initialHeight: ApplicationModel.dpiScale * 1200
	103	readonly property int initialWidth: 960
	104	readonly property int initialHeight: 720
99	105	property ApplicationWindow detachedLogView: null
	106
	107	function abortCurrentWorkflow() {
	108	if (ApplicationModel.currentWorkflow === "authentication") {
	109	AuthModel.cancelWorkflow()
	110	}
	111	else if (ApplicationModel.currentWorkflow === "selfauthentication") {
	112	SelfAuthModel.cancelWorkflow()
	113	}
	114	else if (ApplicationModel.currentWorkflow === "changepin") {
	115	ChangePinModel.cancelWorkflow()
	116	}
	117	}
	118
	119	function hideUiAndTaskbarEntry() {
	120	hide()
	121	plugin.hideFromTaskbar()
	122	}
100	123
101	124	function closeOpenDialogs() {
102	125	saveFileDialog.reject()
103	126	closeWarning.close()
	127	abortWorkflowWarning.close()
104	128	}
105	129
106	130	function showMainWindow() {

131	155
132	156	}
133	157
134		FileDialog {
	158	TaskbarProgress {}
	159
	160	Labs.FileDialog {
135	161	id: saveFileDialog
136	162
137	163	property var acceptedCallback
138	164
139		fileMode: FileDialog.SaveFile
140		folder: StandardPaths.writableLocation(StandardPaths.DocumentsLocation)
	165	fileMode: Labs.FileDialog.SaveFile
	166	folder: Labs.StandardPaths.writableLocation(Labs.StandardPaths.DocumentsLocation)
141	167	onAccepted: acceptedCallback(file)
142	168	}
143	169

162	188	title: qsTr("The user interface of the %1 is closed.").arg(Qt.application.name) + SettingsModel.translationTrigger
163	189	//: INFO DESKTOP_QML Content of the popup that is shown when the AA2 is closed for the first time.
164	190	text: qsTr("The program remains available via the icon in the system tray. Click on the %1 icon to reopen the user interface.").arg(Qt.application.name) + SettingsModel.translationTrigger
165		onConfirmed: {
166		hide()
167		plugin.hide()
168		}
	191	onConfirmed: d.hideUiAndTaskbarEntry()
169	192
170	193	ToggleableOption {
171	194	//: LABEL DESKTOP_QML

176	199
177	200	onCheckedChanged: SettingsModel.remindUserToClose = !checked
178	201	}
	202	}
	203
	204	ConfirmationPopup {
	205	id: abortWorkflowWarning
	206
	207	//: INFO DESKTOP_QML Content of the popup that is shown when the AA2 is closed and a workflow is still active.
	208	readonly property string abortText: qsTr("This will cancel the current operation and hide the UI of %1. You can restart the operation at any time.").arg(Qt.application.name) + SettingsModel.translationTrigger
	209	//: INFO DESKTOP_QML Content of the popup that is shown when the AA2 is closed and a workflow is still active and the close/minimize info was not disabled.
	210	readonly property string hideToTrayText: qsTr("The program remains available via the icon in the system tray. Click on the %1 icon to reopen the user interface.").arg(Qt.application.name) + SettingsModel.translationTrigger
	211
	212	closePolicy: Popup.NoAutoClose
	213	//: INFO DESKTOP_QML Header of the popup that is shown when the AA2 is closed and a workflow is still active
	214	title: qsTr("Abort operation") + SettingsModel.translationTrigger
	215	text: "%1%2".arg(abortText).arg(SettingsModel.remindUserToClose ? "<br/><br/>%1".arg(hideToTrayText) : "")
	216
	217	onConfirmed: {
	218	d.abortCurrentWorkflow()
	219	d.hideUiAndTaskbarEntry()
	220	}
	221	onCancelled: close()
179	222	}
180	223
181	224	Connections {

222	265	break
223	266	}
224	267	}
225		onFireHideRequest: {
226		hide()
227		}
	268	onFireHideRequest: hide()
228	269	}
229	270
230	271	Connections {

243	284
244	285	Shortcut {
245	286	sequence: StandardKey.HelpContents
246		onActivated: ApplicationModel.openOnlineHelp("index")
	287	onActivated: ApplicationModel.openOnlineHelp(titleBar.rightMostAction.helpTopic)
247	288	}
248	289
249	290	Image {

355	396	onCancelled: plugin.switchUi()
356	397	}
357	398
	399	Connections {
	400	target: plugin
	401	onFireProxyAuthenticationRequired: {
	402	proxyCredentials.credentials = pProxyCredentials
	403	proxyCredentials.open()
	404	}
	405	}
	406
	407	ProxyCredentialsPopup {
	408	id: proxyCredentials
	409	}
	410
358	411	Component {
359	412	id: detachedLogViewWindow
360	413

+2

-1

resources/qml/+mobile/main.qml less more

11	11	import Governikus.View 1.0
12	12	import Governikus.FeedbackView 1.0
13	13	import Governikus.Type.ApplicationModel 1.0
	14	import Governikus.Type.RemoteServiceModel 1.0
14	15	import Governikus.Type.SettingsModel 1.0
15	16	import Governikus.Style 1.0
16	17

172	173	id: feedback
173	174
174	175	function showIfNecessary() {
175		if (!ApplicationModel.currentWorkflow && SettingsModel.requestStoreFeedback()) {
	176	if (!ApplicationModel.currentWorkflow && !RemoteServiceModel.running && SettingsModel.requestStoreFeedback()) {
176	177	SettingsModel.hideFutureStoreFeedbackDialogs()
177	178	feedback.open()
178	179	}

+14

-10

resources/qml/Governikus/ChangePinView/+desktop/ChangePinView.qml less more

26	26	Password,
27	27	PasswordInfo,
28	28	Progress,
	29	ProgressNewPin,
29	30	CardPosition,
30	31	InputError,
31	32	Data,

45	46
46	47	titleBarAction: TitleBarAction {
47	48	//: LABEL DESKTOP_QML
48		text: qsTr("PIN Management") + SettingsModel.translationTrigger
	49	text: qsTr("Change PIN") + SettingsModel.translationTrigger
49	50	rootEnabled: false
50	51	helpTopic: "pinManagement"
51	52	showSettings: (changePinController.workflowState === ChangePinController.WorkflowStates.Initial \|\|
52	53	changePinController.workflowState === ChangePinController.WorkflowStates.Reader \|\|
53	54	changePinController.workflowState === ChangePinController.WorkflowStates.Card)
54		&& d.activeView !== ChangePinView.SubViews.Progress
	55	&& d.activeView !== ChangePinView.SubViews.Progress && d.activeView !== ChangePinView.SubViews.ProgressNewPin
55	56
56	57	onClicked: {
57	58	if (d.activeView === ChangePinView.SubViews.PasswordInfo) {

138	139	visible: d.activeView === ChangePinView.SubViews.Password
139	140
140	141	onPasswordEntered: {
141		d.view = ChangePinView.SubViews.Progress
	142	d.view = pWasNewPin ? ChangePinView.SubViews.ProgressNewPin : ChangePinView.SubViews.Progress
142	143	ChangePinModel.continueWorkflow()
143	144	}
144	145

166	167	ProgressView {
167	168	id: pinProgressView
168	169
169		visible: d.activeView === ChangePinView.SubViews.Progress
170
171		//: LABEL DESKTOP_QML
172		text: qsTr("Change PIN") + SettingsModel.translationTrigger
	170	visible: d.activeView === ChangePinView.SubViews.Progress \|\| d.activeView === ChangePinView.SubViews.ProgressNewPin
	171
	172	text: d.activeView === ChangePinView.SubViews.ProgressNewPin
	173	//: LABEL DESKTOP_QML Processing screen label while the card communication is running after the new PIN has been entered during PIN change process.
	174	? qsTr("Setting new PIN") + SettingsModel.translationTrigger
	175	//: LABEL DESKTOP_QML Processing screen label while the card communication is running after the old PIN has been entered during PIN change process.
	176	: qsTr("Change PIN") + SettingsModel.translationTrigger
173	177	//: INFO DESKTOP_QML Processing screen text while the card communication is running after the PIN has been entered during PIN change process.
174		subText: qsTr("Please don't move the ID card...") + SettingsModel.translationTrigger
	178	subText: qsTr("Please don't move the ID card.") + SettingsModel.translationTrigger
175	179	}
176	180
177	181	ResultView {

200	204
201	205	resultType: ResultView.Type.IsSuccess
202	206	//: INFO DESKTOP_QML The ID card has just been unblocked and the user can now continue with their PIN change.
203		text: qsTr("Your ID card is unblocked. You now have three more tries to change your PIN") + SettingsModel.translationTrigger
	207	text: qsTr("Your ID card is unblocked. You now have three more attempts to change your PIN") + SettingsModel.translationTrigger
204	208	onNextView: confirmed = true
205	209
206	210	Connections {

231	235	ChangePinModel.continueWorkflow()
232	236	baseItem.nextView(pName)
233	237	}
234		emailButtonVisible: ChangePinModel.error && !ChangePinModel.isCancellationByUser()
	238	supportButtonsVisible: ChangePinModel.error && !ChangePinModel.isCancellationByUser()
235	239	onEmailButtonPressed: ChangePinModel.sendResultMail()
236	240	}
237	241	}

+1

-0

resources/qml/Governikus/ChangePinView/+mobile/ChangePinController.qml less more

56	56	target: ChangePinModel
57	57
58	58	onFireNewContextSet: {
	59	pinProgressView.wasNewPin = false
59	60	navBar.lockedAndHidden = true
60	61	navBar.state = "pin"
61	62	navBar.currentIndex = 3

+18

-14

resources/qml/Governikus/ChangePinView/+mobile/ChangePinView.qml less more

30	30	Connections {
31	31	target: ChangePinModel
32	32	//: INFO ANDROID IOS The ID card has just been unblocked and the user can now continue with their PIN change.
33		onFireOnPinUnlocked: ApplicationModel.showFeedback(qsTr("Your ID card is unblocked. You now have three more tries to change your PIN"))
	33	onFireOnPinUnlocked: ApplicationModel.showFeedback(qsTr("Your ID card is unblocked. You now have three more attempts to change your PIN"))
34	34	}
35	35
36	36	ChangePinViewContent {

44	44
45	45	controller: changePinController
46	46	workflowModel: ChangePinModel
47		//: LABEL ANDROID IOS
48		workflowTitle: qsTr("PIN Management") + SettingsModel.translationTrigger
	47	workflowTitle: baseItem.title
49	48
50	49	waitingFor: switch (changePinController.workflowState) {
51	50	case ChangePinController.WorkflowStates.Reader:

64	63
65	64	ResultView {
66	65	id: cardPositionView
67		//: LABEL ANDROID IOS
68		title: qsTr("PIN Management") + SettingsModel.translationTrigger
	66	navigationAction: NavigationAction { state: "cancel"; onClicked: ChangePinModel.cancelWorkflow() }
	67	title: baseItem.title
69	68	resultType: ResultView.Type.IsInfo
70	69	//: LABEL ANDROID IOS
71	70	buttonText: qsTr("Retry") + SettingsModel.translationTrigger

80	79
81	80	ResultView {
82	81	id: pinResult
83		//: LABEL ANDROID IOS
84		title: qsTr("PIN Management") + SettingsModel.translationTrigger
	82	title: baseItem.title
85	83	resultType: ChangePinModel.error ? ResultView.Type.IsError : ResultView.Type.IsSuccess
86	84	text: ChangePinModel.resultString
87	85	onClicked: {

100	98	visible: false
101	99
102	100	onPasswordEntered: {
	101	pinProgressView.wasNewPin = pWasNewPin
103	102	firePop()
104	103	ChangePinModel.continueWorkflow()
105	104	}

109	108
110	109	ProgressView {
111	110	id: pinProgressView
	111
	112	property bool wasNewPin
	113
112	114	navigationAction: NavigationAction {
113	115	state: ChangePinModel.isBasicReader ? "cancel" : "hidden";
114	116	onClicked: if (state !== "hidden") ChangePinModel.cancelWorkflow()
115	117	}
116		//: LABEL ANDROID IOS
117		title: qsTr("PIN Management") + SettingsModel.translationTrigger
	118	title: baseItem.title
118	119	visible: false
119		//: LABEL ANDROID IOS
120		text: qsTr("Change PIN") + SettingsModel.translationTrigger
	120	text: (wasNewPin
	121	//: LABEL ANDROID IOS Processing screen label while the card communication is running after the new PIN has been entered during PIN change process.
	122	? qsTr("Setting new PIN")
	123	//: LABEL ANDROID IOS Processing screen label while the card communication is running before the new PIN has been entered during PIN change process.
	124	: qsTr("Change PIN")) + SettingsModel.translationTrigger
121	125	subText: (!visible ? ""
122	126	//: INFO ANDROID IOS Loading screen during PIN change process, data communcation is currently ongoing. Message is usually not visible since the password handling with basic reader is handled by EnterPasswordView.
123		: ChangePinModel.isBasicReader ? qsTr("Please don't move the ID card...")
	127	: ChangePinModel.isBasicReader ? qsTr("Please don't move the ID card.")
124	128	: !!NumberModel.inputError ? NumberModel.inputError
125	129	//: INFO ANDROID IOS The card communcation was aborted, the online identification functionality is deactivated and needs to be actived by the authorities.
126	130	: NumberModel.pinDeactivated ? qsTr("The online identification function of your ID card is not activated. Please contact the authority responsible for issuing your identification card to activate the online identification function.")

129	133	//: INFO ANDROID IOS Either an comfort card reader or smartphone-as-card-reader is used, the user needs to react to request on that device.
130	134	\|\| changePinController.workflowState === ChangePinController.WorkflowStates.NewPin ? qsTr("Please observe the display of your card reader.")
131	135	//: INFO ANDROID IOS The wrong PIN was entered twice, the next attempt requires additional verifcation via CAN.
132		: changePinController.workflowState === ChangePinController.WorkflowStates.Can ? qsTr("A wrong PIN has been entered twice on your ID card. Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. You can find your card access number (CAN) on the front of your ID card.")
	136	: changePinController.workflowState === ChangePinController.WorkflowStates.Can ? qsTr("A wrong PIN has been entered twice on your ID card. For a third attempt, please first enter the six-digit Card Access Number (CAN). You can find your Card Access Number (CAN) in the bottom right on the front of your ID card.")
133	137	//: INFO ANDROID IOS The PIN (including the CAN) was entered wrongfully three times, the PUK is required to unlock the ID card.
134	138	: changePinController.workflowState === ChangePinController.WorkflowStates.Puk ? qsTr("A wrong PIN has been entered three times on your ID card. Your PIN is now blocked. To unblock your PIN you have to enter the PUK.")
135	139	//: INFO ANDROID IOS Generic progress message during PIN change process.
136		: qsTr("Please don't move the ID card...")) + SettingsModel.translationTrigger
	140	: qsTr("Please don't move the ID card.")) + SettingsModel.translationTrigger
137	141	subTextColor: !ChangePinModel.isBasicReader && (NumberModel.inputError
138	142	\|\| NumberModel.pinDeactivated
139	143	\|\| changePinController.workflowState === ChangePinController.WorkflowStates.Can

+1

-1

resources/qml/Governikus/ChangePinView/+mobile/ChangePinViewContent.qml less more

48	48	anchors.horizontalCenter: parent.horizontalCenter
49	49
50	50	//: LABEL ANDROID IOS
51		text: qsTr("You have the opportunity to change your transport PIN into a personal PIN. You can also change the PIN at any time or unblock the PIN using the personal unblocking key (PUK). The transport PIN and the PUK can be found in the letter sent to you by your competent authority.") + SettingsModel.translationTrigger
	51	text: qsTr("You have the opportunity to change your Transport PIN into a personal PIN. You can also change the PIN at any time or unblock the PIN using the Personal Unblocking Key (PUK). The Transport PIN and the PUK can be found in the letter sent to you by your competent authority.") + SettingsModel.translationTrigger
52	52
53	53	horizontalAlignment: Text.AlignHCenter
54	54	width: Math.min(parent.width - 2 * Constants.pane_padding, Style.dimens.max_text_width)

+0

-110

~~resources/qml/Governikus/DeveloperView/+mobile/DeveloperView.qml~~ less more

0		/*
1		* \copyright Copyright (c) 2016-2020 Governikus GmbH & Co. KG, Germany
2		*/
3
4		import QtQuick 2.10
5		import QtQuick.Controls 2.3
6
7		import Governikus.Global 1.0
8		import Governikus.Style 1.0
9		import Governikus.SettingsView 1.0
10		import Governikus.TitleBar 1.0
11		import Governikus.View 1.0
12		import Governikus.Type.SettingsModel 1.0
13		import Governikus.Type.LogModel 1.0
14		import Governikus.Type.HistoryModel 1.0
15		import Governikus.Type.ApplicationModel 1.0
16
17
18		SectionPage {
19		id: root
20		navigationAction: NavigationAction { state: !topLevelPage ? "back" : ""; onClicked: firePop() }
21		//: LABEL ALL_PLATFORMS
22		title: qsTr("Developer options") + SettingsModel.translationTrigger
23
24		content: Column {
25		id: mainColumn
26		width: root.width
27		padding: Constants.pane_padding
28		spacing: Constants.component_spacing
29
30		readonly property int usableWidth: width - 2 * padding
31
32		LabeledSwitch {
33		id: testUriSwitch
34
35		width: parent.usableWidth
36
37		//: LABEL ANDROID IOS
38		title: qsTr("Testmode for the self-authentication") + SettingsModel.translationTrigger
39		//: LABEL ANDROID IOS
40		description: qsTr("Use the test environment during a self-authentication") + SettingsModel.translationTrigger
41		checked: SettingsModel.useSelfauthenticationTestUri
42		onCheckedChanged: SettingsModel.useSelfauthenticationTestUri = testUriSwitch.checked
43		}
44
45		LabeledSwitch {
46		id: devModeSwitch
47
48		width: parent.usableWidth
49
50		//: LABEL ANDROID IOS
51		title: qsTr("Developer Mode") + SettingsModel.translationTrigger
52		//: LABEL ANDROID IOS
53		description: qsTr("Use a more tolerant mode") + SettingsModel.translationTrigger
54		checked: SettingsModel.developerMode
55		onCheckedChanged: SettingsModel.developerMode = devModeSwitch.checked
56		}
57
58		GText {
59		//: LABEL ALL_PLATFORMS
60		text: qsTr("Change the layout style") + SettingsModel.translationTrigger
61		textStyle: Style.text.normal_accent
62		}
63
64		GRadioButton {
65		//: LABEL ALL_PLATFORMS
66		text: qsTr("iOS") + SettingsModel.translationTrigger
67		checked: plugin.platformStyle === text.toLowerCase()
68		onCheckedChanged: if (checked) { plugin.applyPlatformStyle(text.toLowerCase()) }
69		}
70
71		GRadioButton {
72		//: LABEL ALL_PLATFORMS
73		text: qsTr("Android") + SettingsModel.translationTrigger
74		checked: plugin.platformStyle === text.toLowerCase()
75		onCheckedChanged: if (checked) { plugin.applyPlatformStyle(text.toLowerCase()) }
76		}
77
78		GRadioButton {
79		//: LABEL ALL_PLATFORMS
80		text: qsTr("Tablet, Android") + SettingsModel.translationTrigger
81		checked: plugin.platformStyle === text.toLowerCase()
82		onCheckedChanged: if (checked) { plugin.applyPlatformStyle(text.toLowerCase()) }
83		}
84
85		GText {
86		//: LABEL ALL_PLATFORMS
87		text: qsTr("Create dummy entries") + SettingsModel.translationTrigger
88		textStyle: Style.text.normal_accent
89		}
90
91		GButton {
92		//: LABEL ALL_PLATFORMS
93		text: qsTr("Logfile") + SettingsModel.translationTrigger
94		onClicked: {
95		LogModel.saveDummyLogfile()
96		ApplicationModel.showFeedback("Created new logfile.")
97		}
98		}
99
100		GButton {
101		//: LABEL ALL_PLATFORMS
102		text: qsTr("History") + SettingsModel.translationTrigger
103		onClicked: {
104		HistoryModel.createDummyEntry()
105		ApplicationModel.showFeedback("Created new history entry.")
106		}
107		}
108		}
109		}

+0

-3

~~resources/qml/Governikus/DeveloperView/qmldir~~ less more

0		module DeveloperView
1
2		DeveloperView 1.0 DeveloperView.qml

+39

-44

resources/qml/Governikus/EnterPasswordView/+desktop/EnterPasswordView.qml less more

18	18	{
19	19	id: baseItem
20	20
21		signal passwordEntered()
	21	signal passwordEntered(bool pWasNewPin)
22	22	signal changePinLength()
23	23	signal requestPasswordInfo()
24	24

46	46	return
47	47	}
48	48
	49	let wasNewPin = false;
49	50	if (passwordType === NumberModel.PASSWORD_PIN) {
50	51	NumberModel.pin = numberField.text
51	52	}

61	62	} else {
62	63	NumberModel.newPin = numberField.text
63	64	numberField.inputConfirmation = ""
	65	wasNewPin = true
64	66	}
65	67	}
66	68	else if (passwordType === NumberModel.PASSWORD_REMOTE_PIN) {

69	71
70	72	numberField.text = ""
71	73	if (numberField.inputConfirmation === "") {
72		baseItem.passwordEntered()
	74	baseItem.passwordEntered(wasNewPin)
73	75	}
74	76	}
75	77	}

128	130	Accessible.name: mainText.text
129	131
130	132	//: LABEL DESKTOP_QML
131		text: (passwordType === NumberModel.PASSWORD_PIN ? qsTr("PIN entry")
132		//: LABEL DESKTOP_QML
133		: passwordType === NumberModel.PASSWORD_NEW_PIN ? qsTr("PIN entry")
134		//: LABEL DESKTOP_QML
135		: passwordType === NumberModel.PASSWORD_CAN ? qsTr("CAN entry")
136		//: LABEL DESKTOP_QML
137		: passwordType === NumberModel.PASSWORD_PUK ? qsTr("PUK entry")
138		//: LABEL DESKTOP_QML
139		: passwordType === NumberModel.PASSWORD_REMOTE_PIN ? qsTr("Pairing code")
140		: console.error("Unknown type")) + SettingsModel.translationTrigger
	133	text: (passwordType === NumberModel.PASSWORD_CAN ? qsTr("Enter CAN")
	134	//: LABEL DESKTOP_QML
	135	: passwordType === NumberModel.PASSWORD_PUK ? qsTr("Enter PUK")
	136	//: LABEL DESKTOP_QML
	137	: passwordType === NumberModel.PASSWORD_REMOTE_PIN ? qsTr("Enter pairing code")
	138	//: LABEL DESKTOP_QML
	139	: NumberModel.requestTransportPin ? qsTr("Enter Transport PIN")
	140	//: LABEL DESKTOP_QML
	141	: qsTr("Enter PIN")) + SettingsModel.translationTrigger
141	142	textStyle: Style.text.header_inverse
142	143	horizontalAlignment: Text.AlignHCenter
143	144

168	169	if (passwordType === NumberModel.PASSWORD_PIN) {
169	170	if (NumberModel.requestTransportPin) {
170	171	return ("%1<br><a href=\"#\">%2</a>").arg(
171		//: INFO DESKTOP_QML The AA2 expects a PIN with 5 digits which can be entered via the physical or onscreen keyboard
172		qsTr("Please enter your 5-digit Transport PIN. Use the keyboard or numpad.")
	172	//: INFO DESKTOP_QML The AA2 expects the Transport PIN with five digits.
	173	qsTr("Please enter the five-digit Transport PIN.")
173	174	).arg(
174	175	//: INFO DESKTOP_QML Link text
175	176	qsTr("More information")
176	177	)
177	178	} else {
178	179	return ("%1<br><a href=\"#\">%2</a>").arg(
179		//: INFO DESKTOP_QML The AA2 expects a PIN with 6 digits which can be entered via the physical or onscreen keyboard.
180		qsTr("Please enter your 6-digit PIN. Use the keyboard or numpad.")
	180	ApplicationModel.currentWorkflow === "changepin"
	181	//: INFO DESKTOP_QML The AA2 expects the current PIN with six digits in a PIN change.
	182	? qsTr("Please enter your current six-digit PIN.")
	183	//: INFO DESKTOP_QML The AA2 expects a PIN with six digits in an authentication.
	184	: qsTr("Please enter your six-digit PIN.")
181	185	).arg(
182	186	//: INFO DESKTOP_QML Link text
183	187	qsTr("More information")

185	189	}
186	190	}
187	191	if (passwordType === NumberModel.PASSWORD_CAN) {
188		if (NumberModel.isCanAllowedMode) {
189		return ("%1<br><a href=\"#\">%2</a>").arg(
190		//: INFO DESKTOP_QML The operator is required to enter the 6-digit CAN in CAN-allowed authentication.
191		qsTr("Please enter the 6-digit card access number (CAN).")
192		).arg(
193		//: INFO DESKTOP_QML Link text
194		qsTr("More information")
195		)
196		}
197	192	return ("%1<br><a href=\"#\">%2</a>").arg(
198		//: INFO DESKTOP_QML The PIN was entered wrongfully twice, this may have happened during an earlier session of the AA2, too. The user needs to enter the CAN for additional verification.
199		qsTr("A wrong PIN has been entered twice on your ID card. Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. You can find your card access number (CAN) on the front of your ID card.")
	193	//: INFO DESKTOP_QML The user is required to enter the six-digit CAN in CAN-allowed authentication.
	194	qsTr("Please enter the six-digit Card Access Number (CAN). You can find your Card Access Number (CAN) in the bottom right on the front of the ID card.")
	195	).arg(
	196	//: INFO DESKTOP_QML Link text
	197	qsTr("More information")
	198	)
	199	}
	200	if (passwordType === NumberModel.PASSWORD_PUK) {
	201	return ("%1<br><a href=\"#\">%2</a>").arg(
	202	//: INFO DESKTOP_QML The PUK is required to unlock the ID card.
	203	qsTr("The PIN of your ID card is blocked after three incorrect attempts. Please enter the Personal Unblocking Key (PUK) to lift the block. You can find the key in your PIN letter.")
200	204	).arg(
201	205	//: INFO DESKTOP_QML Link text
202	206	qsTr("More information")
203	207	)
204	208	}
205		if (passwordType === NumberModel.PASSWORD_PUK) {
206		return ("%1<br><a href=\"#\">%2</a>").arg(
207		//: INFO DESKTOP_QML The PUK is required to unlock the ID card.
208		qsTr("The PIN of your ID card is blocked after three incorrect tries. The block can be lifted by entering your personal unblocking key (PUK).")
209		).arg(
210		//: INFO DESKTOP_QML Link text
211		qsTr("More information")
212		)
213		}
214	209	if (passwordType === NumberModel.PASSWORD_NEW_PIN) {
215	210	if (numberField.inputConfirmation === "") {
216		//: INFO DESKTOP_QML A new 6-digit PIN needs to be supplied.
217		return qsTr("Please enter a new 6-digit PIN now.")
	211	//: INFO DESKTOP_QML A new six-digit PIN needs to be supplied.
	212	return qsTr("Please enter a new six-digit PIN now.")
218	213	} else {
219	214	//: INFO DESKTOP_QML The new PIN needs to be entered again for verification.
220		return qsTr("Please confirm your new 6-digit PIN.")
	215	return qsTr("Please confirm your new six-digit PIN.")
221	216	}
222	217	}
223	218	if (passwordType === NumberModel.PASSWORD_REMOTE_PIN) {
224	219	return ("%1<br><a href=\"#\">%2</a>").arg(
225	220	//: INFO DESKTOP_QML The pairing code needs to be supplied.
226		qsTr("Start the pairing on your smartphone and enter the shown pairing code in order to use your smartphone as a card reader (SaC).")
	221	qsTr("Start the pairing on your smartphone and enter the pairing code shown there in order to use your smartphone as a card reader (SaC).")
227	222	).arg(
228	223	//: INFO DESKTOP_QML Link text
229	224	qsTr("More information")

284	279	textStyle: Style.text.hint_inverse
285	280	textFormat: Text.StyledText
286	281	text: "<a href=\"#\">" + (NumberModel.requestTransportPin ?
287		//: LABEL DESKTOP_QML Button to switch to a 6-digit PIN.
288		qsTr("Does your PIN have 6 digits?") :
289		//: LABEL DESKTOP_QML Button to switch to a transport PIN or start a change of the transport PIN.
290		qsTr("Does your PIN have 5 digits?")
	282	//: LABEL DESKTOP_QML Button to switch to a six-digit PIN.
	283	qsTr("Does your PIN have six digits?") :
	284	//: LABEL DESKTOP_QML Button to switch to a Transport PIN or start a change of the Transport PIN.
	285	qsTr("Does your PIN have five digits?")
291	286	) + "</a>" + SettingsModel.translationTrigger
292	287	linkColor: textStyle.textColor
293	288	onLinkActivated: baseItem.changePinLength()

+8

-9

resources/qml/Governikus/EnterPasswordView/+desktop/PasswordInfoView.qml less more

28	28	Keys.onEscapePressed: close()
29	29
30	30	titleBarAction: TitleBarAction {
31		rootEnabled: false
	31	rootEnabled: ApplicationModel.currentWorkflow === ""
32	32	showSettings: false
33	33	text: headline.text
34	34	showHelp: false

47	47
48	48	wrapMode: Text.WordWrap
49	49	//: LABEL DESKTOP_QML
50		text: (passwordType === NumberModel.PASSWORD_PIN ? qsTr("PIN information")
51		//: LABEL DESKTOP_QML
52		: passwordType === NumberModel.PASSWORD_CAN ? qsTr("CAN information")
	50	text: (passwordType === NumberModel.PASSWORD_CAN ? qsTr("CAN information")
53	51	//: LABEL DESKTOP_QML
54	52	: passwordType === NumberModel.PASSWORD_PUK ? qsTr("PUK information")
55	53	//: LABEL DESKTOP_QML
56	54	: passwordType === NumberModel.PASSWORD_REMOTE_PIN ? qsTr("Smartphone as card reader information")
57		: console.error("Unknown type")) + SettingsModel.translationTrigger
	55	//: LABEL DESKTOP_QML
	56	: qsTr("PIN information")) + SettingsModel.translationTrigger
58	57	textStyle: Style.text.header_inverse
59	58	FocusFrame {}
60	59	}

75	74
76	75	if (passwordType === NumberModel.PASSWORD_CAN && NumberModel.isCanAllowedMode) {
77	76	//: INFO DESKTOP_QML Description text of CAN-allowed authentication
78		return qsTr("The card access number (CAN) allows to access the imprinted data of the ID card. In order to allow on-site reading of the personal data the service provider needs to acquire governmental authorization to do so. On-site reading is usually employed to automatically fill forms and prevent spelling mistakes when transfering the personal data.")
	77	return qsTr("The Card Access Number (CAN) allows to access the imprinted data of the ID card. In order to allow on-site reading of the personal data the service provider needs to acquire governmental authorization to do so. On-site reading is usually employed to automatically fill forms and prevent spelling mistakes when transfering the personal data.")
79	78	}
80	79	if (passwordType === NumberModel.PASSWORD_CAN && !NumberModel.isCanAllowedMode) {
81	80	//: INFO DESKTOP_QML Description text of CAN if required for third PIN attempt
82		return qsTr("The card access number (CAN) is required if the PIN has already been entered incorrectly twice. In order to prevent a third incorrect entry and thus the blocking of the PIN without your consent, the CAN is also requested at this point. The CAN is a 6-digit number that can be found on the front of the ID card. It is located at the bottom right next to the validity date (marked in red).")
	81	return qsTr("The Card Access Number (CAN) is required if the PIN has already been entered incorrectly twice. In order to prevent a third incorrect entry and thus the blocking of the PIN without your consent, the CAN is also requested at this point. The CAN is a six-digit number that can be found on the front of the ID card. It is located at the bottom right next to the validity date (marked in red).")
83	82	}
84	83	if (passwordType === NumberModel.PASSWORD_PUK) {
85	84	//: INFO DESKTOP_QML Description text of PUK
86		return qsTr("The personal unblocking key (PUK) is required if the PIN has been entered three times. At this point the PIN is blocked. The PUK is a 10-digit number you received with the letter sent to you by your competent authority (marked in red). Please note that you can only use the PUK to unblock the PIN entry. If you have forgotten your PIN, you can have a new PIN set at your competent authority.")
	85	return qsTr("The Personal Unblocking Key (PUK) is required if the PIN has been entered three times. At this point the PIN is blocked. The PUK is a ten-digit number you received with the letter sent to you by your competent authority (marked in red). Please note that you can only use the PUK to unblock the PIN entry. If you have forgotten your PIN, you can have a new PIN set at your competent authority.")
87	86	}
88	87	if (passwordType === NumberModel.PASSWORD_REMOTE_PIN) {
89	88	//: INFO DESKTOP_QML Description text of SaC pairing

91	90	}
92	91
93	92	//: INFO DESKTOP_QML Description text of PIN
94		return qsTr("The personal identification number (PIN) is chosen by you and is required for every use of the online eID function. You can change it anytime and indefinitely if you know your valid PIN. For your 6-digit PIN choose a combination of numbers, that is not easy to guess, neither \"123456\" nor your birth date, or any other numbers printed on the ID card. If you are no longer aware of your valid PIN, you will need to contact the authority responsible for issuing your identification card to renew your PIN.<br><br>When changing the PIN for the first time, please use your 5-digit transport PIN. You will find the transport PIN in the letter you received from the authority responsible for issuing your identification card (marked in red) after you have applied for your identity card.<br><br>Please note that you can not use the online eID function with your 5-digit transport PIN. A change to a 6-digit PIN is mandatory.")
	93	return qsTr("The Personal Identification Number (PIN) is chosen by you and is required for every use of the online eID function. You can change it anytime and indefinitely if you know your valid PIN. For your six-digit PIN choose a combination of numbers, that is not easy to guess, neither \"123456\" nor your birth date, or any other numbers printed on the ID card. If you are no longer aware of your valid PIN, you will need to contact the authority responsible for issuing your identification card to renew your PIN.<br><br>When changing the PIN for the first time, please use the five-digit Transport PIN. You will find the Transport PIN in the letter you received from the authority responsible for issuing your identification card (marked in red) after you have applied for your identity card.<br><br>Please note that you can not use the online eID function with the five-digit Transport PIN. A change to a six-digit PIN is mandatory.")
95	94	}
96	95	textStyle: Style.text.header_inverse
97	96	horizontalAlignment: Text.AlignJustify

+23

-19

resources/qml/Governikus/EnterPasswordView/+mobile/EnterPasswordView.qml less more

7	7	import Governikus.Global 1.0
8	8	import Governikus.Style 1.0
9	9	import Governikus.View 1.0
	10	import Governikus.Type.ApplicationModel 1.0
10	11	import Governikus.Type.SettingsModel 1.0
11	12	import Governikus.Type.RemoteServiceModel 1.0
12	13	import Governikus.Type.NumberModel 1.0

16	17	{
17	18	id: baseItem
18	19	property alias enableTransportPinLink: transportPinLink.enableTransportPinLink
19		signal passwordEntered()
	20	signal passwordEntered(bool pWasNewPin)
20	21	signal changePinLength()
21	22
22	23	onVisibleChanged: {

76	77	if (baseItem.state === "CAN") {
77	78	if (NumberModel.isCanAllowedMode) {
78	79	//: INFO ANDROID IOS The CAN needs to be entered in CAN-allowed mode, hint where the CAN can be found.
79		return qsTr("Please enter the 6-digit card access number (CAN). You can find it on the front of the ID card.")
	80	return qsTr("Please enter the six-digit Card Access Number (CAN). You can find it in the bottom right on the front of the ID card.")
80	81	}
81	82	//: INFO ANDROID IOS The wrong PIN was entered twice, the third attempt requires the CAN for additional verification, hint where the CAN is found.
82		return qsTr("A wrong PIN has been entered twice on your ID card. Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. You can find your card access number (CAN) on the front of your ID card.")
	83	return qsTr("A wrong PIN has been entered twice on your ID card. For a third attempt, please first enter the six-digit Card Access Number (CAN). You can find your Card Access Number (CAN) in the bottom right on the front of your ID card.")
83	84	}
84	85	if (baseItem.state === "PUK") {
85	86	//: INFO ANDROID IOS The PUK is required to unlock the ID card since the wrong PIN entered three times.
86	87	return qsTr("A wrong PIN has been entered three times on your ID card. Your PIN is now blocked. To unblock your PIN you have to enter the PUK.")
87	88	}
88	89	if (baseItem.state === "PIN_NEW") {
89		//: INFO ANDROID IOS A new 6-digit PIN needs to be supplied.
90		return qsTr("Please enter a new 6-digit PIN now.")
	90	//: INFO ANDROID IOS A new six-digit PIN needs to be supplied.
	91	return qsTr("Please enter a new six-digit PIN now.")
91	92	}
92	93	if (baseItem.state === "PIN_NEW_AGAIN") {
93	94	//: INFO ANDROID IOS The new PIN needs to be confirmed.
94		return qsTr("Please confirm your new 6-digit PIN.")
	95	return qsTr("Please confirm your new six-digit PIN.")
95	96	}
96	97	if (baseItem.state === "PIN" && NumberModel.requestTransportPin) {
97		//: INFO ANDROID IOS The transport PIN is required by AA2, it needs to be change to an actual PIN.
98		return qsTr("Please enter the transport PIN from your PIN letter.")
	98	//: INFO ANDROID IOS The Transport PIN is required by AA2, it needs to be change to an actual PIN.
	99	return qsTr("Please enter the Transport PIN from your PIN letter.")
99	100	}
100	101	if (baseItem.state === "REMOTE_PIN") {
101	102	//: INFO ANDROID IOS The pairing code for the smartphone is required.
102	103	return qsTr("Enter the pairing code shown on the device you want to pair.")
103	104	}
104		//: LABEL ANDROID IOS
105		return qsTr("Please enter your PIN.")
	105	return ApplicationModel.currentWorkflow === "changepin"
	106	//: LABEL ANDROID IOS
	107	? qsTr("Please enter your current PIN.")
	108	//: LABEL ANDROID IOS
	109	: qsTr("Please enter your PIN.")
106	110	}
107	111	}
108	112

148	152	Accessible.onPressAction: if (Qt.platform.os === "ios") myMouse.clicked(null)
149	153
150	154	text: (NumberModel.requestTransportPin ?
151		//: LABEL ANDROID IOS Button to switch to a 6-digit PIN.
152		qsTr("Does your PIN have 6 digits?") :
153		//: LABEL ANDROID IOS Button to switch to a transport PIN or start a change of the transport PIN.
154		qsTr("Does your PIN have 5 digits?")
	155	//: LABEL ANDROID IOS Button to switch to a six-digit PIN.
	156	qsTr("Does your PIN have six digits?") :
	157	//: LABEL ANDROID IOS Button to switch to a Transport PIN or start a change of the Transport PIN.
	158	qsTr("Does your PIN have five digits?")
155	159	) + SettingsModel.translationTrigger
156	160	textStyle: Style.text.hint_accent
157	161	font.underline: true

185	189	switch(baseItem.state) {
186	190	case "PIN":
187	191	NumberModel.pin = pinField.text
188		baseItem.passwordEntered()
	192	baseItem.passwordEntered(false)
189	193	break
190	194	case "PIN_NEW":
191	195	pinField.inputConfirmation = pinField.text

194	198	break
195	199	case "PIN_NEW_AGAIN":
196	200	NumberModel.newPin = pinField.text
197		baseItem.passwordEntered()
	201	baseItem.passwordEntered(true)
198	202	break
199	203	case "CAN":
200	204	NumberModel.can = pinField.text
201		baseItem.passwordEntered()
	205	baseItem.passwordEntered(false)
202	206	break
203	207	case "PUK":
204	208	NumberModel.puk = pinField.text
205		baseItem.passwordEntered()
	209	baseItem.passwordEntered(false)
206	210	break
207	211	case "REMOTE_PIN":
208	212	RemoteServiceModel.connectToRememberedServer(pinField.text)
209		baseItem.passwordEntered()
	213	baseItem.passwordEntered(false)
210	214	break
211	215	}
212	216	}

+1

-1

resources/qml/Governikus/FeedbackView/+desktop/DetachedLogView.qml less more

67	67
68	68	onClicked: {
69	69	let filenameSuggestion = LogModel.createLogFileName(LogModel.getCurrentLogfileDate())
70		appWindow.openSaveFileDialog(LogModel.saveCurrentLogfile, filenameSuggestion, "log")
	70	appWindow.openSaveFileDialog(LogModel.saveCurrentLogfile, filenameSuggestion, qsTr("Logfiles"), "log")
71	71	}
72	72	}
73	73	}

+4

-2

resources/qml/Governikus/FeedbackView/+desktop/LogView.qml less more

68	68	tintIcon: true
69	69	onClicked: {
70	70	let filenameSuggestion = LogModel.createLogFileName(LogModel.getCurrentLogfileDate())
71		appWindow.openSaveFileDialog(LogModel.saveCurrentLogfile, filenameSuggestion, "log")
	71	appWindow.openSaveFileDialog(LogModel.saveCurrentLogfile, filenameSuggestion, qsTr("Logfiles"), "log")
72	72	}
73	73	}
74	74

146	146	model: LogModel
147	147	spacing: Constants.text_spacing
148	148	delegate: LogViewDelegate {
149		width: parent.width - 2 * Constants.pane_padding
	149	width: logView.width - 2 * Constants.pane_padding
150	150	}
151	151
152	152	Connections {

173	173
174	174	property bool deleteAll: true
175	175
	176	width: ApplicationModel.scaleFactor * 600
	177
176	178	title: (deleteAll ?
177	179	//: LABEL DESKTOP_QML
178	180	qsTr("Delete old logfiles") :

+1

-1

resources/qml/Governikus/FeedbackView/+mobile/LogView.qml less more

64	64	Accessible.description: qsTr("Select logfile from list.") + SettingsModel.translationTrigger
65	65
66	66	model: LogModel.logFiles
67		onActivated: LogModel.setLogfile(comboBox.currentIndex)
	67	onCurrentIndexChanged: LogModel.setLogfile(currentIndex)
68	68	}
69	69	}
70	70

+0

-8

~~resources/qml/Governikus/Global/+desktop/+mac/BrandConstants.qml~~ less more

0		/*
1		* \copyright Copyright (c) 2018-2020 Governikus GmbH & Co. KG, Germany
2		*/
3
4		import QtQuick 2.10
5
6		Item {
7		}

+0

-8

~~resources/qml/Governikus/Global/+desktop/+win/BrandConstants.qml~~ less more

0		/*
1		* \copyright Copyright (c) 2018-2020 Governikus GmbH & Co. KG, Germany
2		*/
3
4		import QtQuick 2.10
5
6		Item {
7		}

+2

-0

resources/qml/Governikus/Global/+desktop/Pane.qml less more

61	61
62	62	width: Math.min(parent.width, implicitWidth)
63	63
	64	elide: Text.ElideRight
	65	maximumLineCount: 1
64	66	textStyle: Style.text.header_accent
65	67
66	68	FocusFrame {

+1

-1

resources/qml/Governikus/Global/+desktop/PlatformConstants.qml less more

6	6	import Governikus.Type.ApplicationModel 1.0
7	7	import Governikus.Type.ApplicationModel 1.0
8	8
9		BrandConstants {
	9	Item {
10	10	readonly property int component_spacing: ApplicationModel.scaleFactor * 30
11	11	readonly property int pane_padding: ApplicationModel.scaleFactor * 30
12	12	readonly property int pane_spacing: ApplicationModel.scaleFactor * 30

+2

-1

resources/qml/Governikus/Global/+desktop/TabbedPane.qml less more

76	76	scrollBarTopPadding: Constants.text_spacing
77	77	scrollBarBottomPadding: Constants.text_spacing
78	78	scrollBarAutohide: true
	79	onCurrentIndexChanged: flickable.positionViewAtBeginning()
79	80	}
80	81
81	82	Loader {

169	170
170	171	activeFocusOnTab: false
171	172	Accessible.role: Accessible.PageTab
172		Accessible.name: delegateLoader.item.sectionName
	173	Accessible.name: delegateLoader.item ? delegateLoader.item.sectionName : ""
173	174
174	175	width: parent.width
175	176	height: delegateLoader.height + 2 * Constants.pane_padding

+5

-3

resources/qml/Governikus/Global/+mobile/GSwitch.qml less more

10	10	Switch {
11	11	id: control
12	12
13		property color color: Style.color.accent
	13	property color color: Style.color.switch_checked
14	14
15	15	Accessible.onPressAction: if (Qt.platform.os === "ios") toggle()
16	16

31	31	y: parent.height / 2 - height / 2
32	32	radius: height / 2
33	33
34		color: control.checked ? Qt.lighter(control.color, 1.4) : Qt.darker(Style.color.accent_disabled, 1.1)
	34	color: control.enabled ? (control.checked ? Qt.lighter(control.color, 1.3) : Qt.darker(Style.color.accent_disabled, 1.4)) : Qt.darker(Style.color.accent_disabled, 1.1)
35	35	}
36	36
37	37	Rectangle {

39	39	height: parent.height
40	40	x: control.checked ? parent.width - width : 0
41	41	radius: height / 2
	42	border.width: control.enabled && !control.checked ? Style.dimens.separator_size : 0
	43	border.color: Style.color.border
42	44
43		color: control.checked ? control.color : Style.color.accent_disabled
	45	color: control.enabled ? (control.checked ? control.color : Style.color.switch_unchecked) : Style.color.accent_disabled
44	46
45	47	Behavior on x {
46	48	NumberAnimation {easing.type: Easing.InOutQuad; duration: 200}

+60

-38

resources/qml/Governikus/Global/BaseConfirmationPopup.qml less more

51	51	}
52	52
53	53	anchors.centerIn: Overlay.overlay
	54	contentWidth: Overlay.overlay ? Math.min(0.75 * Overlay.overlay.width, Style.dimens.max_text_width) : 0
54	55	margins: Constants.pane_padding
55	56	padding: 0
56	57	topPadding: Constants.pane_padding

62	63	background: Rectangle {
63	64	color: Style.color.background_popup
64	65	radius: Style.dimens.corner_radius_popup
	66	border.color: Style.color.border
	67	border.width: Style.dimens.popup_border
	68
	69	FocusPoint {
	70	anchors.margins: 4 * ApplicationModel.scaleFactor
	71
	72	scope: contentItem
	73	}
65	74	}
66	75
67		ColumnLayout {
68		id: contentLayout
	76	Item {
	77	id: contentItem
69	78
70		width: root.availableWidth
71		spacing: Constants.pane_padding
	79	implicitWidth: root.availableWidth
	80	implicitHeight: contentLayout.height
72	81
73		GText {
74		visible: text !== ""
75		Layout.fillWidth: true
76		Layout.rightMargin: Constants.pane_padding
77		Layout.leftMargin: Constants.pane_padding
	82	focus: true
	83	activeFocusOnTab: true
	84	Accessible.role: Accessible.Grouping
	85	Accessible.name: qsTr("Dialog") + SettingsModel.translationTrigger
	86	Keys.onEnterPressed: if (style & ConfirmationPopup.PopupStyle.OkButton) root.accept()
	87	Keys.onReturnPressed: if (style & ConfirmationPopup.PopupStyle.OkButton) root.accept()
78	88
79		activeFocusOnTab: true
	89	ColumnLayout {
	90	id: contentLayout
80	91
81		text: root.title
82		textStyle: root.headerTextStyle
83		font.bold: true
84		horizontalAlignment: root.horizontalTextAlignment
	92	width: parent.width
	93	spacing: Constants.pane_padding
85	94
86		FocusFrame {}
87		}
	95	GText {
	96	visible: text !== ""
	97	Layout.fillWidth: true
	98	Layout.rightMargin: Constants.pane_padding
	99	Layout.leftMargin: Constants.pane_padding
88	100
89		GText {
90		visible: text !== ""
91		Layout.fillWidth: true
92		Layout.rightMargin: Constants.pane_padding
93		Layout.leftMargin: Constants.pane_padding
	101	activeFocusOnTab: true
94	102
95		activeFocusOnTab: true
	103	text: root.title
	104	textStyle: root.headerTextStyle
	105	font.bold: true
	106	horizontalAlignment: root.horizontalTextAlignment
96	107
97		text: root.text
98		horizontalAlignment: root.horizontalTextAlignment
	108	FocusFrame {}
	109	}
99	110
100		FocusFrame {}
101		}
	111	GText {
	112	visible: text !== ""
	113	Layout.fillWidth: true
	114	Layout.rightMargin: Constants.pane_padding
	115	Layout.leftMargin: Constants.pane_padding
102	116
103		Column {
104		id: customContent
105		visible: children.length > 0
	117	activeFocusOnTab: true
106	118
107		Layout.fillWidth: true
108		Layout.rightMargin: Constants.pane_padding
109		Layout.leftMargin: Constants.pane_padding
110		}
	119	text: root.text
	120	horizontalAlignment: root.horizontalTextAlignment
111	121
112		Item {
113		id: buttonContainer
	122	FocusFrame {}
	123	}
114	124
115		Layout.fillWidth: true
116		height: childrenRect.height
	125	Column {
	126	id: customContent
	127	visible: children.length > 0
	128
	129	Layout.fillWidth: true
	130	Layout.rightMargin: Constants.pane_padding
	131	Layout.leftMargin: Constants.pane_padding
	132	}
	133
	134	Item {
	135	id: buttonContainer
	136
	137	Layout.fillWidth: true
	138	height: childrenRect.height
	139	}
117	140	}
118	141	}
119	142	}
120

+4

-0

resources/qml/Governikus/Global/GFlickable.qml less more

21	21
22	22	function scrollPageUp() {
23	23	Utils.scrollPageUp(baseItem)
	24	}
	25
	26	function positionViewAtBeginning() {
	27	contentY = originY
24	28	}
25	29
26	30	function highlightScrollbar() {

+92

-0

resources/qml/Governikus/Global/ProxyCredentialsPopup.qml less more

	0	/*
	1	* \copyright Copyright (c) 2020 Governikus GmbH & Co. KG, Germany
	2	*/
	3
	4	import QtQuick 2.10
	5
	6	import Governikus.Global 1.0
	7	import Governikus.Style 1.0
	8	import Governikus.View 1.0
	9	import Governikus.Type.ApplicationModel 1.0
	10	import Governikus.Type.SettingsModel 1.0
	11
	12
	13	ConfirmationPopup {
	14	id: proxyCredentials
	15
	16	property QtObject credentials
	17
	18	width: formGrid.width + 2 * Constants.pane_padding
	19
	20	//: LABEL DESKTOP Title of the proxy credentials popup.
	21	title: qsTr("Sign in") + SettingsModel.translationTrigger
	22	//: LABEL DESKTOP Text of the button in the proxy credentials popup.
	23	okButtonText: qsTr("Sign in") + SettingsModel.translationTrigger
	24
	25	onCredentialsChanged: {
	26	//: LABEL DESKTOP Text of the proxy credentials popup. An example for %1 is http://proxy.example.com:1337.
	27	text = qsTr("The proxy %1 requires username and password.").arg(credentials ? credentials.url : "")
	28	userInput.text = credentials ? credentials.proposedUser : ""
	29	passwordInput.text = ""
	30	}
	31
	32	Grid {
	33	id: formGrid
	34
	35	columns: 2
	36	spacing: Constants.component_spacing
	37	verticalItemAlignment: Text.AlignVCenter
	38
	39	GText {
	40	//: LABEL DESKTOP Accessible name.
	41	Accessible.name: qsTr("Proxy credential username") + SettingsModel.translationTrigger
	42
	43	activeFocusOnTab: true
	44	//: LABEL DESKTOP Label of the textfield for the username.
	45	text: qsTr("Username") + SettingsModel.translationTrigger
	46
	47	FocusFrame {}
	48	}
	49
	50	GTextField {
	51	id: userInput
	52
	53	width: 500 * ApplicationModel.scaleFactor
	54
	55	textStyle: Style.text.normal
	56	}
	57
	58	GText {
	59	//: LABEL DESKTOP Accessible name.
	60	Accessible.name: qsTr("Proxy credential password") + SettingsModel.translationTrigger
	61
	62	activeFocusOnTab: true
	63	//: LABEL DESKTOP Label of the textfield for the password.
	64	text: qsTr("Password") + SettingsModel.translationTrigger
	65
	66	FocusFrame {}
	67	}
	68
	69	GTextField {
	70	id: passwordInput
	71
	72	width: 500 * ApplicationModel.scaleFactor
	73
	74	textStyle: Style.text.normal
	75	echoMode: TextInput.Password
	76	}
	77	}
	78
	79	onConfirmed: {
	80	if (!credentials) return;
	81
	82	credentials.user = userInput.text
	83	credentials.password = passwordInput.text
	84	}
	85
	86	onClosed: {
	87	if (!credentials) return;
	88
	89	credentials.confirmInput()
	90	}
	91	}

+1

-0

resources/qml/Governikus/Global/qmldir less more

10	10
11	11	BinaryDecisionView 1.0 BinaryDecisionView.qml
12	12	ConfirmationPopup 1.0 ConfirmationPopup.qml
	13	ProxyCredentialsPopup 1.0 ProxyCredentialsPopup.qml
13	14	GButton 1.0 GButton.qml
14	15	GCheckBox 1.0 GCheckBox.qml
15	16	GComboBox 1.0 GComboBox.qml

+1

-1

resources/qml/Governikus/HistoryView/+desktop/HistoryView.qml less more

122	122	onClicked: {
123	123	let now = new Date().toLocaleDateString(Qt.locale(), "yyyy-MM-dd")
124	124	let filenameSuggestion = "%1.%2.%3.pdf".arg(Qt.application.name).arg(qsTr("History")).arg(now)
125		appWindow.openSaveFileDialog(HistoryModel.exportHistory, filenameSuggestion, "pdf")
	125	appWindow.openSaveFileDialog(HistoryModel.exportHistory, filenameSuggestion, qsTr("Portable Document Format"), "pdf")
126	126	}
127	127	}
128	128	}

+1

-0

resources/qml/Governikus/HistoryView/+desktop/HistoryViewDetails.qml less more

49	49	LabeledText {
50	50	id: purpose
51	51
	52	visible: text !== ""
52	53	Layout.fillWidth: true
53	54
54	55	activeFocusOnTab: true

+2

-0

resources/qml/Governikus/HistoryView/+mobile/HistoryViewDetails.qml less more

43	43	}
44	44
45	45	LabeledText {
	46	visible: text !== ""
	47
46	48	Accessible.onScrollDownAction: scrollPageDown()
47	49	Accessible.onScrollUpAction: scrollPageUp()
48	50

+8

-4

resources/qml/Governikus/IdentifyView/+desktop/EditRights.qml less more

157	157	Accessible.name: confirmButton.text
158	158
159	159	icon.source: "qrc:///images/npa.svg"
160		//: LABEL DESKTOP_QML %1 can be "card access number (CAN)" or "PIN"
	160	//: LABEL DESKTOP_QML %1 can be "CAN" or "PIN"
161	161	text: qsTr("Proceed to %1 entry").arg(
162	162	NumberModel.isCanAllowedMode ?
163	163	//: LABEL DESKTOP_QML Inserted into "Proceed to %1 entry"
164		qsTr("card access number (CAN)") :
	164	qsTr("CAN") :
165	165	//: LABEL DESKTOP_QML Inserted into "Proceed to %1 entry"
166	166	qsTr("PIN")
167	167	) + SettingsModel.translationTrigger

184	184	activeFocusOnTab: true
185	185	Accessible.name: dataIntroduction.text
186	186
187		//: LABEL DESKTOP_QML
188		text: qsTr("The following data will be transferred to the provider when you enter the PIN:") + SettingsModel.translationTrigger
	187	text: NumberModel.isCanAllowedMode
	188	//: LABEL DESKTOP_QML
	189	? qsTr("The following data of the ID card will be transferred to the provider when you enter the CAN:")
	190	//: LABEL DESKTOP_QML
	191	: qsTr("The following data of your ID card will be transferred to the provider when you enter the PIN:")
	192	+ SettingsModel.translationTrigger
189	193	textStyle: Style.text.normal_inverse
190	194
191	195	FocusFrame {}

+6

-1

resources/qml/Governikus/IdentifyView/+desktop/IdentifyController.qml less more

82	82	controller.workflowState = IdentifyController.WorkflowStates.Initial
83	83	break
84	84	case "StateEditAccessRights":
85		controller.nextView(IdentifyView.SubViews.AccessRights)
	85	if (NumberModel.isCanAllowedMode && SettingsModel.skipRightsOnCanAllowed) {
	86	chatModel.transferAccessRights()
	87	AuthModel.continueWorkflow()
	88	} else {
	89	controller.nextView(IdentifyView.SubViews.AccessRights)
	90	}
86	91	AuthModel.setInitialPluginType()
87	92	break
88	93	case "StateSelectReader":

+24

-19

resources/qml/Governikus/IdentifyView/+desktop/IdentifyView.qml less more

46	46	function showSettings() {
47	47	readerView.precedingView = d.activeView
48	48	d.view = IdentifyView.SubViews.ReaderSettings
49		ApplicationWindow.menuBar.updateActions()
	49	appWindow.menuBar.updateActions()
50	50	}
51	51
52	52	activeFocusOnTab: true

66	66	editRights.showProviderInformation(false)
67	67	if (d.activeView === IdentifyView.SubViews.PasswordInfo \|\| d.activeView === IdentifyView.SubViews.PasswordLength) {
68	68	d.view = IdentifyView.SubViews.Password
69		ApplicationWindow.menuBar.updateActions()
	69	appWindow.menuBar.updateActions()
70	70	}
71	71	else if (d.activeView === IdentifyView.SubViews.ReaderSettings) {
72	72	d.view = readerView.precedingView
73		ApplicationWindow.menuBar.updateActions()
	73	appWindow.menuBar.updateActions()
74	74	}
75	75	}
76	76

106	106	visible: d.activeView === IdentifyView.SubViews.ReaderSettings
107	107	onCloseView: {
108	108	d.view = precedingView
109		ApplicationWindow.menuBar.updateActions()
	109	appWindow.menuBar.updateActions()
110	110	}
111	111	}
112	112

126	126	BinaryDecisionView {
127	127	visible: d.activeView === IdentifyView.SubViews.TransportPinReminder
128	128
129		questionText: qsTr("Did you change the transport PIN already?") + SettingsModel.translationTrigger
130		questionSubText: qsTr("Prior to the first use of the online identification function you have to replace the transport PIN by an individual 6-digit PIN. Online identification with transport PIN is not possible.") + SettingsModel.translationTrigger
131		disagreeText: qsTr("No, change transport PIN now") + SettingsModel.translationTrigger
	129	questionText: qsTr("Did you change the Transport PIN already?") + SettingsModel.translationTrigger
	130	questionSubText: qsTr("Prior to the first use of the online identification function you have to replace the Transport PIN by an individual six-digit PIN. Online identification with Transport PIN is not possible.") + SettingsModel.translationTrigger
	131	disagreeText: qsTr("No, change Transport PIN now") + SettingsModel.translationTrigger
132	132
133	133	onDisagree: {
134	134	SettingsModel.transportPinReminder = false

188	188
189	189	onChangePinLength: {
190	190	d.view = IdentifyView.SubViews.PasswordLength
191		ApplicationWindow.menuBar.updateActions()
	191	appWindow.menuBar.updateActions()
192	192	}
193	193
194	194	onRequestPasswordInfo: {
195	195	d.view = IdentifyView.SubViews.PasswordInfo
196		ApplicationWindow.menuBar.updateActions()
	196	appWindow.menuBar.updateActions()
197	197	}
198	198	}
199	199

204	204
205	205	onClose: {
206	206	d.view = IdentifyView.SubViews.Password
207		ApplicationWindow.menuBar.updateActions()
	207	appWindow.menuBar.updateActions()
208	208	}
209	209	}
210	210

221	221	customSubAction: CancelAction {
222	222	onClicked: {
223	223	d.view = IdentifyView.SubViews.Password
224		ApplicationWindow.menuBar.updateActions()
	224	appWindow.menuBar.updateActions()
225	225	}
226	226	}
227	227	}
228	228	resultType: ResultView.Type.IsInfo
229		//: INFO DESKTOP_QML The user clicked that the current PIN has 5 digits (transport PIN) which needs to be changed to a 6-digit PIN. The current process will be aborted and needs to be restarted manually by the user.
230		text: qsTr("First you have to change your 5-digit transport PIN you received in your in PIN letter into a 6-digit PIN. You are currently leaving the started process and are forwarded to the PIN management. Please restart the desired process after the PIN has been changed.") + SettingsModel.translationTrigger
	229	//: INFO DESKTOP_QML The user clicked that the current PIN has five digits (Transport PIN) which needs to be changed to a six-digit PIN. The current process will be aborted and needs to be restarted manually by the user.
	230	text: qsTr("First you have to change your five-digit Transport PIN you received in your in PIN letter into a six-digit PIN. You are currently leaving the started process and are forwarded to the PIN management. Please restart the desired process after the PIN has been changed.") + SettingsModel.translationTrigger
231	231	onNextView: {
232	232	ChangePinModel.startWorkflow()
233	233	AuthModel.cancelWorkflowToChangePin()

271	271	SettingsModel.translationTrigger
272	272	if (connectivityManager.networkInterfaceActive) {
273	273	//: INFO DESKTOP_QML Information message about cancellation process with present network connectivity
274		return qsTr("Please wait a moment...")
	274	return qsTr("Please wait a moment.")
275	275	}
276	276	//: INFO DESKTOP_QML Information message about cancellation process without working network connectivity
277	277	return qsTr("Network problemes detected, trying to reach server within 30 seconds.")

300	300	}
301	301	if (!inProgress \|\| AuthModel.error) {
302	302	//: INFO DESKTOP_QML Generic progress status message while no card communication is active.
303		return qsTr("Please wait a moment...")
	303	return qsTr("Please wait a moment.")
304	304	}
305	305	if (AuthModel.isBasicReader) {
306	306	//: INFO DESKTOP_QML Second line text if a basic card reader is used and data is exchanged with the card/server in the background. Is not actually visible since the basic reader password handling is done by EnterPasswordView.
307		return qsTr("Please don't move the ID card...")
	307	return qsTr("Please don't move the ID card.")
308	308	}
309	309	if (!!NumberModel.inputError) {
310	310	return NumberModel.inputError

314	314	return qsTr("The online identification function of your ID card is not activated. Please contact the authority responsible for issuing your identification card to activate the online identification function.")
315	315	}
316	316	//: INFO DESKTOP_QML Generic progress status message during authentication.
317		return qsTr("Please wait a moment...")
	317	return qsTr("Please wait a moment.")
318	318	}
319	319	subTextColor: !AuthModel.isBasicReader && (NumberModel.inputError \|\| NumberModel.pinDeactivated) ? Style.color.warning_text : Style.color.secondary_text_inverse
320	320	progressValue: AuthModel.progressValue

325	325	SelfAuthenticationData {
326	326	visible: d.activeView === IdentifyView.SubViews.Data
327	327
328		onVisibleChanged: ApplicationWindow.menuBar.updateActions()
	328	onVisibleChanged: appWindow.menuBar.updateActions()
329	329	onNextView: {
330	330	identifyView.nextView(pName)
331	331	AuthModel.continueWorkflow()

339	339
340	340	resultType: AuthModel.resultString ? ResultView.Type.IsError : ResultView.Type.IsSuccess
341	341	text: AuthModel.resultString
	342	header: AuthModel.errorHeader
	343	//: INFO DESKTOP_QML Error code (string) of current GlobalStatus code, shown as header of popup.
	344	popupTitle: qsTr("Error code: %1").arg(AuthModel.statusCode) + SettingsModel.translationTrigger
	345	popupText: AuthModel.errorText
	346	supportButtonsVisible: AuthModel.error && !AuthModel.isCancellationByUser()
	347
342	348	onNextView: {
343	349	identifyView.nextView(pName)
344	350	AuthModel.continueWorkflow()
345	351	}
346		emailButtonVisible: AuthModel.error && !AuthModel.isCancellationByUser()
347	352	onEmailButtonPressed: AuthModel.sendResultMail()
348	353	}
349	354	}

+1

-1

resources/qml/Governikus/IdentifyView/+desktop/SelfAuthenticationData.qml less more

121	121	onClicked: {
122	122	let now = new Date().toLocaleDateString(Qt.locale(), "yyyy-MM-dd")
123	123	let filenameSuggestion = "%1.%2.%3.pdf".arg(Qt.application.name).arg(qsTr("Information")).arg(now)
124		appWindow.openSaveFileDialog(SelfAuthModel.exportData, filenameSuggestion, "pdf")
	124	appWindow.openSaveFileDialog(SelfAuthModel.exportData, filenameSuggestion, qsTr("Portable Document Format"), "pdf")
125	125	}
126	126	}
127	127

+8

-4

resources/qml/Governikus/IdentifyView/+mobile/+android/+phone/EditRights.qml less more

97	97	GButton {
98	98	icon.source: "qrc:///images/npa.svg"
99	99	anchors.horizontalCenter: parent.horizontalCenter
100		//: LABEL ANDROID_PHONE %1 can be "card access number (CAN)" or "PIN"
	100	//: LABEL ANDROID_PHONE %1 can be "CAN" or "PIN"
101	101	text: qsTr("Proceed to %1 entry").arg(
102	102	NumberModel.isCanAllowedMode ?
103	103	//: LABEL ANDROID_PHONE Inserted into "Proceed to %1 entry"
104		qsTr("card access number (CAN)") :
	104	qsTr("CAN") :
105	105	//: LABEL ANDROID_PHONE Inserted into "Proceed to %1 entry"
106	106	qsTr("PIN")
107	107	) + SettingsModel.translationTrigger

114	114	GText {
115	115	width: parent.width
116	116
117		//: LABEL ANDROID_PHONE
118		text: qsTr("The following data will be transferred to the provider when you enter the PIN:") + SettingsModel.translationTrigger
	117	text: NumberModel.isCanAllowedMode
	118	//: LABEL ANDROID_PHONE
	119	? qsTr("The following data of the ID card will be transferred to the provider when you enter the CAN:")
	120	//: LABEL ANDROID_PHONE
	121	: qsTr("The following data of your ID card will be transferred to the provider when you enter the PIN:")
	122	+ SettingsModel.translationTrigger
119	123	}
120	124
121	125	Pane {

+9

-5

resources/qml/Governikus/IdentifyView/+mobile/+android/+tablet/EditRights.qml less more

14	14
15	15
16	16	SectionPage {
17		id: root
	17	id: baseItem
18	18
19	19	navigationAction: NavigationAction {
20	20	state: "cancel"

92	92	icon.source: "qrc:///images/npa.svg"
93	93	anchors.horizontalCenter: parent.horizontalCenter
94	94	anchors.verticalCenter: parent.verticalCenter
95		//: LABEL ANDROID_TABLET %1 can be "card access number (CAN)" or "PIN"
	95	//: LABEL ANDROID_TABLET %1 can be "CAN" or "PIN"
96	96	text: qsTr("Proceed to %1 entry").arg(
97	97	NumberModel.isCanAllowedMode ?
98	98	//: LABEL ANDROID_TABLET Inserted into "Proceed to %1 entry"
99		qsTr("card access number (CAN)") :
	99	qsTr("CAN") :
100	100	//: LABEL ANDROID_TABLET Inserted into "Proceed to %1 entry"
101	101	qsTr("PIN")
102	102	) + SettingsModel.translationTrigger

112	112	GText {
113	113	width: parent.width
114	114
115		//: LABEL ANDROID_TABLET
116		text: qsTr("The following data will be transferred to the provider when you enter the PIN:") + SettingsModel.translationTrigger
	115	text: NumberModel.isCanAllowedMode
	116	//: LABEL ANDROID_TABLET
	117	? qsTr("The following data of the ID card will be transferred to the provider when you enter the CAN:")
	118	//: LABEL ANDROID_TABLET
	119	: qsTr("The following data of your ID card will be transferred to the provider when you enter the PIN:")
	120	+ SettingsModel.translationTrigger
117	121	}
118	122
119	123	Pane {

+8

-4

resources/qml/Governikus/IdentifyView/+mobile/+ios/+phone/EditRights.qml less more

106	106	GButton {
107	107	icon.source: "qrc:///images/npa.svg"
108	108	anchors.horizontalCenter: parent.horizontalCenter
109		//: LABEL IOS_PHONE %1 can be "card access number (CAN)" or "PIN"
	109	//: LABEL IOS_PHONE %1 can be "CAN" or "PIN"
110	110	text: qsTr("Proceed to %1 entry").arg(
111	111	NumberModel.isCanAllowedMode ?
112	112	//: LABEL IOS_PHONE Inserted into "Proceed to %1 entry"
113		qsTr("card access number (CAN)") :
	113	qsTr("CAN") :
114	114	//: LABEL IOS_PHONE Inserted into "Proceed to %1 entry"
115	115	qsTr("PIN")
116	116	) + SettingsModel.translationTrigger

123	123	GText {
124	124	width: parent.width
125	125
126		//: LABEL IOS_PHONE
127		text: qsTr("The following data will be transferred to the provider when you enter the PIN:") + SettingsModel.translationTrigger
	126	text: NumberModel.isCanAllowedMode
	127	//: LABEL IOS_PHONE
	128	? qsTr("The following data of the ID card will be transferred to the provider when you enter the CAN:")
	129	//: LABEL IOS_PHONE
	130	: qsTr("The following data of your ID card will be transferred to the provider when you enter the PIN:")
	131	+ SettingsModel.translationTrigger
128	132	textStyle: Style.text.normal_secondary
129	133	}
130	134

+8

-4

resources/qml/Governikus/IdentifyView/+mobile/+ios/+tablet/EditRights.qml less more

104	104	GButton {
105	105	icon.source: "qrc:///images/npa.svg"
106	106	anchors.horizontalCenter: parent.horizontalCenter
107		//: LABEL IOS_TABLET %1 can be "card access number (CAN)" or "PIN"
	107	//: LABEL IOS_TABLET %1 can be "CAN" or "PIN"
108	108	text: qsTr("Proceed to %1 entry").arg(
109	109	NumberModel.isCanAllowedMode ?
110	110	//: LABEL IOS_TABLET Inserted into "Proceed to %1 entry"
111		qsTr("card access number (CAN)") :
	111	qsTr("CAN") :
112	112	//: LABEL IOS_TABLET Inserted into "Proceed to %1 entry"
113	113	qsTr("PIN")
114	114	) + SettingsModel.translationTrigger

121	121	GText {
122	122	width: parent.width
123	123
124		//: LABEL IOS_TABLET
125		text: qsTr("The following data will be transferred to the provider when you enter the PIN:") + SettingsModel.translationTrigger
	124	text: NumberModel.isCanAllowedMode
	125	//: LABEL IOS_TABLET
	126	? qsTr("The following data of the ID card will be transferred to the provider when you enter the CAN:")
	127	//: LABEL IOS_TABLET
	128	: qsTr("The following data of your ID card will be transferred to the provider when you enter the PIN:")
	129	+ SettingsModel.translationTrigger
126	130	}
127	131
128	132	Pane {

+6

-1

resources/qml/Governikus/IdentifyView/+mobile/IdentifyController.qml less more

108	108	navBar.currentIndex = 0
109	109	break
110	110	case "StateEditAccessRights":
111		fireReplace(editRights)
	111	if (NumberModel.isCanAllowedMode && SettingsModel.skipRightsOnCanAllowed) {
	112	chatModel.transferAccessRights()
	113	AuthModel.continueWorkflow()
	114	} else {
	115	fireReplace(editRights)
	116	}
112	117	AuthModel.setInitialPluginType()
113	118	break
114	119	case "StateSelectReader":

+10

-9

resources/qml/Governikus/IdentifyView/+mobile/IdentifyView.qml less more

137	137	SettingsModel.translationTrigger
138	138	if (connectivityManager.networkInterfaceActive) {
139	139	//: INFO DESKTOP_QML Information message about cancellation process with present network connectivity
140		return qsTr("Please wait a moment...")
	140	return qsTr("Please wait a moment.")
141	141	}
142	142	//: INFO DESKTOP_QML Information message about cancellation process without working network connectivity
143	143	return qsTr("Network problemes detected, trying to reach server within 30 seconds.")
144	144	}
145	145	progressBarVisible: false
146		subTextColor: !connectivityManager.networkInterfaceActive ? Style.color.warning_text : Style.color.secondary_text_inverse
	146	subTextColor: !connectivityManager.networkInterfaceActive ? Style.color.warning_text : Style.color.secondary_text
147	147	}
148	148
149	149	ProgressView {

171	171	}
172	172	//: INFO DESKTOP_QML Generic progress status message while no card communication is active.
173	173	if (!inProgress \|\| AuthModel.error) {
174		return qsTr("Please wait a moment...")
	174	return qsTr("Please wait a moment.")
175	175	}
176	176	if (AuthModel.isBasicReader) {
177	177	//: INFO ANDROID IOS Second line text if a basic card reader is used and background communication with the card/server is running. Is not actually visible since the basic reader password handling is done by EnterPasswordView.
178		return qsTr("Please don't move the ID card...")
	178	return qsTr("Please don't move the ID card.")
179	179	}
180	180	if (!!NumberModel.inputError) {
181	181	return NumberModel.inputError

190	190	}
191	191	if (identifyController.workflowState === IdentifyController.WorkflowStates.Can) {
192	192	//: INFO ANDROID IOS The PIN was entered wrongfully two times, the third attempts requires additional CAN verification, hint where the CAN is found.
193		return qsTr("A wrong PIN has been entered twice on your ID card. Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. You can find your card access number (CAN) on the front of your ID card.")
	193	return qsTr("A wrong PIN has been entered twice on your ID card. For a third attempt, please first enter the six-digit Card Access Number (CAN). You can find your Card Access Number (CAN) in the bottom right on the front of your ID card.")
194	194	}
195	195
196	196	//: INFO ANDROID IOS Generic status message during the authentication process.
197		return qsTr("Please wait a moment...")
	197	return qsTr("Please wait a moment.")
198	198	}
199	199	subTextColor: !AuthModel.isBasicReader && (NumberModel.inputError
200	200	\|\| NumberModel.pinDeactivated

222	222	id: changeToTransportPinView
223	223	navigationAction: NavigationAction { state: "back"; onClicked: fireReplace(enterPinView) }
224	224	//: LABEL ANDROID IOS
225		title: qsTr("Change transport PIN") + SettingsModel.translationTrigger
	225	title: qsTr("Change Transport PIN") + SettingsModel.translationTrigger
226	226	resultType: ResultView.Type.IsInfo
227	227	//: LABEL ANDROID IOS
228	228	buttonText: qsTr("Change PIN") + SettingsModel.translationTrigger
229		//: INFO ANDROID IOS The user clicked that the current PIN has 5 digits (transport PIN), it needs to be changed to an ordinary 6-digit PIN. The current process needs to be restarted manually by the user.
230		text: qsTr("First you have to change your 5-digit transport PIN you received in your in PIN letter into a 6-digit PIN. You are currently leaving the started process and are forwarded to the PIN management. Please restart the desired process after the PIN has been changed.") + SettingsModel.translationTrigger
	229	//: INFO ANDROID IOS The user clicked that the current PIN has five digits (Transport PIN), it needs to be changed to an ordinary six-digit PIN. The current process needs to be restarted manually by the user.
	230	text: qsTr("First you have to change your five-digit Transport PIN you received in your in PIN letter into a six-digit PIN. You are currently leaving the started process and are forwarded to the PIN management. Please restart the desired process after the PIN has been changed.") + SettingsModel.translationTrigger
231	231	onClicked: {
232	232	firePop()
233	233	AuthModel.setSkipRedirect(true)

239	239
240	240	ResultView {
241	241	id: cardPositionView
	242	navigationAction: NavigationAction { state: "cancel"; onClicked: AuthModel.cancelWorkflow() }
242	243	//: LABEL ANDROID IOS
243	244	title: qsTr("Identify") + SettingsModel.translationTrigger
244	245	resultType: ResultView.Type.IsInfo

+17

-1

resources/qml/Governikus/InformationView/+desktop/DiagnosisView.qml less more

82	82	GButton {
83	83	id: saveToFile
84	84
	85	anchors.fill: parent
	86	anchors.rightMargin: Constants.groupbox_spacing
	87
85	88	Accessible.description: qsTr("Save diagnosis to textfile") + SettingsModel.translationTrigger
86	89
87	90	icon.source: "qrc:///images/icon_save.svg"
88	91	//: LABEL DESKTOP_QML
89	92	text: qsTr("Save to file") + SettingsModel.translationTrigger
90	93	tintIcon: true
	94	enableButton: !SelfDiagnosisModel.running \|\| !timeout.running
	95	//: LABEL DESKTOP_QML
	96	disabledTooltipText: qsTr("Diagnosis is still running") + SettingsModel.translationTrigger
	97	//: LABEL DESKTOP_QML
	98	enabledTooltipText: SelfDiagnosisModel.running ? (qsTr("Diagnosis may be incomplete") + SettingsModel.translationTrigger) : ""
91	99	onClicked: {
92	100	var filenameSuggestion = "%1.%2.%3.txt".arg(Qt.application.name).arg(qsTr("Diagnosis")).arg(SelfDiagnosisModel.getCreationTimeString())
93		appWindow.openSaveFileDialog(SelfDiagnosisModel.saveToFile, filenameSuggestion, "txt")
	101	appWindow.openSaveFileDialog(SelfDiagnosisModel.saveToFile, filenameSuggestion, qsTr("Textfiles"), "txt")
94	102	}
	103	}
	104
	105	Timer {
	106	id: timeout
	107
	108	interval: 10000
	109	running: true
	110	repeat: false
95	111	}
96	112	}
97	113	}

+33

-0

resources/qml/Governikus/InformationView/+mobile/VersionInformation.qml less more

6	6	import Governikus.Global 1.0
7	7	import Governikus.TitleBar 1.0
8	8	import Governikus.View 1.0
	9	import Governikus.Type.ApplicationModel 1.0
9	10	import Governikus.Type.SettingsModel 1.0
10	11
11	12

23	24
24	25	Column
25	26	{
	27	id: column
	28
26	29	anchors.fill: parent
27	30	anchors.margins: Constants.component_spacing
28	31

44	47	}
45	48	}
46	49	}
	50
	51	MouseArea {
	52	property int advancedSettingsCounter: 0
	53
	54	anchors.fill: column
	55
	56	onClicked: {
	57	advancedSettingsCounter += 1
	58
	59	switch (advancedSettingsCounter) {
	60	case 7:
	61	case 8:
	62	case 9:
	63	//: INFO ANDROID IOS Used in notifications when the user taps the version information
	64	ApplicationModel.showFeedback(qsTr("%1 more presses to toggle the advanced settings.").arg(10 - advancedSettingsCounter), true)
	65	break;
	66	case 10:
	67	SettingsModel.advancedSettings = !SettingsModel.advancedSettings
	68	ApplicationModel.showFeedback(
	69	SettingsModel.advancedSettings ?
	70	//: LABEL ANDROID IOS
	71	qsTr("Advanced settings activated.") :
	72	//: LABEL ANDROID IOS
	73	qsTr("Advanced settings deactivated.")
	74	)
	75	advancedSettingsCounter = 0
	76	break;
	77	}
	78	}
	79	}
47	80	}
48	81	}

+2

-2

resources/qml/Governikus/MainView/+desktop/MainView.qml less more

38	38	width: view.horizontalItemSpace
39	39
40	40	//: LABEL DESKTOP_QML
41		title: qsTr("Self-Authentication") + SettingsModel.translationTrigger
	41	title: qsTr("See my personal data") + SettingsModel.translationTrigger
42	42	image: "qrc:/images/desktop/main_identify.svg"
43	43
44	44	onClicked: sectionPage.nextView(SectionPage.Views.SelfAuthentication)

133	133	width: view.horizontalItemSpace
134	134
135	135	//: LABEL DESKTOP_QML
136		title: qsTr("PIN-Management") + SettingsModel.translationTrigger
	136	title: qsTr("Change PIN") + SettingsModel.translationTrigger
137	137	image: "qrc:/images/main_pin.svg"
138	138
139	139	onClicked: ChangePinModel.startWorkflow()

+1

-2

resources/qml/Governikus/MoreView/+desktop/MoreViewGeneral.qml less more

103	103	iconSource: "qrc:/images/desktop/info_manual.svg"
104	104	//: LABEL DESKTOP_QML
105	105	buttonText: qsTr("Open website") + SettingsModel.translationTrigger
106		//: LABEL DESKTOP_QML
107		buttonTooltip: qsTr("Help") + SettingsModel.translationTrigger
	106	buttonTooltip: ApplicationModel.onlineHelpUrl("index")
108	107	buttonIconSource: "qrc:///images/link_external.svg"
109	108	onClicked: ApplicationModel.openOnlineHelp("index")
110	109	}

+21

-40

resources/qml/Governikus/MoreView/+mobile/+ios/MoreView.qml less more

9	9	import Governikus.FeedbackView 1.0
10	10	import Governikus.InformationView 1.0
11	11	import Governikus.HistoryView 1.0
12		import Governikus.DeveloperView 1.0
13	12	import Governikus.TutorialView 1.0
14	13	import Governikus.View 1.0
15	14	import Governikus.SettingsView 1.0

21	20	SectionPage {
22	21	id: moreView
23	22
24		//: LABEL ANDROID IOS DESKTOP_QML
	23	//: LABEL IOS
25	24	title: qsTr("More") + SettingsModel.translationTrigger
26	25
27	26	content: ColumnLayout {

37	36	}
38	37
39	38	MoreViewMenuItem {
40		//: LABEL ANDROID IOS DESKTOP_QML
	39	//: LABEL IOS
41	40	text: qsTr("Version information") + SettingsModel.translationTrigger
42	41	icon: "qrc:///images/iOS/more/icon_mehr_npa.svg"
43	42	onClicked: firePush(versionInformationPage)
44	43	}
45	44
46	45	MoreViewMenuItem {
47		//: LABEL ANDROID IOS DESKTOP_QML
	46	//: LABEL IOS
48	47	text: qsTr("Settings") + SettingsModel.translationTrigger
49	48	icon: "qrc:///images/iOS/more/icon_mehr_settings.svg"
50	49	onClicked: firePush(settingsView)
51	50	}
52	51
53	52	MoreViewMenuItem {
54		//: LABEL ANDROID IOS DESKTOP_QML
	53	//: LABEL IOS
55	54	text: qsTr("History") + SettingsModel.translationTrigger
56	55	icon: "qrc:///images/iOS/more/icon_mehr_verlauf.svg"
57	56	onClicked: {

60	59	}
61	60
62	61	MoreViewMenuItem {
63		//: LABEL ANDROID IOS DESKTOP_QML
	62	//: LABEL IOS
64	63	text: qsTr("Tutorial") + SettingsModel.translationTrigger
65	64	icon: "qrc:///images/iOS/more/icon_mehr_tutorial.svg"
66	65	onClicked: firePush(tutorialView)
67	66	}
68	67
69	68	MoreViewMenuItem {
70		//: LABEL ANDROID IOS DESKTOP_QML
	69	//: LABEL IOS
71	70	text: qsTr("Show log") + SettingsModel.translationTrigger
72	71	icon: "qrc:///images/iOS/more/icon_mehr_log.svg"
73	72	onClicked: firePush(logView)
74	73	}
75	74
76	75	MoreViewLinkMenuItem {
77		//: LABEL ANDROID IOS DESKTOP_QML
	76	//: LABEL IOS
78	77	text: qsTr("FAQ") + SettingsModel.translationTrigger
79	78	icon: "qrc:///images/iOS/more/icon_mehr_info.svg"
80		//: LABEL ANDROID IOS DESKTOP_QML
	79	//: LABEL IOS
81	80	onClicked: Qt.openUrlExternally(qsTr("https://www.ausweisapp.bund.de/en/qa/frequently-asked-questions/"))
82	81	}
83	82
84	83	MoreViewLinkMenuItem {
85		//: LABEL ANDROID IOS DESKTOP_QML
	84	//: LABEL IOS
86	85	text: qsTr("Support") + SettingsModel.translationTrigger
87	86	icon: "qrc:///images/iOS/more/icon_mehr_fragen.svg"
88		//: LABEL ANDROID IOS DESKTOP_QML
	87	//: LABEL IOS
89	88	onClicked: Qt.openUrlExternally(qsTr("https://www.ausweisapp.bund.de/en/qa/support/"))
90	89	}
91	90
92	91	MoreViewLinkMenuItem {
93		//: LABEL ANDROID IOS DESKTOP_QML
	92	//: LABEL IOS
94	93	text: qsTr("Rate app") + SettingsModel.translationTrigger;
95	94	icon: "qrc:///images/iOS/more/icon_mehr_favorit.svg";
96	95	onClicked: {

101	100	}
102	101
103	102	MoreViewLinkMenuItem {
104		//: LABEL ANDROID IOS DESKTOP_QML
	103	//: LABEL IOS
105	104	text: qsTr("Report error") + SettingsModel.translationTrigger
106	105	icon: "qrc:///images/iOS/more/icon_mehr_report.svg"
107	106	onClicked: LogModel.mailLog()
108	107	}
109	108
110	109	MoreViewLinkMenuItem {
111		//: LABEL ANDROID IOS DESKTOP_QML
	110	//: LABEL IOS
112	111	text: qsTr("Release notes") + SettingsModel.translationTrigger;
113	112	icon: "qrc:///images/iOS/more/icon_mehr_info.svg";
114	113	onClicked: {
115	114	if (Qt.platform.os === "android") {
116		//: LABEL ANDROID IOS DESKTOP_QML
	115	//: LABEL IOS
117	116	Qt.openUrlExternally(qsTr("https://www.ausweisapp.bund.de/en/download/android/"))
118	117	}
119	118	else if (Qt.platform.os === "ios") {
120		//: LABEL ANDROID IOS DESKTOP_QML
	119	//: LABEL IOS
121	120	Qt.openUrlExternally(qsTr("https://www.ausweisapp.bund.de/en/download/ios/"))
122	121	}
123	122	else {
124		//: LABEL ANDROID IOS DESKTOP_QML
	123	//: LABEL IOS
125	124	Qt.openUrlExternally(qsTr("https://www.ausweisapp.bund.de/en/download/windows-and-mac/"))
126	125	}
127	126	}
128	127	}
129	128
130	129	MoreViewLinkMenuItem {
131		//: LABEL ANDROID IOS DESKTOP_QML
	130	//: LABEL IOS
132	131	text: qsTr("Software license") + SettingsModel.translationTrigger
133	132	icon: "qrc:///images/iOS/more/icon_mehr_license.svg"
134		showSeparator: plugin.debugBuild
	133	showSeparator: false
135	134	onClicked: {
136	135	if (Qt.platform.os === "android") {
137		//: LABEL ANDROID IOS DESKTOP_QML
	136	//: LABEL IOS
138	137	Qt.openUrlExternally(qsTr("https://www.ausweisapp.bund.de/en/download/android/"))
139	138	}
140	139	else if (Qt.platform.os === "ios") {
141		//: LABEL ANDROID IOS DESKTOP_QML
	140	//: LABEL IOS
142	141	Qt.openUrlExternally(qsTr("https://www.ausweisapp.bund.de/en/download/ios/"))
143	142	}
144	143	else {
145		//: LABEL ANDROID IOS DESKTOP_QML
	144	//: LABEL IOS
146	145	Qt.openUrlExternally(qsTr("https://www.ausweisapp.bund.de/en/download/windows-and-mac/"))
147	146	}
148	147	}
149		}
150
151		MoreViewMenuItem {
152		visible: plugin.debugBuild
153
154		//: LABEL ANDROID IOS DESKTOP_QML
155		text: qsTr("Developer options") + SettingsModel.translationTrigger
156		icon: "qrc:///images/settings_icon.svg"
157		showSeparator: false
158		tintIcon: true
159
160		onClicked: firePush(developerView)
161	148	}
162	149
163	150	GSeparator {

179	166	}
180	167
181	168	Component {
182		id: developerView
183
184		DeveloperView {}
185		}
186
187		Component {
188	169	id: logView
189	170
190	171	LogView {}

+1

-10

resources/qml/Governikus/Navigation/+android/NavigationView.qml less more

46	46
47	47	ListElement {
48	48	image: "qrc:///images/android/navigation/remoteleser.svg"
49		desc: QT_TR_NOOP("Smartphone as card reader")
	49	desc: QT_TR_NOOP("Remote service")
50	50	condition: "remoteservice"
51	51	}
52	52

61	61	image: "qrc:///images/android/navigation/support.svg"
62	62	desc: QT_TR_NOOP("Help & Feedback")
63	63	condition: "feedback"
64		section: "settings"
65		}
66
67		ListElement {
68		desc: QT_TR_NOOP("Developer options")
69		image: "qrc:///images/settings_icon.svg"
70		condition: "developeroptions"
71	64	section: "settings"
72	65	}
73	66	}

115	108	}
116	109	highlightFollowsCurrentItem: false
117	110	delegate: NavigationItem {
118		// Hide developer options if we are not using developer build (debug build)
119		visible: condition !== "developeroptions" \|\| plugin.debugBuild
120	111	height: 45
121	112	width: content.width
122	113

+8

-0

resources/qml/Governikus/ProgressView/+desktop/+nowin/TaskbarProgress.qml less more

	0	/*
	1	* \copyright Copyright (c) 2020 Governikus GmbH & Co. KG, Germany
	2	*/
	3
	4	import QtQml 2.10
	5
	6
	7	QtObject {}

+16

-0

resources/qml/Governikus/ProgressView/+desktop/+win/TaskbarProgress.qml less more

	0	/*
	1	* \copyright Copyright (c) 2020 Governikus GmbH & Co. KG, Germany
	2	*/
	3
	4	import Governikus.Type.ApplicationModel 1.0
	5	import Governikus.Type.AuthModel 1.0
	6
	7	import QtWinExtras 1.0
	8
	9
	10	TaskbarButton {
	11	progress.minimum: 0
	12	progress.maximum: 100
	13	progress.value: AuthModel.progressValue
	14	progress.visible: ApplicationModel.currentWorkflow === "selfauthentication" \|\| ApplicationModel.currentWorkflow === "authentication"
	15	}

+1

-0

resources/qml/Governikus/ProgressView/qmldir less more

0	0	module ProgressView
1	1
2	2	ProgressView 1.0 ProgressView.qml
	3	TaskbarProgress 1.0 TaskbarProgress.qml

+2

-2

resources/qml/Governikus/Provider/+desktop/ProviderContactInfoItem.qml less more

26	26
27	27	activeFocusOnTab: true
28	28
29		RowLayout {
	29	Row {
30	30	id: layout
31	31
32	32	anchors.left: parent.left

46	46	GText {
47	47	id: text
48	48
49		Layout.fillWidth: true
	49	width: parent.width - image.width
50	50
51	51	linkColor: color
52	52	}

+3

-2

resources/qml/Governikus/Provider/+desktop/ProviderDetailButtonBar.qml less more

111	111	anchors.rightMargin: Constants.pane_padding
112	112
113	113	//: LABEL DESKTOP_QML
114		text: qsTr("To online application") + SettingsModel.translationTrigger
115		icon.source: providerIcon
	114	text: qsTr("To provider") + SettingsModel.translationTrigger
	115	tintIcon: true
	116	icon.source: "qrc:///images/link_external.svg"
116	117	buttonColor: categoryColor
117	118	enabled: baseItem.address !== ""
118	119	onClicked: baseItem.clickButton()

+2

-0

resources/qml/Governikus/Provider/+desktop/ProviderDetailHistoryItem.qml less more

53	53	//: LABEL DESKTOP_QML
54	54	text: qsTr("Service:") + SettingsModel.translationTrigger
55	55	font.weight: Font.Bold
	56	maximumLineCount: 1
56	57	}
57	58
58	59	GText {

69	70	//: LABEL DESKTOP_QML
70	71	text: qsTr("Provider:") + SettingsModel.translationTrigger
71	72	font.weight: Font.Bold
	73	maximumLineCount: 1
72	74	}
73	75
74	76	GText {

+7

-3

resources/qml/Governikus/Provider/+mobile/+tablet/ProviderDetailButtonBar.qml less more

48	48
49	49	GButton {
50	50	id: button
51		//: LABEL ANDROID_TABLET IOS_TABLET
52		text: qsTr("ONLINE APPLICATION") + SettingsModel.translationTrigger
53		buttonColor: baseItem.titleBarColor
	51
54	52	anchors.left: iconContainer.right
55	53	anchors.leftMargin: Constants.component_spacing
56	54	anchors.bottom: iconContainer.bottom
	55
	56	//: LABEL ANDROID_TABLET IOS_TABLET
	57	text: qsTr("To provider") + SettingsModel.translationTrigger
	58	tintIcon: true
	59	icon.source: "qrc:///images/link_external.svg"
	60	buttonColor: baseItem.titleBarColor
57	61	enabled: baseItem.address !== ""
58	62
59	63	onClicked: {

+5

-0

resources/qml/Governikus/Provider/+mobile/ProviderHeader.qml less more

157	157
158	158	GButton {
159	159	id: providerButton
	160
160	161	anchors.right: parent.right
	162
161	163	buttonColor: shadowColor
162	164	//: LABEL ANDROID IOS
163	165	text: qsTr("To provider") + SettingsModel.translationTrigger
	166	tintIcon: true
	167	icon.source: "qrc:///images/link_external.svg"
	168
164	169	onClicked: {
165	170	Qt.openUrlExternally(selectedProvider ? selectedProvider.address : "")
166	171	}

+0

-17

resources/qml/Governikus/ProviderView/+desktop/ProviderCard.qml less more

110	110	height: Style.dimens.high_contrast_item_border
111	111	color: Style.color.high_contrast_item_border
112	112	}
113
114		GText {
115		id: providerText
116
117		anchors.fill: parent
118		anchors.leftMargin: Constants.text_spacing
119		anchors.rightMargin: Constants.text_spacing
120
121		horizontalAlignment: Text.AlignHCenter
122		verticalAlignment: Text.AlignVCenter
123
124		text: provider.homepageBase
125
126		elide: Text.ElideRight
127		maximumLineCount: 1
128		textStyle: Style.text.hint_inverse
129		}
130	113	}
131	114	}
132	115

+0

-1

resources/qml/Governikus/ProviderView/+mobile/+phone/ProviderListItemDelegate.qml less more

15	15	Accessible.description: qsTr("Open provider details for") + ' ' + display + SettingsModel.translationTrigger
16	16
17	17	text: display
18		footerText: providerAddressDomain
19	18
20	19	onClicked: firePushWithProperties(providerDetailView, {providerModelItem: model})
21	20	}

+0

-15

resources/qml/Governikus/ProviderView/+mobile/+tablet/ProviderCard.qml less more

55	55	color: Category.displayColor(provider.category)
56	56	height: baseItem.footerHeight
57	57	width: parent.width
58
59		GText {
60		text: provider.homepageBase
61
62		anchors.centerIn: parent
63
64		Accessible.ignored: true
65
66		leftPadding: Constants.pane_padding
67		rightPadding: Constants.pane_padding
68		elide: Text.ElideRight
69		maximumLineCount: 1
70
71		textStyle: Style.text.normal_inverse
72		}
73	58	}
74	59	}
75	60

+1

-1

resources/qml/Governikus/ProviderView/+mobile/+tablet/ProviderCardNameRow.qml less more

44	44
45	45	text: '<html>' + providerName + '</html>'
46	46	elide: Text.ElideRight
47		maximumLineCount: 4
	47	maximumLineCount: 3
48	48	textStyle: Style.text.hint_secondary
49	49	}
50	50	}

+4

-0

resources/qml/Governikus/RemoteServiceView/+mobile/DevicesListDelegate.qml less more

39	39
40	40	Layout.fillWidth: true
41	41
	42	elide: Text.ElideRight
	43	maximumLineCount: 1
42	44	textStyle: Style.text.normal_accent
43	45	}
44	46

47	49
48	50	Layout.fillWidth: true
49	51
	52	elide: Text.ElideRight
	53	maximumLineCount: 1
50	54	textStyle: Style.text.hint_secondary
51	55	}
52	56	}

+10

-4

resources/qml/Governikus/RemoteServiceView/+mobile/RemoteServiceView.qml less more

19	19
20	20	readonly property string currentPin: RemoteServiceModel.psk.toString()
21	21	readonly property bool isPairing: RemoteServiceModel.running && currentPin !== ""
	22	readonly property bool wifiEnabled: ApplicationModel.wifiEnabled
22	23
23	24	navigationAction: NavigationAction {
24	25	state: RemoteServiceModel.running ? "cancel" : ""

90	91	Layout.preferredWidth: Math.max(pairingButton.implicitWidth, startButton.implicitWidth)
91	92	Layout.alignment: Qt.AlignHCenter
92	93
93		buttonColor: running ? Constants.red : Constants.darkgreen
94		enabled: (canEnableNfc \|\| RemoteServiceModel.runnable \|\| running) && !serviceIsStarting
	94	buttonColor: wifiEnabled ? (running ? Constants.red : Constants.darkgreen) : Style.color.button
	95	enabled: (canEnableNfc \|\| RemoteServiceModel.runnable \|\| running \|\| !wifiEnabled) && !serviceIsStarting
95	96	text: {
96	97	SettingsModel.translationTrigger; // Bind this evaluation to the trigger.
97	98
98		if (canEnableNfc) {
	99	if (!wifiEnabled) {
	100	//: LABEL ANDROID IOS
	101	return qsTr("Enable WiFi");
	102	} else if (canEnableNfc) {
99	103	//: LABEL ANDROID IOS
100	104	return qsTr("Enable NFC");
101	105	} else if (running) {

107	111	}
108	112	}
109	113	onClicked: {
110		if (canEnableNfc) {
	114	if (!wifiEnabled) {
	115	ApplicationModel.enableWifi()
	116	} else if (canEnableNfc) {
111	117	ApplicationModel.showSettings(ApplicationModel.SETTING_NFC)
112	118	} else {
113	119	if (!running) {

+1

-1

resources/qml/Governikus/RemoteServiceView/+mobile/RemoteServiceViewRemote.qml less more

106	106	Accessible.role: Accessible.StaticText
107	107	Accessible.name: text
108	108
109		//: INFO ANDROID IOS No SaC was found on the network, both devices need to be connected to the same wifi network.
	109	//: INFO ANDROID IOS No SaC was found on the network, both devices need to be connected to the same WiFi network.
110	110	text: qsTr("No unpaired smartphone as card reader (SaC) available. Please make sure that the smartphone as card reader (SaC) functionality in AusweisApp2 on your other device is activated an that both devices are connected to the same WiFi.") + SettingsModel.translationTrigger
111	111	textStyle: Style.text.normal_secondary
112	112	}

+58

-9

resources/qml/Governikus/ResultView/+desktop/ResultView.qml less more

10	10	import Governikus.Style 1.0
11	11	import Governikus.View 1.0
12	12	import Governikus.Type.ApplicationModel 1.0
	13	import Governikus.Type.LogModel 1.0
13	14	import Governikus.Type.SettingsModel 1.0
14	15
15	16

23	24	}
24	25
25	26	signal emailButtonPressed()
26		property alias emailButtonVisible: emailButton.visible
	27	property alias supportButtonsVisible: supportButtonsLayout.visible
27	28	property alias text: resultText.text
	29	property alias header: resultHeader.text
28	30	property int resultType: ResultView.Type.IsSuccess
29	31	property alias buttonType: button.buttonType
	32	property alias popupText: detailedResultPopup.text
	33	property alias popupTitle: detailedResultPopup.title
30	34
31	35	Accessible.name: qsTr("Result view") + SettingsModel.translationTrigger
32	36	Accessible.description: qsTr("This is the result of an authentication.") + SettingsModel.translationTrigger

55	59	}
56	60
57	61	GText {
	62	id: resultHeader
	63
	64	visible: text !== ""
	65	Layout.alignment: Qt.AlignHCenter
	66	Layout.maximumWidth: Style.dimens.max_text_width
	67
	68	activeFocusOnTab: true
	69
	70	horizontalAlignment: Text.AlignHCenter
	71	verticalAlignment: Text.AlignVCenter
	72	textStyle: Style.text.header_inverse
	73
	74	FocusFrame {}
	75	}
	76
	77	GText {
58	78	id: resultText
59	79
60	80	visible: text !== ""

62	82	Layout.maximumWidth: Style.dimens.max_text_width
63	83
64	84	activeFocusOnTab: true
65		Accessible.name: resultText.text
66	85
67	86	horizontalAlignment: Text.AlignHCenter
68	87	verticalAlignment: Text.AlignVCenter
69		textStyle: Style.text.title_inverse
	88	textStyle: resultHeader.visible ? Style.text.header_secondary_inverse : Style.text.header_inverse
70	89
71	90	FocusFrame {}
72	91	}
73	92
74		GButton {
75		id: emailButton
	93	RowLayout {
	94	id: supportButtonsLayout
76	95
77	96	visible: false
	97	Layout.fillWidth: true
78	98	Layout.alignment: Qt.AlignHCenter
79	99
80		icon.source: "qrc:///images/provider/mail.svg"
81		//: LABEL DESKTOP_QML
82		text: qsTr("Send email") + SettingsModel.translationTrigger
83		onClicked: baseItem.emailButtonPressed()
	100	GButton {
	101	icon.source: "qrc:///images/provider/mail.svg"
	102	//: LABEL DESKTOP_QML
	103	text: qsTr("Send email") + SettingsModel.translationTrigger
	104	onClicked: baseItem.emailButtonPressed()
	105	}
	106
	107	GButton {
	108	icon.source: "qrc:/images/desktop/info_application_log.svg"
	109	//: LABEL DESKTOP_QML
	110	text: qsTr("Save logfile") + SettingsModel.translationTrigger
	111	onClicked: {
	112	LogModel.setLogfile(0)
	113	let filenameSuggestion = LogModel.createLogFileName(LogModel.getCurrentLogfileDate())
	114	appWindow.openSaveFileDialog(LogModel.saveCurrentLogfile, filenameSuggestion, qsTr("Logfiles"), "log")
	115	}
	116	}
	117
	118	GButton {
	119	visible: popupTitle !== "" \|\| popupText !== ""
	120
	121	icon.source: "qrc:/images/desktop/main_info.svg"
	122	//: LABEL DESKTOP_QML
	123	text: qsTr("See details") + SettingsModel.translationTrigger
	124	onClicked: detailedResultPopup.open()
	125	}
84	126	}
	127
85	128
86	129	NavigationButton {
87	130	id: button

96	139	onClicked: baseItem.nextView(SectionPage.Views.Main)
97	140	}
98	141	}
	142
	143	ConfirmationPopup {
	144	id: detailedResultPopup
	145
	146	style: ConfirmationPopup.PopupStyle.OkButton
	147	}
99	148	}

+5

-9

resources/qml/Governikus/SelfAuthenticationView/+mobile/SelfAuthenticationView.qml less more

25	25	case 8:
26	26	case 9:
27	27	//: INFO ANDROID IOS Used in notifications when the user taps the magnifying glass
28		ApplicationModel.showFeedback(qsTr("%1 more presses to toggle the testmode for the self-authentication.").arg(10 - d.testPkiCounter) + SettingsModel.translationTrigger, true)
	28	ApplicationModel.showFeedback(qsTr("%1 more presses to toggle the testmode for the self-authentication.").arg(10 - d.testPkiCounter), true)
29	29	break;
30	30	case 10:
31	31	SettingsModel.useSelfauthenticationTestUri = !SettingsModel.useSelfauthenticationTestUri
32	32	if (SettingsModel.useSelfauthenticationTestUri) {
33	33	//: INFO ANDROID IOS Used in notifications when the user taps the magnifying glass
34		ApplicationModel.showFeedback(qsTr("Testmode for the self-authentication activated.") + SettingsModel.translationTrigger, true)
	34	ApplicationModel.showFeedback(qsTr("Testmode for the self-authentication activated."), true)
35	35	} else {
36	36	//: INFO ANDROID IOS Used in notifications when the user taps the magnifying glass
37		ApplicationModel.showFeedback(qsTr("Testmode for the self-authentication deactivated.") + SettingsModel.translationTrigger, true)
	37	ApplicationModel.showFeedback(qsTr("Testmode for the self-authentication deactivated."), true)
38	38	}
39	39	d.testPkiCounter = 0;
40	40	break;

66	66
67	67	MouseArea {
68	68	anchors.fill: parent
69		onClicked: {
70		d.toggleTestPki()
71		}
	69	onClicked: d.toggleTestPki()
72	70	}
73	71	}
74	72

124	122	text: qsTr("See my personal data") + SettingsModel.translationTrigger
125	123
126	124	enabled: ApplicationModel.currentWorkflow !== "authentication"
127		onClicked: {
128		SelfAuthModel.startWorkflow()
129		}
	125	onClicked: SelfAuthModel.startWorkflow()
130	126	}
131	127	}

+137

-0

resources/qml/Governikus/SettingsView/+desktop/ConnectSacView.qml less more

	0	/*
	1	* \copyright Copyright (c) 2019-2020 Governikus GmbH & Co. KG, Germany
	2	*/
	3
	4	import QtQuick 2.10
	5
	6	import Governikus.EnterPasswordView 1.0
	7	import Governikus.ProgressView 1.0
	8	import Governikus.ResultView 1.0
	9	import Governikus.TitleBar 1.0
	10	import Governikus.Type.ApplicationModel 1.0
	11	import Governikus.Type.NumberModel 1.0
	12	import Governikus.Type.RemoteServiceModel 1.0
	13	import Governikus.Type.SettingsModel 1.0
	14	import Governikus.View 1.0
	15
	16	SectionPage {
	17	id: root
	18
	19	signal closeView()
	20
	21	function showPairingInformation() {
	22	d.view = ConnectSacView.SubView.PairingInfo
	23	d.externalMoreInformation = true
	24	}
	25
	26	enum SubView {
	27	None,
	28	EnterPassword,
	29	PairingInfo,
	30	WaitForPairing,
	31	PairingFailed
	32	}
	33
	34	QtObject {
	35	id: d
	36
	37	property int view
	38	property bool externalMoreInformation: false
	39	}
	40
	41	onVisibleChanged: {
	42	if (visible) {
	43	d.view = ConnectSacView.SubView.EnterPassword
	44	} else {
	45	d.view = ConnectSacView.SubView.None
	46	d.externalMoreInformation = false
	47	}
	48	appWindow.menuBar.updateActions()
	49	}
	50
	51	titleBarAction: TitleBarAction {
	52	visible: d.view !== ConnectSacView.SubView.PairingInfo \|\| !d.externalMoreInformation
	53	//: LABEL DESKTOP_QML
	54	text: qsTr("Pairing") + SettingsModel.translationTrigger
	55	helpTopic: "readerDeviceTab"
	56	rootEnabled: false
	57	customSubAction: CancelAction {
	58	visible: true
	59	onClicked: root.closeView()
	60	}
	61
	62	onClicked: {
	63	if (d.view === ConnectSacView.SubView.PairingInfo && !d.externalMoreInformation) {
	64	d.view = ConnectSacView.SubView.EnterPassword
	65	}
	66	}
	67	}
	68
	69	EnterPasswordView {
	70	visible: d.view === ConnectSacView.SubView.EnterPassword
	71
	72	statusIcon: "qrc:///images/phone_to_pc.svg"
	73	passwordType: NumberModel.PASSWORD_REMOTE_PIN
	74
	75	onPasswordEntered: d.view = ConnectSacView.SubView.WaitForPairing
	76
	77	onRequestPasswordInfo: {
	78	d.view = ConnectSacView.SubView.PairingInfo
	79	appWindow.menuBar.updateActions()
	80	}
	81	}
	82
	83	PasswordInfoView {
	84	visible: d.view === ConnectSacView.SubView.PairingInfo
	85
	86	passwordType: NumberModel.PASSWORD_REMOTE_PIN
	87	titleBarAction.rootEnabled: ApplicationModel.currentWorkflow === "" && d.externalMoreInformation
	88
	89	onClose: {
	90	if (d.externalMoreInformation) {
	91	root.closeView()
	92	d.externalMoreInformation = false
	93	} else {
	94	d.view = ConnectSacView.SubView.EnterPassword
	95	}
	96	appWindow.menuBar.updateActions()
	97	}
	98	}
	99
	100	ProgressView {
	101	visible: d.view === ConnectSacView.SubView.WaitForPairing
	102
	103	//: LABEL DESKTOP_QML
	104	text: qsTr("Pairing the device ...") + SettingsModel.translationTrigger
	105
	106	Connections {
	107	enabled: visible
	108	target: RemoteServiceModel
	109
	110	onFirePairingFailed: {
	111	pairingFailedView.deviceName = pDeviceName
	112	pairingFailedView.errorMessage = pErrorMessage
	113	d.view = ConnectSacView.SubView.PairingFailed
	114	}
	115
	116	onFirePairingSuccess: {
	117	ApplicationModel.showFeedback(qsTr("The device \"%1\" has been paired.").arg(pDeviceName))
	118	root.closeView()
	119	}
	120	}
	121	}
	122
	123	ResultView {
	124	id: pairingFailedView
	125
	126	property string deviceName
	127	property string errorMessage
	128
	129	visible: d.view === ConnectSacView.SubView.PairingFailed
	130
	131	//: ERROR DESKTOP_QML An error occurred while pairing the device.
	132	text: qsTr("Pairing to \"%1\" failed:").arg(deviceName) + "<br/>\"%2\"".arg(errorMessage) + SettingsModel.translationTrigger
	133	resultType: ResultView.Type.IsError
	134	onNextView: root.closeView()
	135	}
	136	}⏎

+15

-0

resources/qml/Governikus/SettingsView/+desktop/DebugSettings.qml less more

46	46	checked: SettingsModel.showBetaTesting
47	47	onCheckedChanged: SettingsModel.showBetaTesting = checked
48	48	}
	49
	50	ToggleableOption {
	51	//: LABEL DESKTOP_QML
	52	text: qsTr("Support CAN allowed mode") + SettingsModel.translationTrigger
	53	checked: SettingsModel.enableCanAllowed
	54	onCheckedChanged: SettingsModel.enableCanAllowed = checked
	55	}
	56
	57	ToggleableOption {
	58	//: LABEL DESKTOP_QML
	59	text: qsTr("Skip rights page in CAN allowed mode") + SettingsModel.translationTrigger
	60	enabled: SettingsModel.enableCanAllowed
	61	checked: SettingsModel.skipRightsOnCanAllowed
	62	onCheckedChanged: SettingsModel.skipRightsOnCanAllowed = checked
	63	}
49	64	}

+33

-0

resources/qml/Governikus/SettingsView/+desktop/GeneralSettings.qml less more

147	147	borderColor: Style.color.focus_indicator
148	148	}
149	149	}
	150
	151	GSeparator {
	152	visible: customProxySetting.visible
	153
	154	Layout.fillWidth: true
	155	}
	156
	157	GText {
	158	visible: customProxySetting.visible
	159
	160	activeFocusOnTab: true
	161
	162	//: LABEL DESKTOP_QML
	163	text: qsTr("Network") + SettingsModel.translationTrigger
	164	textStyle: Style.text.header_accent
	165
	166	FocusFrame {
	167	borderColor: Style.color.focus_indicator
	168	}
	169	}
	170
	171	ToggleableOption {
	172	id: customProxySetting
	173
	174	visible: SettingsModel.customProxyAttributesPresent
	175
	176	activeFocusOnTab: true
	177
	178	//: LABEL DESKTOP_QML
	179	text: qsTr("Use the proxy (%1) specified during the installation.").arg(SettingsModel.customProxyUrl) + SettingsModel.translationTrigger
	180	checked: SettingsModel.useCustomProxy
	181	onCheckedChanged: SettingsModel.useCustomProxy = checked
	182	}
150	183	}

+6

-1

resources/qml/Governikus/SettingsView/+desktop/RemoteReaderView.qml less more

23	23	signal unpairDevice(string pDeviceId)
24	24	signal moreInformation()
25	25
	26	implicitWidth: column.implicitWidth
	27	implicitHeight: column.implicitHeight
	28
26	29	ReaderScanEnabler {
27	30	plugInType: ReaderPlugIn.REMOTE
28	31	}
29	32
30	33	Column {
	34	id: column
	35
31	36	anchors.fill: parent
32	37	spacing: Constants.component_spacing
33	38

89	94
90	95	model: RemoteServiceModel.availableRemoteDevices
91	96	delegate: RemoteReaderDelegate {
92		width: parent.width
	97	width: availableDevices.width
93	98	height: implicitHeight + Constants.pane_padding
94	99	onPairDevice: root.pairDevice(pDeviceId)
95	100	}

+13

-8

resources/qml/Governikus/SettingsView/+desktop/SecurityAndPrivacySettings.qml less more

7	7
8	8	import Governikus.Global 1.0
9	9	import Governikus.Style 1.0
	10	import Governikus.Type.ApplicationModel 1.0
10	11	import Governikus.Type.SettingsModel 1.0
11	12	import Governikus.Type.HistoryModel 1.0
12	13	import Governikus.View 1.0

32	33	activeFocusOnTab: true
33	34
34	35	//: LABEL DESKTOP_QML
35		text: qsTr("Save authentification history") + SettingsModel.translationTrigger
	36	text: qsTr("Save authentication history") + SettingsModel.translationTrigger
36	37	checked: SettingsModel.historyEnabled
37	38	onCheckedChanged: SettingsModel.historyEnabled = checked
38	39	}

74	75	activeFocusOnTab: true
75	76
76	77	//: LABEL DESKTOP_QML
77		text: qsTr("Avoid visual feedback in the on screen keypad") + SettingsModel.translationTrigger
78		checked: SettingsModel.visualPrivacy
	78	text: qsTr("Shuffle keypad buttons") + SettingsModel.translationTrigger
	79	checked: SettingsModel.shuffleScreenKeyboard
79	80	enabled: SettingsModel.useScreenKeyboard
80		onCheckedChanged: SettingsModel.visualPrivacy = checked
	81	onCheckedChanged: SettingsModel.shuffleScreenKeyboard = checked
81	82	}
82	83
83	84	ToggleableOption {
84	85	activeFocusOnTab: true
85	86
86	87	//: LABEL DESKTOP_QML
87		text: qsTr("Shuffle keypad buttons") + SettingsModel.translationTrigger
88		checked: SettingsModel.shuffleScreenKeyboard
	88	text: qsTr("Visual feedback when pressing keypad buttons") + SettingsModel.translationTrigger
	89	checked: !SettingsModel.visualPrivacy
89	90	enabled: SettingsModel.useScreenKeyboard
90		onCheckedChanged: SettingsModel.shuffleScreenKeyboard = checked
	91	onCheckedChanged: SettingsModel.visualPrivacy = !checked
91	92	}
92	93
93	94	GSeparator {

174	175	title: qsTr("Delete history")+ SettingsModel.translationTrigger
175	176	//: INFO DESKTOP_QML The current history is about to be removed, user confirmation required.
176	177	text: qsTr("All history entries will be deleted.") + SettingsModel.translationTrigger
177		onConfirmed: SettingsModel.removeEntireHistory()
	178	onConfirmed: {
	179	let removedItemCount = SettingsModel.removeEntireHistory()
	180	//: INFO DESKTOP_QML Feedback how many history entries were removed.
	181	ApplicationModel.showFeedback(qsTr("Deleted %1 entries from the history.").arg(removedItemCount))
	182	}
178	183	}
179	184	}

+14

-74

resources/qml/Governikus/SettingsView/+desktop/SettingsView.qml less more

2	2	*/
3	3
4	4	import QtQuick 2.10
5		import QtQuick.Controls 2.3
6	5	import QtQml.Models 2.3
7	6
8	7	import Governikus.Global 1.0

12	11	import Governikus.Type.SettingsModel 1.0
13	12	import Governikus.Type.UiModule 1.0
14	13	import Governikus.Type.RemoteServiceModel 1.0
15		import Governikus.EnterPasswordView 1.0
16		import Governikus.Type.NumberModel 1.0
17		import Governikus.ProgressView 1.0
18		import Governikus.ResultView 1.0
19	14	import Governikus.UpdateView 1.0
20	15
21	16

24	19
25	20	enum SubView {
26	21	None,
27		EnterPassword,
28		PairingInfo,
29		WaitForPairing,
30		PairingFailed,
	22	ConnectSacView,
31	23	AppUpdateView
32	24	}
33	25

49	41
50	42	onClicked: {
51	43	d.view = SettingsView.SubView.None
	44	}
	45
	46	customSubAction: CancelAction {
	47	visible: d.view === SettingsView.SubView.EnterPassword \|\| d.view === SettingsView.SubView.WaitForPairing
	48
	49	onClicked: d.view = SettingsView.SubView.None
52	50	}
53	51	}
54	52

112	110	height: Math.max(implicitHeight, tabbedPane.availableHeight)
113	111	onPairDevice: {
114	112	if (RemoteServiceModel.rememberServer(pDeviceId)) {
115		d.view = TabbedReaderView.SubView.EnterPassword
	113	d.view = SettingsView.SubView.ConnectSacView
116	114	appWindow.menuBar.updateActions()
117	115	}
118	116	}
119	117	onUnpairDevice: RemoteServiceModel.forgetDevice(pDeviceId)
120	118	onMoreInformation: {
121	119	d.precedingView = d.view
122		d.view = TabbedReaderView.SubView.PairingInfo
	120	d.view = TabbedReaderView.SubView.ConnectSacView
	121	connectSacView.showPairingInformation()
123	122	appWindow.menuBar.updateActions()
124	123	}
125	124	}

160	159	onLeaveView: d.view = SettingsView.SubView.None
161	160	}
162	161
163		EnterPasswordView {
164		id: enterPassword
	162	ConnectSacView {
	163	id: connectSacView
165	164
166		visible: d.view === SettingsView.SubView.EnterPassword
	165	visible: d.view === SettingsView.SubView.ConnectSacView
167	166
168		statusIcon: "qrc:///images/phone_to_pc.svg"
169		passwordType: NumberModel.PASSWORD_REMOTE_PIN
170
171		onPasswordEntered: d.view = SettingsView.SubView.WaitForPairing
172
173		onRequestPasswordInfo: {
174		d.precedingView = d.view
175		d.view = SettingsView.SubView.PairingInfo
176		appWindow.menuBar.updateActions()
177		}
178		}
179
180		PasswordInfoView {
181		id: passwordInfoView
182
183		visible: d.view === SettingsView.SubView.PairingInfo
184
185		passwordType: NumberModel.PASSWORD_REMOTE_PIN
186
187		onClose: {
188		d.view = d.precedingView
189		appWindow.menuBar.updateActions()
190		}
191		}
192
193		ProgressView {
194		visible: d.view === SettingsView.SubView.WaitForPairing
195
196		//: LABEL DESKTOP_QML
197		text: qsTr("Pairing the device ...") + SettingsModel.translationTrigger
198
199		Connections {
200		enabled: visible
201		target: RemoteServiceModel
202
203		onFirePairingFailed: {
204		pairingFailedView.deviceName = pDeviceName
205		pairingFailedView.errorMessage = pErrorMessage
206		d.view = SettingsView.SubView.PairingFailed
207		}
208
209		onFirePairingSuccess: {
210		ApplicationModel.showFeedback(qsTr("The device \"%1\" has been paired.").arg(pDeviceName))
211		d.view = SettingsView.SubView.None
212		}
213		}
214		}
215
216		ResultView {
217		id: pairingFailedView
218
219		property string deviceName
220		property string errorMessage
221
222		visible: d.view === SettingsView.SubView.PairingFailed
223
224		//: ERROR DESKTOP_QML An error occurred while pairing the device.
225		text: qsTr("Pairing to \"%1\" failed:").arg(deviceName) + "<br/>\"%2\"".arg(errorMessage) + SettingsModel.translationTrigger
226		resultType: ResultView.Type.IsError
227		onNextView: d.view = SettingsView.SubView.None
	167	onCloseView: d.view = SettingsView.SubView.None
228	168	}
229	169	}

+25

-36

resources/qml/Governikus/SettingsView/+desktop/TabbedReaderView.qml less more

4	4	import QtQuick 2.10
5	5	import QtQml.Models 2.10
6	6
7		import Governikus.EnterPasswordView 1.0
8	7	import Governikus.Global 1.0
9	8	import Governikus.TitleBar 1.0
10	9	import Governikus.Type.ApplicationModel 1.0

16	15	SectionPage {
17	16	id: root
18	17
	18	signal closeView()
	19
19	20	property alias rootEnabled: titleBarAction.rootEnabled
20
21	21	property alias paneAnchors: tabbedPane.anchors
22
	22	property int lastReaderCount: 0
23	23	readonly property int currentView: d.view
24
25		signal closeView()
	24	readonly property int availableReader: ApplicationModel.availableReader
26	25
27	26	enum SubView {
28	27	None,
29		EnterPassword,
30		PairingInfo
	28	ConnectSacView
31	29	}
32	30
33	31	QtObject {

39	37
40	38	onVisibleChanged: d.view = TabbedReaderView.SubView.None
41	39
	40	onAvailableReaderChanged: {
	41	if (visible && availableReader > lastReaderCount) {
	42	root.closeView();
	43	}
	44	lastReaderCount = availableReader;
	45	}
	46
42	47	titleBarAction: TitleBarAction {
43		id:titleBarAction
	48	id: titleBarAction
44	49
45	50	//: LABEL DESKTOP_QML
46	51	text: qsTr("Card Readers") + SettingsModel.translationTrigger
47	52	helpTopic: Utils.helpTopicOf(tabbedPane.currentContentItem, "settings")
48	53	rootEnabled: false
49	54	customSubAction: CancelAction {
50		visible: d.view === TabbedReaderView.SubView.EnterPassword
	55	onClicked: closeView()
	56	}
51	57
52		onClicked: d.view = TabbedReaderView.SubView.None
53		}
	58	onClicked: d.view = TabbedReaderView.SubView.None
54	59	}
	60
	61	Component.onCompleted: lastReaderCount = availableReader
55	62
56	63	TabbedPane {
57	64	id: tabbedPane

77	84	height: Math.max(implicitHeight, tabbedPane.availableHeight)
78	85	onPairDevice: {
79	86	if (RemoteServiceModel.rememberServer(pDeviceId)) {
80		d.view = TabbedReaderView.SubView.EnterPassword
	87	d.view = TabbedReaderView.SubView.ConnectSacView
81	88	appWindow.menuBar.updateActions()
82	89	}
83	90	}
84	91	onUnpairDevice: RemoteServiceModel.forgetDevice(pDeviceId)
85	92	onMoreInformation: {
86	93	d.precedingView = d.view
87		d.view = TabbedReaderView.SubView.PairingInfo
	94	d.view = TabbedReaderView.SubView.ConnectSacView
	95	connectSacView.showPairingInformation();
88	96	appWindow.menuBar.updateActions()
89	97	}
90	98	}

112	120	onClicked: root.closeView()
113	121	}
114	122
115		EnterPasswordView {
116		id: enterPassword
	123	ConnectSacView {
	124	id: connectSacView
117	125
118		visible: d.view === TabbedReaderView.SubView.EnterPassword
	126	visible: d.view === TabbedReaderView.SubView.ConnectSacView
119	127
120		statusIcon: "qrc:///images/phone_to_pc.svg"
121		passwordType: NumberModel.PASSWORD_REMOTE_PIN
122
123		onPasswordEntered: d.view = TabbedReaderView.SubView.None
124
125		onRequestPasswordInfo: {
126		d.precedingView = d.view
127		d.view = TabbedReaderView.SubView.PairingInfo
128		appWindow.menuBar.updateActions()
129		}
130		}
131
132		PasswordInfoView {
133		id: passwordInfoView
134
135		visible: d.view === TabbedReaderView.SubView.PairingInfo
136
137		passwordType: NumberModel.PASSWORD_REMOTE_PIN
138
139		onClose: {
	128	onCloseView: {
140	129	d.view = d.precedingView
141	130	appWindow.menuBar.updateActions()
142	131	}

+72

-0

resources/qml/Governikus/SettingsView/+mobile/ScreenOrientationSelectionPopup.qml less more

	0	/*
	1	* \copyright Copyright (c) 2020 Governikus GmbH & Co. KG, Germany
	2	*/
	3
	4	import QtQuick 2.10
	5	import QtQuick.Layouts 1.3
	6	import QtQuick.Window 2.3
	7
	8	import Governikus.Global 1.0
	9	import Governikus.Style 1.0
	10	import Governikus.Type.SettingsModel 1.0
	11
	12	ConfirmationPopup {
	13	//: LABEL ANDROID
	14	title: qsTr("Select screen orientation") + SettingsModel.translationTrigger
	15
	16	style: ConfirmationPopup.PopupStyle.OkButton
	17	onConfirmed: {
	18	if (phone.checked && Screen.primaryOrientation === Qt.LandscapeOrientation) {
	19	plugin.applyPlatformStyle("mobile,phone," + Qt.platform.os)
	20	}
	21	if (tablet.checked && Screen.primaryOrientation !== Qt.LandscapeOrientation) {
	22	plugin.applyPlatformStyle("mobile,tablet," + Qt.platform.os)
	23	}
	24	}
	25
	26	Column {
	27	width: parent.width
	28
	29	spacing: Constants.component_spacing
	30
	31	GRadioButton {
	32	id: phone
	33
	34	width: parent.width
	35
	36	//: LABEL ANDROID
	37	Accessible.description: qsTr("Set screen orientation to portrait") + SettingsModel.translationTrigger
	38
	39	checked: Screen.primaryOrientation !== Qt.LandscapeOrientation
	40	icon.source: "qrc:///images/android/stay_primary_portrait-24px.svg"
	41	//: LABEL ANDROID
	42	text: qsTr("Portrait") + (plugin.tablet ? "" : (" (%1)".arg(qsTr("recommended")))) + SettingsModel.translationTrigger
	43	tintIcon: true
	44	}
	45
	46	GRadioButton {
	47	id: tablet
	48
	49	width: parent.width
	50
	51	//: LABEL ANDROID
	52	Accessible.description: qsTr("Set screen orientation to landscape") + SettingsModel.translationTrigger
	53
	54	checked: Screen.primaryOrientation === Qt.LandscapeOrientation
	55	icon.source: "qrc:///images/android/stay_primary_landscape-24px.svg"
	56	//: LABEL ANDROID
	57	text: qsTr("Landscape") + (plugin.tablet ? (" (%1)".arg(qsTr("recommended"))) : "") + SettingsModel.translationTrigger
	58	tintIcon: true
	59	}
	60
	61	GText {
	62	visible: tablet.checked && !plugin.tablet
	63	width: parent.width
	64
	65	//: LABEL ANDROID
	66	text: qsTr("Using a screen orientation unfit for your device may result in display errors.") + SettingsModel.translationTrigger
	67	textStyle: Style.text.normal_warning
	68	}
	69
	70	}
	71	}

+166

-17

resources/qml/Governikus/SettingsView/+mobile/SettingsView.qml less more

4	4	import QtQuick 2.10
5	5	import QtQuick.Controls 2.3
6	6	import QtQuick.Layouts 1.3
	7	import QtQuick.Window 2.3
7	8
8	9	import Governikus.Global 1.0
9	10	import Governikus.Style 1.0

60	61	}
61	62	}
62	63
	64	SettingsEntry {
	65	visible: Constants.is_layout_android
	66	width: parent.usableWidth
	67	//: LABEL ANDROID
	68	title: qsTr("Screen orientation") + SettingsModel.translationTrigger
	69	description: (Screen.primaryOrientation === Qt.LandscapeOrientation
	70	//: LABEL ANDROID
	71	? qsTr("Landscape")
	72	//: LABEL ANDROID
	73	: qsTr("Portrait")
	74	) + SettingsModel.translationTrigger
	75	icon: Screen.primaryOrientation === Qt.LandscapeOrientation ? "qrc:///images/android/stay_primary_landscape-24px.svg" : "qrc:///images/android/stay_primary_portrait-24px.svg"
	76	tintIcon: true
	77
	78	onClicked: orientationPopup.open()
	79
	80	ScreenOrientationSelectionPopup {
	81	id: orientationPopup
	82	}
	83	}
	84
63	85	TitledSeparator {
64	86	width: parent.usableWidth
65	87	//: LABEL ANDROID IOS

121	143	//: LABEL ANDROID IOS
122	144	title: qsTr("Remote card reader") + SettingsModel.translationTrigger
123	145	//: LABEL ANDROID IOS
124		description: qsTr("Click here to use another smartphone as a card reader") + SettingsModel.translationTrigger
	146	description: qsTr("Configure remote service for another device") + SettingsModel.translationTrigger
125	147	onClicked: baseItem.firePush(remoteServiceSettings)
126	148
127	149	Component {

144	166	width: parent.usableWidth
145	167
146	168	//: LABEL ANDROID IOS
	169	title: qsTr("History") + SettingsModel.translationTrigger
	170	//: LABEL ANDROID IOS
	171	description: qsTr("Save authentication history") + SettingsModel.translationTrigger
	172	checked: SettingsModel.historyEnabled
	173	onCheckedChanged: SettingsModel.historyEnabled = checked
	174	}
	175
	176	LabeledSwitch {
	177	width: parent.usableWidth
	178
	179	//: LABEL ANDROID IOS
147	180	title: qsTr("Shuffle keypad buttons") + SettingsModel.translationTrigger
148	181	//: LABEL ANDROID IOS
149	182	description: qsTr("Randomize the order of the on screen keypad buttons") + SettingsModel.translationTrigger

156	189	width: parent.usableWidth
157	190
158	191	//: LABEL ANDROID IOS
159		title: qsTr("Privacy keypad") + SettingsModel.translationTrigger
160		//: LABEL ANDROID IOS
161		description: qsTr("Avoid visual feedback in the on screen keypad") + SettingsModel.translationTrigger
162		checked: SettingsModel.visualPrivacy
163		onCheckedChanged: SettingsModel.visualPrivacy = checked
164		}
165
166		LabeledSwitch {
167		width: parent.usableWidth
168
169		//: LABEL ANDROID IOS
170		title: qsTr("History") + SettingsModel.translationTrigger
171		//: LABEL ANDROID IOS
172		description: qsTr("Save authentification history") + SettingsModel.translationTrigger
173		checked: SettingsModel.historyEnabled
174		onCheckedChanged: SettingsModel.historyEnabled = checked
	192	title: qsTr("Keypad animations") + SettingsModel.translationTrigger
	193	//: LABEL ANDROID IOS
	194	description: qsTr("Visual feedback when pressing keypad buttons") + SettingsModel.translationTrigger
	195	checked: !SettingsModel.visualPrivacy
	196	onCheckedChanged: SettingsModel.visualPrivacy = !checked
	197	}
	198
	199	Column {
	200	visible: SettingsModel.advancedSettings
	201	width: parent.usableWidth
	202
	203	spacing: parent.spacing
	204
	205	TitledSeparator {
	206	width: parent.width
	207
	208	//: LABEL ANDROID IOS
	209	title: qsTr("CAN allowed mode") + SettingsModel.translationTrigger
	210	}
	211
	212	LabeledSwitch {
	213	width: parent.width
	214
	215	//: LABEL ANDROID IOS
	216	title: qsTr("Support CAN allowed mode") + SettingsModel.translationTrigger
	217	//: LABEL ANDROID IOS
	218	description: qsTr("Allow the id card to be used with only the CAN") + SettingsModel.translationTrigger
	219	checked: SettingsModel.enableCanAllowed
	220	onCheckedChanged: SettingsModel.enableCanAllowed = checked
	221	}
	222
	223	LabeledSwitch {
	224	width: parent.width
	225
	226	//: LABEL ANDROID IOS
	227	title: qsTr("Skip rights page") + SettingsModel.translationTrigger
	228	//: LABEL ANDROID IOS
	229	description: qsTr("Do not show the rights page, when in can allowed mode") + SettingsModel.translationTrigger
	230	enabled: SettingsModel.enableCanAllowed
	231	checked: SettingsModel.skipRightsOnCanAllowed
	232	onCheckedChanged: SettingsModel.skipRightsOnCanAllowed = checked
	233	}
	234	}
	235
	236	Column {
	237	visible: plugin.debugBuild
	238	width: parent.usableWidth
	239
	240	spacing: parent.spacing
	241
	242	TitledSeparator {
	243	width: parent.width
	244
	245	//: LABEL ANDROID IOS
	246	title: qsTr("Developer Options") + SettingsModel.translationTrigger
	247	}
	248
	249	LabeledSwitch {
	250	width: parent.width
	251
	252	//: LABEL ANDROID IOS
	253	title: qsTr("Testmode for the self-authentication") + SettingsModel.translationTrigger
	254	//: LABEL ANDROID IOS
	255	description: qsTr("Use the test environment during a self-authentication") + SettingsModel.translationTrigger
	256
	257	checked: SettingsModel.useSelfauthenticationTestUri
	258	onCheckedChanged: SettingsModel.useSelfauthenticationTestUri = checked
	259	}
	260
	261	LabeledSwitch {
	262	width: parent.width
	263
	264	//: LABEL ANDROID IOS
	265	title: qsTr("Developer Mode") + SettingsModel.translationTrigger
	266	//: LABEL ANDROID IOS
	267	description: qsTr("Use a more tolerant mode") + SettingsModel.translationTrigger
	268	checked: SettingsModel.developerMode
	269	onCheckedChanged: SettingsModel.developerMode = checked
	270	}
	271
	272	TitledSeparator {
	273	width: parent.width
	274
	275	//: LABEL ANDROID IOS
	276	title: qsTr("Layout style") + SettingsModel.translationTrigger
	277	}
	278
	279	GRadioButton {
	280	//: LABEL ALL_PLATFORMS
	281	text: qsTr("iOS") + SettingsModel.translationTrigger
	282	checked: plugin.platformStyle === text.toLowerCase()
	283	onCheckedChanged: if (checked) { plugin.applyPlatformStyle(text.toLowerCase()) }
	284	}
	285
	286	GRadioButton {
	287	//: LABEL ALL_PLATFORMS
	288	text: qsTr("Android") + SettingsModel.translationTrigger
	289	checked: plugin.platformStyle === text.toLowerCase()
	290	onCheckedChanged: if (checked) { plugin.applyPlatformStyle(text.toLowerCase()) }
	291	}
	292
	293	GRadioButton {
	294	//: LABEL ALL_PLATFORMS
	295	text: qsTr("Tablet, Android") + SettingsModel.translationTrigger
	296	checked: plugin.platformStyle === text.toLowerCase()
	297	onCheckedChanged: if (checked) { plugin.applyPlatformStyle(text.toLowerCase()) }
	298	}
	299
	300	TitledSeparator {
	301	width: parent.width
	302
	303	//: LABEL ANDROID IOS
	304	title: qsTr("Create dummy entries") + SettingsModel.translationTrigger
	305	}
	306
	307	GButton {
	308	//: LABEL ALL_PLATFORMS
	309	text: qsTr("Logfile") + SettingsModel.translationTrigger
	310	onClicked: {
	311	LogModel.saveDummyLogfile()
	312	ApplicationModel.showFeedback("Created new logfile.")
	313	}
	314	}
	315
	316	GButton {
	317	//: LABEL ALL_PLATFORMS
	318	text: qsTr("History") + SettingsModel.translationTrigger
	319	onClicked: {
	320	HistoryModel.createDummyEntry()
	321	ApplicationModel.showFeedback("Created new history entry.")
	322	}
	323	}
175	324	}
176	325	}
177	326	}

+2

-0

resources/qml/Governikus/SettingsView/qmldir less more

7	7	internal SecurityAndPrivacySettings SecurityAndPrivacySettings.qml
8	8	internal SettingsEntry SettingsEntry.qml
9	9	internal LanguageSelectionPopup LanguageSelectionPopup.qml
	10	internal ScreenOrientationSelectionPopup ScreenOrientationSelectionPopup.qml
	11	internal ConnectSacView ConnectSacView.qml
10	12
11	13	CardReaderView 1.0 CardReaderView.qml
12	14	RemoteReaderView 1.0 RemoteReaderView.qml

+1

-0

resources/qml/Governikus/Style/+desktop/PlatformDimensions.qml less more

13	13	readonly property int corner_radius: ApplicationModel.scaleFactor * 20
14	14	readonly property int corner_radius_popup: corner_radius
15	15	readonly property int button_radius: ApplicationModel.scaleFactor * 15
	16	readonly property int popup_border: Math.max(ApplicationModel.scaleFactor * 2, 1)
16	17	readonly property int separator_size: Math.max(ApplicationModel.scaleFactor * 2, 1)
17	18	readonly property int tabbed_pane_separator_size: Math.max(ApplicationModel.scaleFactor * 4, 1)
18	19	readonly property real max_text_width: ApplicationModel.scaleFactor * 1000

+3

-0

resources/qml/Governikus/Style/+mobile/PlatformColors.qml less more

18	18	readonly property color tutorial_box_background: "#f2f2f2"
19	19
20	20	readonly property color card_reader: "#444445"
	21
	22	readonly property color switch_checked: accent
	23	readonly property color switch_unchecked: "#ffffff"
21	24	}

+1

-0

resources/qml/Governikus/Style/+mobile/PlatformDimensions.qml less more

7	7	BrandDimensions {
8	8	readonly property int button_radius: 6
9	9	readonly property int corner_radius: 10
	10	readonly property int popup_border: 0
10	11	readonly property int separator_size: 1
11	12	readonly property int list_item_height: 64
12	13	readonly property int scrollbar_padding_vertical: 5

+3

-3

resources/qml/Governikus/TutorialView/+desktop/SetupAssistantView.qml less more

127	127	BinaryDecisionView {
128	128	visible: d.activeView === SetupAssistantView.SubViews.TransportPin
129	129
130		Accessible.name: qsTr("Change transport PIN setup step") + SettingsModel.translationTrigger
	130	Accessible.name: qsTr("Change Transport PIN setup step") + SettingsModel.translationTrigger
131	131
132	132	mainIconSource: "qrc:///images/reader/default_reader.png"
133		//: INFO DESKTOP_QML Inquiry message if the 5-digit transport PIN should be changed to an ordinary PIN (now).
	133	//: INFO DESKTOP_QML Inquiry message if the five-digit Transport PIN should be changed to an ordinary PIN (now).
134	134	questionText: qsTr("Do you want to set your PIN now?") + SettingsModel.translationTrigger
135	135	//: INFO DESKTOP_QML Hint that this change may be carried out form the main menu as well and that it is required to use the online authentication feature of the ID card.
136		questionSubText: qsTr("If you have not already done so you have to change your 5-digit transport PIN to a 6-digit PIN before you can use the online-ID function.") + SettingsModel.translationTrigger
	136	questionSubText: qsTr("If you have not already done so you have to change the five-digit Transport PIN to a six-digit PIN before you can use the online-ID function.") + SettingsModel.translationTrigger
137	137
138	138	titleBarAction: TitleBarAction {
139	139	//: LABEL DESKTOP_QML

+19

-14

resources/qml/Governikus/TutorialView/+mobile/TutorialImportant.qml less more

40	40	anchors.horizontalCenter: parent.horizontalCenter
41	41	width: parent.width * 0.9
42	42	//: LABEL ANDROID IOS
43		text: qsTr("5 digits long") + SettingsModel.translationTrigger
44		textStyle: Style.text.tutorial_header
45		horizontalAlignment: Text.AlignHCenter
46		}
47
48		GText {
49		anchors.horizontalCenter: parent.horizontalCenter
50		width: parent.width * 0.9
51		//: LABEL ANDROID IOS
52		text: qsTr("transport PIN") + SettingsModel.translationTrigger
	43	text: qsTr("five digits long") + SettingsModel.translationTrigger
	44	textStyle: Style.text.tutorial_header
	45	horizontalAlignment: Text.AlignHCenter
	46	}
	47
	48	GText {
	49	anchors.horizontalCenter: parent.horizontalCenter
	50	width: parent.width * 0.9
	51	//: LABEL ANDROID IOS
	52	text: qsTr("Transport PIN") + SettingsModel.translationTrigger
53	53	textStyle: Style.text.tutorial_header
54	54	font.bold: true
55	55	horizontalAlignment: Text.AlignHCenter

82	82	anchors.horizontalCenter: parent.horizontalCenter
83	83	width: parent.width * 0.9
84	84	//: LABEL ANDROID IOS
85		text: qsTr("6 digits long PIN") + SettingsModel.translationTrigger
	85	text: qsTr("six digits long PIN") + SettingsModel.translationTrigger
86	86	textStyle: Style.text.tutorial_header
87	87	font.bold: true
88	88	horizontalAlignment: Text.AlignHCenter

110	110	anchors.horizontalCenter: parent.horizontalCenter
111	111	width: parent.width * 0.9
112	112	//: LABEL ANDROID IOS
113		text: qsTr("The transport PIN is sent to you by the Bundesdruckerei via mail.") + SettingsModel.translationTrigger
	113	text: qsTr("The Transport PIN is sent to you by the Bundesdruckerei via mail.") + SettingsModel.translationTrigger
114	114	textStyle: Style.text.tutorial_header
115	115	horizontalAlignment: Text.AlignHCenter
116	116	}

210	210	anchors.horizontalCenter: parent.horizontalCenter
211	211
212	212	//: LABEL ANDROID IOS
213		text: qsTr("Please note: The transport PIN can only be used for your first PIN change. If you have already set your personal PIN (e.g. while picking up your ID card) only the set PIN is valid.") + SettingsModel.translationTrigger
	213	text: qsTr("Please note: The Transport PIN can only be used for your first PIN change. If you have already set your personal PIN (e.g. while picking up your ID card) only the set PIN is valid.") + SettingsModel.translationTrigger
214	214	textStyle: Style.text.tutorial_header_secondary
215	215	horizontalAlignment: Text.AlignHCenter
216	216	}

220	220	anchors.horizontalCenter: parent.horizontalCenter
221	221
222	222	//: LABEL ANDROID IOS
223		text: qsTr("You can always set a new PIN at the issuing authority if the (transport) PIN is not known.") + SettingsModel.translationTrigger
	223	text: qsTr("You can always set a new PIN at the issuing authority if the (Transport) PIN is not known.") + SettingsModel.translationTrigger
224	224	textStyle: Style.text.tutorial_header_secondary
225	225	horizontalAlignment: Text.AlignHCenter
226	226	}

243	243
244	244	MouseArea {
245	245	anchors.fill: parent
	246
	247	//: LABEL ANDROID IOS
	248	Accessible.name: qsTr("Open YouTube video") + SettingsModel.translationTrigger
	249	Accessible.role: Accessible.Button
	250	Accessible.onPressAction: if (Qt.platform.os === "ios") clicked(null)
246	251
247	252	//: LABEL ANDROID IOS
248	253	onClicked: Qt.openUrlExternally(qsTr("https://www.youtube.com/watch?v=wZglRda5Y60&index=4&list=PLLB5ERhVkn25qQXgMHQr-1KgyZsJKoSAm"))

+43

-2

resources/qml/Governikus/TutorialView/+mobile/TutorialReaderMethodBluetooth.qml less more

47	47	Column {
48	48	width: parent.width
49	49	spacing: Constants.component_spacing
	50
	51	Rectangle {
	52	width: parent.width * 0.95
	53	height: deprecationWarning.height
	54	anchors.horizontalCenter: parent.horizontalCenter
	55
	56	border.width: 3
	57	border.color: Constants.red
	58
	59	Column {
	60	id: deprecationWarning
	61
	62	width: parent.width
	63
	64	padding: Constants.pane_padding
	65	spacing: Constants.pane_spacing
	66
	67	GText {
	68	width: parent.width - 2 * parent.padding
	69
	70	Accessible.onScrollDownAction: baseItem.Accessible.scrollDownAction()
	71	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
	72
	73	color: Constants.red
	74	text: qsTr("Deprecation warning") + SettingsModel.translationTrigger
	75	textStyle: Style.text.tutorial_header_secondary
	76	font.bold: true
	77	}
	78
	79	GText {
	80	width: parent.width - 2 * parent.padding
	81
	82	Accessible.onScrollDownAction: baseItem.Accessible.scrollDownAction()
	83	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
	84
	85	color: Constants.red
	86	text: qsTr("Bluetooth support will be removed in the next version of %1!").arg(Qt.application.name) + SettingsModel.translationTrigger
	87	textStyle: Style.text.tutorial_content // Style.text.tutorial_header_secondary
	88	}
	89	}
	90	}
50	91
51	92	GText {
52	93	anchors.horizontalCenter: parent.horizontalCenter

492	533	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
493	534
494	535	//: LABEL ANDROID IOS
495		text: qsTr("6 digits long PIN") + SettingsModel.translationTrigger
	536	text: qsTr("six digits long PIN") + SettingsModel.translationTrigger
496	537	textStyle: Style.text.tutorial_header
497	538	font.bold: true
498	539	horizontalAlignment: Text.AlignHCenter

544	585	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
545	586
546	587	//: LABEL ANDROID IOS
547		text: qsTr("This is only possible if you have exchanged the 5 digits long transport PIN with a 6 digits long personal PIN beforehand.") + SettingsModel.translationTrigger
	588	text: qsTr("This is only possible if you have exchanged the five digits long Transport PIN with a six digits long personal PIN beforehand.") + SettingsModel.translationTrigger
548	589	textStyle: Style.text.tutorial_content
549	590	font.bold: true
550	591	horizontalAlignment: Text.AlignLeft

+7

-2

resources/qml/Governikus/TutorialView/+mobile/TutorialReaderMethodNfc.qml less more

423	423	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
424	424
425	425	//: LABEL ANDROID IOS
426		text: qsTr("6 digits long PIN") + SettingsModel.translationTrigger
	426	text: qsTr("six digits long PIN") + SettingsModel.translationTrigger
427	427	textStyle: Style.text.tutorial_header
428	428	font.bold: true
429	429	horizontalAlignment: Text.AlignHCenter

475	475	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
476	476
477	477	//: LABEL ANDROID IOS
478		text: qsTr("This is only possible if you have exchanged the 5 digits long transport PIN with a 6 digits long personal PIN beforehand.") + SettingsModel.translationTrigger
	478	text: qsTr("This is only possible if you have exchanged the five digits long Transport PIN with a six digits long personal PIN beforehand.") + SettingsModel.translationTrigger
479	479	textStyle: Style.text.tutorial_content
480	480	font.bold: true
481	481	horizontalAlignment: Text.AlignLeft

500	500
501	501	MouseArea {
502	502	anchors.fill: parent
	503
	504	//: LABEL ANDROID IOS
	505	Accessible.name: qsTr("Open YouTube video") + SettingsModel.translationTrigger
	506	Accessible.role: Accessible.Button
	507	Accessible.onPressAction: if (Qt.platform.os === "ios") clicked(null)
503	508
504	509	onClicked: Constants.is_layout_ios ? Qt.openUrlExternally("https://www.youtube.com/watch?v=qArkIGs0cFM&list=PLLB5ERhVkn25qQXgMHQr-1KgyZsJKoSAm&index=1")
505	510	: Qt.openUrlExternally("https://www.youtube.com/watch?v=OtduiptNKQI&list=PLLB5ERhVkn25qQXgMHQr-1KgyZsJKoSAm&index=2")

+8

-3

resources/qml/Governikus/TutorialView/+mobile/TutorialReaderMethodSacDesktop.qml less more

208	208	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
209	209
210	210	//: LABEL ANDROID IOS
211		text: qsTr("Both devices have to be connected to the same wifi network") + SettingsModel.translationTrigger
	211	text: qsTr("Both devices have to be connected to the same WiFi network") + SettingsModel.translationTrigger
212	212	textStyle: Style.text.tutorial_header
213	213	font.bold: true
214	214	horizontalAlignment: Text.AlignHCenter

791	791	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
792	792
793	793	//: LABEL ANDROID IOS
794		text: qsTr("6 digits long PIN") + SettingsModel.translationTrigger
	794	text: qsTr("six digits long PIN") + SettingsModel.translationTrigger
795	795	textStyle: Style.text.tutorial_header
796	796	font.bold: true
797	797	horizontalAlignment: Text.AlignHCenter

843	843	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
844	844
845	845	//: LABEL ANDROID IOS
846		text: qsTr("This is only possible if you have exchanged the 5 digits long transport PIN with a 6 digits long personal PIN beforehand.") + SettingsModel.translationTrigger
	846	text: qsTr("This is only possible if you have exchanged the five digits long Transport PIN with a six digits long personal PIN beforehand.") + SettingsModel.translationTrigger
847	847	textStyle: Style.text.tutorial_content
848	848	font.bold: true
849	849	horizontalAlignment: Text.AlignLeft

868	868
869	869	MouseArea {
870	870	anchors.fill: parent
	871
	872	//: LABEL ANDROID IOS
	873	Accessible.name: qsTr("Open YouTube video") + SettingsModel.translationTrigger
	874	Accessible.role: Accessible.Button
	875	Accessible.onPressAction: if (Qt.platform.os === "ios") clicked(null)
871	876
872	877	onClicked: Qt.openUrlExternally("https://www.youtube.com/watch?v=PWF1kEwfQ0Y&list=PLLB5ERhVkn25qQXgMHQr-1KgyZsJKoSAm&index=3")
873	878	}

+4

-4

resources/qml/Governikus/TutorialView/+mobile/TutorialReaderMethodSacMobile.qml less more

194	194	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
195	195
196	196	//: LABEL ANDROID IOS
197		text: qsTr("Both devices have to be connected to the same wifi network") + SettingsModel.translationTrigger
	197	text: qsTr("Both devices have to be connected to the same WiFi network") + SettingsModel.translationTrigger
198	198	textStyle: Style.text.tutorial_header
199	199	font.bold: true
200	200	horizontalAlignment: Text.AlignHCenter

663	663	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
664	664
665	665	//: LABEL ANDROID IOS
666		text: qsTr("Tap on Wifi") + SettingsModel.translationTrigger
	666	text: qsTr("Tap on WiFi") + SettingsModel.translationTrigger
667	667	horizontalAlignment: Text.AlignHCenter
668	668	textStyle: Style.text.tutorial_header
669	669	}

837	837	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
838	838
839	839	//: LABEL ANDROID IOS
840		text: qsTr("6 digits long PIN") + SettingsModel.translationTrigger
	840	text: qsTr("six digits long PIN") + SettingsModel.translationTrigger
841	841	textStyle: Style.text.tutorial_header
842	842	font.bold: true
843	843	horizontalAlignment: Text.AlignHCenter

889	889	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
890	890
891	891	//: LABEL ANDROID IOS
892		text: qsTr("This is only possible if you have exchanged the 5 digits long transport PIN with a 6 digits long personal PIN beforehand.") + SettingsModel.translationTrigger
	892	text: qsTr("This is only possible if you have exchanged the five digits long Transport PIN with a six digits long personal PIN beforehand.") + SettingsModel.translationTrigger
893	893	textStyle: Style.text.tutorial_content
894	894	font.bold: true
895	895	horizontalAlignment: Text.AlignLeft

+5

-0

resources/qml/Governikus/TutorialView/+mobile/TutorialWhat.qml less more

524	524	anchors.fill: parent
525	525
526	526	//: LABEL ANDROID IOS
	527	Accessible.name: qsTr("Open YouTube video") + SettingsModel.translationTrigger
	528	Accessible.role: Accessible.Button
	529	Accessible.onPressAction: if (Qt.platform.os === "ios") clicked(null)
	530
	531	//: LABEL ANDROID IOS
527	532	onClicked: Qt.openUrlExternally(qsTr("https://www.youtube.com/watch?v=fzbUZmHaZp4&index=5&list=PLLB5ERhVkn25qQXgMHQr-1KgyZsJKoSAm"))
528	533	}
529	534	}

+1

-1

resources/qml/Governikus/TutorialView/+mobile/TutorialWhere.qml less more

283	283	Accessible.onScrollUpAction: baseItem.Accessible.scrollUpAction()
284	284
285	285	//: LABEL ANDROID IOS
286		text: qsTr("6 digits long PIN") + SettingsModel.translationTrigger
	286	text: qsTr("six digits long PIN") + SettingsModel.translationTrigger
287	287	textStyle: Style.text.tutorial_header
288	288	font.bold: true
289	289	horizontalAlignment: Text.AlignHCenter

+0

-2

resources/qml/Governikus/UpdateView/+desktop/UpdateView.qml less more

32	32
33	33	buttonType: NavigationButton.Type.Back
34	34	resultType: ResultView.Type.IsError
35		emailButtonVisible: false
36	35	//: LABEL DESKTOP_QML Placext if the update information are invalid, might be caused by network issues.
37	36	text: qsTr("The update information could not be retrieved. Please check your network connection.") + SettingsModel.translationTrigger
38	37

44	43
45	44	buttonType: NavigationButton.Type.Back
46	45	resultType: ResultView.Type.IsSuccess
47		emailButtonVisible: false
48	46	//: LABEL DESKTOP_QML The currently installed version is the most recent one, no action is required.
49	47	text: qsTr("Your version %1 of %2 is up to date!").arg(Qt.application.version).arg(Qt.application.name) + SettingsModel.translationTrigger
50	48

+0

-9

resources/qml/Governikus/View/+mobile/+android/ContentArea.qml less more

8	8	import Governikus.RemoteServiceView 1.0
9	9	import Governikus.TutorialView 1.0
10	10	import Governikus.MoreView 1.0
11		import Governikus.DeveloperView 1.0
12	11	import Governikus.IdentifyView 1.0
13	12	import Governikus.ProviderView 1.0
14	13	import Governikus.HistoryView 1.0

94	93	prefetch: baseItem.ready
95	94	sourceComponent: SettingsView {}
96	95	}
97
98		TabBarView {
99		visible: baseItem.state === "developeroptions"
100		anchors.fill: parent
101
102		prefetch: baseItem.ready
103		sourceComponent: DeveloperView {}
104		}
105	96	}

+12

-0

resources/qml/Governikus/View/+mobile/FocusPoint.qml less more

	0	/*
	1	* \copyright Copyright (c) 2019-2020 Governikus GmbH & Co. KG, Germany
	2	*/
	3
	4	import QtQuick 2.10
	5
	6
	7	Text {
	8	property Item scope: parent
	9
	10	visible: false
	11	}

+2

-2

resources/qml/Governikus/WhiteListClient/+mobile/WhiteListSurveyView.qml less more

221	221
222	222	GButton {
223	223	//: LABEL ANDROID IOS
224		text: qsTr("Cancel") + SettingsModel.translationTrigger
	224	text: qsTr("Do not send") + SettingsModel.translationTrigger
225	225	onClicked: root.done(false)
226	226	}
227	227
228	228	GButton {
229	229	//: LABEL ANDROID IOS
230		text: qsTr("Transmit") + SettingsModel.translationTrigger
	230	text: qsTr("Send") + SettingsModel.translationTrigger
231	231	onClicked: root.done(true)
232	232	}
233	233	}

+16

-20

resources/qml/Governikus/Workflow/+desktop/GeneralWorkflow.qml less more

29	29	QtObject {
30	30	id: d
31	31
32		readonly property bool foundSelectedReader: ApplicationModel.foundSelectedReader
33		readonly property bool foundPCSCReader: ApplicationModel.foundSelectedReader && ApplicationModel.isReaderTypeAvailable(ReaderPlugIn.PCSC)
34		readonly property bool foundRemoteReader: ApplicationModel.foundSelectedReader && ApplicationModel.isReaderTypeAvailable(ReaderPlugIn.REMOTE)
35		readonly property string purpose: (isPinChange ?
36		//: LABEL DESKTOP_QML
37		qsTr("Change PIN") :
38		//: LABEL DESKTOP_QML
39		qsTr("Identify")
40		) + SettingsModel.translationTrigger
41		}
42
43
	32	readonly property bool foundSelectedReader: ApplicationModel.availableReader > 0
	33	readonly property bool foundPCSCReader: ApplicationModel.availableReader > 0 && ApplicationModel.isReaderTypeAvailable(ReaderPlugIn.PCSC)
	34	readonly property bool foundRemoteReader: ApplicationModel.availableReader > 0 && ApplicationModel.isReaderTypeAvailable(ReaderPlugIn.REMOTE)
	35	}
44	36
45	37	Connections {
46	38	target: ApplicationModel

134	126	//: ERROR DESKTOP_QML
135	127	return qsTr("The used card reader does not meet the technical requirements (Extended Length not supported).")
136	128	}
137		//: LABEL DESKTOP_QML
138		return d.foundSelectedReader ? d.purpose : qsTr("Searching for card reader")
	129	return d.foundSelectedReader
	130	//: LABEL DESKTOP_QML
	131	? qsTr("Place ID card")
	132	//: LABEL DESKTOP_QML
	133	: qsTr("Connect USB card reader or smartphone")
139	134	case Workflow.WaitingFor.Card:
140	135	if (NumberModel.pinDeactivated) {
141	136	//: LABEL DESKTOP_QML
142		return qsTr("Information") + SettingsModel.translationTrigger
	137	return qsTr("Information")
143	138	}
144		return d.purpose
	139	//: LABEL DESKTOP_QML
	140	return qsTr("Place ID card")
145	141	case Workflow.WaitingFor.Password:
146	142	//: LABEL DESKTOP_QML
147		return qsTr("Information") + SettingsModel.translationTrigger
	143	return qsTr("Information")
148	144	default:
149	145	return ""
150	146	}

161	157	readonly property string requestCardText: {
162	158	if (d.foundPCSCReader && !d.foundRemoteReader) {
163	159	//: INFO DESKTOP_QML The AA2 is waiting for an ID card to be inserted into the card reader.
164		return qsTr("Please put the ID card on the card reader.")
	160	return qsTr("No ID card detected. Please ensure that your ID card is placed on the card reader.")
165	161	} else if (!d.foundPCSCReader && d.foundRemoteReader) {
166	162	//: INFO DESKTOP_QML The AA2 is waiting for the smartphone to be placed on the id.
167		return qsTr("Connected to %1. Please place the NFC interface of the smartphone on your ID card.").arg(RemoteServiceModel.connectedServerDeviceNames)
	163	return qsTr("No ID card detected. Please make sure that the NFC interface of the smartphone (connected to %1) is correctly placed on your ID card.").arg(RemoteServiceModel.connectedServerDeviceNames)
168	164	}
169	165
170	166	//: INFO DESKTOP_QML The AA2 is waiting for an ID card to be inserted into the card reader (or smartphone for that matter).

186	182	switch (waitingFor) {
187	183	case Workflow.WaitingFor.Reader:
188	184	//: INFO DESKTOP_QML AA2 is waiting for the card reader or the ID card.
189		return d.foundSelectedReader ? requestCardText : qsTr("No card reader detected. Please make sure that a card reader is connected. Open the %1reader settings%2 to configure reader and get more information about supported readers.").arg("<a href=\"#\">").arg("</a>")
	185	return d.foundSelectedReader ? requestCardText : qsTr("No card reader detected. Please make sure that a USB card reader is connected or a smartphone as cardreader is paired and available. Open the %1reader settings%2 to configure readers and get more information about supported readers.").arg("<a href=\"#\">").arg("</a>")
190	186	case Workflow.WaitingFor.Card:
191	187	if (NumberModel.pinDeactivated) {
192	188	//: INFO DESKTOP_QML The online authentication feature of the card is disabled and needs to be activated by the authorities.

+4

-4

resources/qml/Governikus/Workflow/+mobile/NfcProgressIndicator.qml less more

52	52	PropertyChanges { target: grayLevel; visible: false }
53	53	PropertyChanges {
54	54	target: card
55		x: (baseItem.width + (Constants.is_layout_ios ? 0 : phone.width) - card.width) / 2
	55	x: (baseItem.width - (Constants.is_layout_ios ? card.width : card.height)) / 2
56	56	y: (Constants.is_layout_ios ? 0 : baseItem.height / 4)
57		rotation: (Constants.is_layout_ios ? 0 : 62)
	57	rotation: (Constants.is_layout_ios ? 0 : 90)
58	58	}
59		PropertyChanges { target: shaking; running: true }
	59	PropertyChanges { target: shaking; running: false }
60	60	}
61	61	]
62	62

66	66	SequentialAnimation
67	67	{
68	68	PauseAnimation { duration: 500 }
69		PropertyAnimation{ targets: card; properties: "x,y,rotation"; duration: 500; easing.type: Easing.OutQuad }
	69	PropertyAnimation{ targets: card; properties: "x,y,rotation"; duration: Constants.is_layout_ios ? 500 : 2000; easing.type: Easing.OutQuad }
70	70	PropertyAnimation{ targets: phone; property: "x"; duration: 500; easing.type: Easing.OutQuart }
71	71	PropertyAction { target: shaking; property: "running" }
72	72	}

+2

-2

resources/qml/Governikus/Workflow/+mobile/NfcWorkflow.qml less more

58	58	//: INFO ANDROID IOS AA2 can't use NFC on this device, suggest to use bluetooth instead.
59	59	qsTr("Unfortunately, this functionality is not available on your device.") + "<br/>" +
60	60	//: INFO ANDROID IOS AA2 can't use NFC on this device, suggest to use bluetooth instead.
61		qsTr("However you can use a seperate 'Bluetooth card reader' or a seperate 'smartphone as card reader' to utilize the online identification function.") :
	61	qsTr("However, you can use a separate 'smartphone as card reader' to utilize the online identification function.") :
62	62	!ApplicationModel.nfcEnabled ?
63	63	//: INFO ANDROID IOS NFC is available but needs to be activated in the settings of the smartphone.
64	64	qsTr("NFC is switched off.") + "<br/>" +

75	75
76	76	subTitleText: (!visible ? "" :
77	77	//: INFO ANDROID IOS The NFC interface does not meet the minimum requirements, using a bluetooth reader or a differnt smarthpone is suggested.
78		ApplicationModel.extendedLengthApdusUnsupported ? qsTr("Your device does not meet the technical requirements (Extended Length not supported). However you can use a seperate 'Bluetooth card reader' or a seperate 'smartphone as card reader' to utilize the online identification function.") :
	78	ApplicationModel.extendedLengthApdusUnsupported ? qsTr("Your device does not meet the technical requirements (Extended Length not supported). However you can use a separate 'smartphone as card reader' to utilize the online identification function.") :
79	79	//: INFO ANDROID IOS The online authentication feature is disabled and needs to be activated by the authorities.
80	80	NumberModel.pinDeactivated ? qsTr("The online identification function of your ID card is not activated. Please contact the authority responsible for issuing your identification card to activate the online identification function.") :
81	81	//: INFO ANDROID IOS The ID card may be inserted, the authentication process may be started.

+8

-8

resources/qml/Governikus/Workflow/+mobile/RemoteWorkflow.qml less more

20	20
21	21	property bool settingsPushed: remoteServiceSettings.visible
22	22	property bool wifiEnabled: ApplicationModel.wifiEnabled
23		property bool foundSelectedReader: ApplicationModel.foundSelectedReader
	23	property bool foundSelectedReader: ApplicationModel.availableReader > 0
24	24
25	25	Connections {
26	26	target: ApplicationModel

61	61	SettingsModel.translationTrigger
62	62
63	63	if (!wifiEnabled) {
64		//: LABEL DESKTOP_QML
65		return qsTr("Enable Wifi");
	64	//: LABEL ANDROID IOS
	65	return qsTr("Enable WiFi");
66	66	} else if (!foundSelectedReader) {
67		//: LABEL DESKTOP_QML
	67	//: LABEL ANDROID IOS
68	68	return qsTr("Pair device");
69	69	} else {
70		//: LABEL DESKTOP_QML
	70	//: LABEL ANDROID IOS
71	71	return qsTr("Continue")
72	72	}
73	73	}

83	83	SettingsModel.translationTrigger
84	84
85	85	if (!wifiEnabled) {
86		//: INFO ANDROID IOS The wifi module needs to be enabled in the system settings to use the remote service.
	86	//: INFO ANDROID IOS The WiFi module needs to be enabled in the system settings to use the remote service.
87	87	return qsTr("To use the remote service WiFi has to be activated. Please activate WiFi in your device settings.");
88	88	} else if (!foundSelectedReader) {
89	89	//: INFO ANDROID IOS No paired and reachable device was found, hint that the remote device needs to be actually started for this feature.

94	94	}
95	95
96	96	titleText: (foundSelectedReader ?
97		//: LABEL DESKTOP_QML
	97	//: LABEL ANDROID IOS
98	98	qsTr("Determine card") :
99		//: LABEL DESKTOP_QML
	99	//: LABEL ANDROID IOS
100	100	qsTr("Establish connection")
101	101	) + SettingsModel.translationTrigger
102	102

+811

-522

resources/translations/ausweisapp2_de.ts less more

190	190	<source>Cancel</source>
191	191	<extracomment>LABEL ALL_PLATFORMS</extracomment>
192	192	<translation>Abbrechen</translation>
	193	</message>
	194	<message>
	195	<source>Dialog</source>
	196	<translation>Dialog</translation>
193	197	</message>
194	198	</context>
195	199	<context>

449	453	<name>ChangePinView</name>
450	454	<message>
451	455	<source>PIN Management</source>
452		<extracomment>LABEL DESKTOP_QML
453		----------
454		LABEL ANDROID IOS</extracomment>
	456	<extracomment>LABEL ANDROID IOS</extracomment>
455	457	<translation>PIN-Verwaltung</translation>
456	458	</message>
457	459	<message>
458	460	<source>Change PIN</source>
459	461	<extracomment>LABEL DESKTOP_QML
460	462	----------
461		LABEL ANDROID IOS</extracomment>
	463	LABEL DESKTOP_QML Processing screen label while the card communication is running after the old PIN has been entered during PIN change process.
	464	----------
	465	LABEL ANDROID IOS
	466	----------
	467	LABEL ANDROID IOS Processing screen label while the card communication is running before the new PIN has been entered during PIN change process.</extracomment>
462	468	<translation>PIN ändern</translation>
463	469	</message>
464	470	<message>
465		<source>Please don't move the ID card...</source>
	471	<source>Please don't move the ID card.</source>
466	472	<extracomment>INFO DESKTOP_QML Processing screen text while the card communication is running after the PIN has been entered during PIN change process.
467	473	----------
468	474	INFO ANDROID IOS Loading screen during PIN change process, data communcation is currently ongoing. Message is usually not visible since the password handling with basic reader is handled by EnterPasswordView.
469	475	----------
470	476	INFO ANDROID IOS Generic progress message during PIN change process.</extracomment>
471		<translation>Bitte den Ausweis nicht bewegen...</translation>
	477	<translation>Bitte den Ausweis nicht bewegen.</translation>
472	478	</message>
473	479	<message>
474	480	<source>The online identification function of your ID card is not activated. Please contact the authority responsible for issuing your identification card to activate the online identification function.</source>

481	487	<translation>Bitte beachten Sie die Anzeige Ihres Kartenlesers.</translation>
482	488	</message>
483	489	<message>
484		<source>A wrong PIN has been entered twice on your ID card. Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. You can find your card access number (CAN) on the front of your ID card.</source>
	490	<source>A wrong PIN has been entered twice on your ID card. For a third attempt, please first enter the six-digit Card Access Number (CAN). You can find your Card Access Number (CAN) in the bottom right on the front of your ID card.</source>
485	491	<extracomment>INFO ANDROID IOS The wrong PIN was entered twice, the next attempt requires additional verifcation via CAN.</extracomment>
486		<translation>Die PIN Ihres Ausweises wurde zweimal falsch eingegeben. Für einen dritten Versuch müssen Sie vorher die sechsstellige Zugangsnummer (CAN) eingeben. Diese finden Sie auf der Vorderseite Ihres Ausweises.</translation>
	492	<translation>Die PIN Ihres Ausweises wurde zweimal falsch eingegeben. Für einen dritten Versuch geben Sie bitte zunächst die sechsstellige Zugangsnummer (CAN) ein. Diese finden Sie unten rechts auf der Vorderseite Ihres Ausweises.</translation>
487	493	</message>
488	494	<message>
489	495	<source>A wrong PIN has been entered three times on your ID card. Your PIN is now blocked. To unblock your PIN you have to enter the PUK.</source>

509	515	- verbinden Sie das Smartphone mit dem Ladegerät</translation>
510	516	</message>
511	517	<message>
512		<source>Your ID card is unblocked. You now have three more tries to change your PIN</source>
	518	<source>Your ID card is unblocked. You now have three more attempts to change your PIN</source>
513	519	<extracomment>INFO DESKTOP_QML The ID card has just been unblocked and the user can now continue with their PIN change.
514	520	----------
515	521	INFO ANDROID IOS The ID card has just been unblocked and the user can now continue with their PIN change.</extracomment>
516	522	<translation>Ihr Ausweis wurde entsperrt. Sie haben nun drei weitere Versuche um Ihre PIN zu ändern</translation>
517	523	</message>
	524	<message>
	525	<source>Setting new PIN</source>
	526	<extracomment>LABEL DESKTOP_QML Processing screen label while the card communication is running after the new PIN has been entered during PIN change process.
	527	----------
	528	LABEL ANDROID IOS Processing screen label while the card communication is running after the new PIN has been entered during PIN change process.</extracomment>
	529	<translation>Neue PIN wird gesetzt</translation>
	530	</message>
518	531	</context>
519	532	<context>
520	533	<name>ChangePinViewContent</name>

524	537	<translation>PIN-Verwaltung</translation>
525	538	</message>
526	539	<message>
527		<source>You have the opportunity to change your transport PIN into a personal PIN. You can also change the PIN at any time or unblock the PIN using the personal unblocking key (PUK). The transport PIN and the PUK can be found in the letter sent to you by your competent authority.</source>
	540	<source>You have the opportunity to change your Transport PIN into a personal PIN. You can also change the PIN at any time or unblock the PIN using the Personal Unblocking Key (PUK). The Transport PIN and the PUK can be found in the letter sent to you by your competent authority.</source>
528	541	<extracomment>LABEL ANDROID IOS</extracomment>
529	542	<translation>Hier haben Sie die Möglichkeit, Ihre Transport-PIN in eine persönliche PIN zu ändern. Zudem können Sie jederzeit Ihre persönliche PIN ändern oder eine Blockierung mit Hilfe der Entsperrnummer (PUK) aufheben. Sie finden Ihre Transport-PIN und die PUK in dem Schreiben, das Sie nach Beantragung Ihres Ausweises von der für die Ausgabe Ihres Ausweises zuständigen Behörde erhalten haben.</translation>
530	543	</message>

532	545	<source>Change PIN now</source>
533	546	<extracomment>LABEL ANDROID IOS</extracomment>
534	547	<translation>Jetzt PIN ändern</translation>
	548	</message>
	549	</context>
	550	<context>
	551	<name>ConnectSacView</name>
	552	<message>
	553	<source>Pairing</source>
	554	<extracomment>LABEL DESKTOP_QML</extracomment>
	555	<translation>Kopplung</translation>
	556	</message>
	557	<message>
	558	<source>Pairing the device ...</source>
	559	<extracomment>LABEL DESKTOP_QML</extracomment>
	560	<translation>Das Gerät wird gekoppelt ...</translation>
	561	</message>
	562	<message>
	563	<source>The device "%1" has been paired.</source>
	564	<translation>Das Gerät "%1" wurde gekoppelt.</translation>
	565	</message>
	566	<message>
	567	<source>Pairing to "%1" failed:</source>
	568	<extracomment>ERROR DESKTOP_QML An error occurred while pairing the device.</extracomment>
	569	<translation>Die Kopplung mit "%1" ist fehlgeschlagen:</translation>
535	570	</message>
536	571	</context>
537	572	<context>

603	638	<extracomment>LABEL DESKTOP_QML</extracomment>
604	639	<translation>Zeige Beta-Test-Symbol</translation>
605	640	</message>
	641	<message>
	642	<source>Support CAN allowed mode</source>
	643	<extracomment>LABEL DESKTOP_QML</extracomment>
	644	<translation>CAN-erlaubt-Modus unterstützen</translation>
	645	</message>
	646	<message>
	647	<source>Skip rights page in CAN allowed mode</source>
	648	<extracomment>LABEL DESKTOP_QML</extracomment>
	649	<translation>Überspringe Berechtigungen-Seite im CAN-erlaubt-Modus</translation>
	650	</message>
606	651	</context>
607	652	<context>
608	653	<name>DetachedLogView</name>

619	664	<extracomment>LABEL DESKTOP_QML</extracomment>
620	665	<translation>Protokolldatei speichern</translation>
621	666	</message>
	667	<message>
	668	<source>Logfiles</source>
	669	<translation>Protokolldateien</translation>
	670	</message>
622	671	</context>
623	672	<context>
624	673	<name>DetailDialog</name>

681	730	</message>
682	731	</context>
683	732	<context>
684		<name>DeveloperView</name>
685		<message>
686		<source>Developer options</source>
687		<extracomment>LABEL ALL_PLATFORMS</extracomment>
688		<translation>Entwickleroptionen</translation>
689		</message>
690		<message>
691		<source>Testmode for the self-authentication</source>
692		<extracomment>LABEL ANDROID IOS</extracomment>
693		<translation>Testmodus für die Selbstauskunft</translation>
694		</message>
695		<message>
696		<source>Developer Mode</source>
697		<extracomment>LABEL ANDROID IOS</extracomment>
698		<translation>Entwicklermodus</translation>
699		</message>
700		<message>
701		<source>Use a more tolerant mode</source>
702		<extracomment>LABEL ANDROID IOS</extracomment>
703		<translation>Benutze einen toleranten Modus</translation>
704		</message>
705		<message>
706		<source>Change the layout style</source>
707		<extracomment>LABEL ALL_PLATFORMS</extracomment>
708		<translation>Ändere den Style des Layouts</translation>
709		</message>
710		<message>
711		<source>iOS</source>
712		<extracomment>LABEL ALL_PLATFORMS</extracomment>
713		<translation>iOS</translation>
714		</message>
715		<message>
716		<source>Android</source>
717		<extracomment>LABEL ALL_PLATFORMS</extracomment>
718		<translation>Android</translation>
719		</message>
720		<message>
721		<source>Tablet, Android</source>
722		<extracomment>LABEL ALL_PLATFORMS</extracomment>
723		<translation>Tablet, Android</translation>
724		</message>
725		<message>
726		<source>Use the test environment during a self-authentication</source>
727		<extracomment>LABEL ANDROID IOS</extracomment>
728		<translation>Benutze die Test-Umgebung während der Selbstauskunft</translation>
729		</message>
730		<message>
731		<source>Create dummy entries</source>
732		<extracomment>LABEL ALL_PLATFORMS</extracomment>
733		<translation>Erstelle Scheindaten</translation>
734		</message>
735		<message>
736		<source>Logfile</source>
737		<extracomment>LABEL ALL_PLATFORMS</extracomment>
738		<translation>Protokolldatei</translation>
739		</message>
740		<message>
741		<source>History</source>
742		<extracomment>LABEL ALL_PLATFORMS</extracomment>
743		<translation>Verlauf</translation>
744		</message>
745		</context>
746		<context>
747	733	<name>DevicesListDelegate</name>
748	734	<message>
749	735	<source>Device %1</source>

789	775	<extracomment>LABEL DESKTOP_QML</extracomment>
790	776	<translation>Speichern unter</translation>
791	777	</message>
	778	<message>
	779	<source>Textfiles</source>
	780	<translation>Textdateien</translation>
	781	</message>
	782	<message>
	783	<source>Diagnosis is still running</source>
	784	<extracomment>LABEL DESKTOP_QML</extracomment>
	785	<translation>Die Diagnose läuft noch</translation>
	786	</message>
	787	<message>
	788	<source>Diagnosis may be incomplete</source>
	789	<extracomment>LABEL DESKTOP_QML</extracomment>
	790	<translation>Die Diagnose könnte unvollständig sein</translation>
	791	</message>
792	792	</context>
793	793	<context>
794	794	<name>EditRights</name>

833	833	<translation>mehr...</translation>
834	834	</message>
835	835	<message>
836		<source>The following data will be transferred to the provider when you enter the PIN:</source>
	836	<source>Transactional information</source>
	837	<extracomment>LABEL DESKTOP_QML
	838	----------
	839	LABEL ANDROID_PHONE
	840	----------
	841	LABEL ANDROID_TABLET
	842	----------
	843	LABEL IOS_PHONE
	844	----------
	845	LABEL IOS_TABLET</extracomment>
	846	<translation>Transaktionsinformationen</translation>
	847	</message>
	848	<message>
	849	<source>Required Data</source>
	850	<extracomment>LABEL DESKTOP_QML
	851	----------
	852	LABEL ANDROID_PHONE
	853	----------
	854	LABEL ANDROID_TABLET
	855	----------
	856	LABEL IOS_PHONE
	857	----------
	858	LABEL IOS_TABLET</extracomment>
	859	<translation>Erforderliche Daten</translation>
	860	</message>
	861	<message>
	862	<source>Optional Data</source>
	863	<extracomment>LABEL DESKTOP_QML
	864	----------
	865	LABEL ANDROID_PHONE
	866	----------
	867	LABEL ANDROID_TABLET
	868	----------
	869	LABEL IOS_PHONE
	870	----------
	871	LABEL IOS_TABLET</extracomment>
	872	<translation>Optionale Daten</translation>
	873	</message>
	874	<message>
	875	<source>Identify</source>
	876	<extracomment>LABEL ANDROID_PHONE
	877	----------
	878	LABEL ANDROID_TABLET
	879	----------
	880	LABEL IOS_PHONE
	881	----------
	882	LABEL IOS_TABLET</extracomment>
	883	<translation>Ausweisen</translation>
	884	</message>
	885	<message>
	886	<source>Edit rights view</source>
	887	<translation>Anzeige zum Ändern der Berechtigungen</translation>
	888	</message>
	889	<message>
	890	<source>This is the edit rights view of the AusweisApp2.</source>
	891	<translation>Dies ist die Anzeige zum Ändern der Berechtigungen der AusweisApp2.</translation>
	892	</message>
	893	<message>
	894	<source>Click for more information about the provider</source>
	895	<translation>Klicke hier für mehr Informationen zum Anbieter</translation>
	896	</message>
	897	<message>
	898	<source>Proceed to %1 entry</source>
	899	<extracomment>LABEL DESKTOP_QML %1 can be "CAN" or "PIN"
	900	----------
	901	LABEL ANDROID_PHONE %1 can be "CAN" or "PIN"
	902	----------
	903	LABEL ANDROID_TABLET %1 can be "CAN" or "PIN"
	904	----------
	905	LABEL IOS_PHONE %1 can be "CAN" or "PIN"
	906	----------
	907	LABEL IOS_TABLET %1 can be "CAN" or "PIN"</extracomment>
	908	<translation>Weiter zur %1-Eingabe</translation>
	909	</message>
	910	<message>
	911	<source>You are about to identify yourself towards the following provider</source>
	912	<extracomment>LABEL DESKTOP_QML</extracomment>
	913	<translation>Sie möchten sich bei folgendem Anbieter ausweisen</translation>
	914	</message>
	915	<message>
	916	<source>Show more information about the service provider</source>
	917	<translation>Zeige mehr Informationen über den Anbieter</translation>
	918	</message>
	919	<message>
	920	<source>CAN</source>
	921	<extracomment>LABEL DESKTOP_QML Inserted into "Proceed to %1 entry"
	922	----------
	923	LABEL ANDROID_PHONE Inserted into "Proceed to %1 entry"
	924	----------
	925	LABEL ANDROID_TABLET Inserted into "Proceed to %1 entry"
	926	----------
	927	LABEL IOS_PHONE Inserted into "Proceed to %1 entry"
	928	----------
	929	LABEL IOS_TABLET Inserted into "Proceed to %1 entry"</extracomment>
	930	<translation>CAN</translation>
	931	</message>
	932	<message>
	933	<source>PIN</source>
	934	<extracomment>LABEL DESKTOP_QML Inserted into "Proceed to %1 entry"
	935	----------
	936	LABEL ANDROID_PHONE Inserted into "Proceed to %1 entry"
	937	----------
	938	LABEL ANDROID_TABLET Inserted into "Proceed to %1 entry"
	939	----------
	940	LABEL IOS_PHONE Inserted into "Proceed to %1 entry"
	941	----------
	942	LABEL IOS_TABLET Inserted into "Proceed to %1 entry"</extracomment>
	943	<translation>PIN</translation>
	944	</message>
	945	<message>
	946	<source>The following data of the ID card will be transferred to the provider when you enter the CAN:</source>
	947	<extracomment>LABEL DESKTOP_QML
	948	----------
	949	LABEL ANDROID_PHONE
	950	----------
	951	LABEL ANDROID_TABLET
	952	----------
	953	LABEL IOS_PHONE
	954	----------
	955	LABEL IOS_TABLET</extracomment>
	956	<translation>Folgende Daten des Ausweises werden nach Eingabe der CAN ausgelesen und an den Anbieter übermittelt:</translation>
	957	</message>
	958	<message>
	959	<source>The following data of your ID card will be transferred to the provider when you enter the PIN:</source>
837	960	<extracomment>LABEL DESKTOP_QML
838	961	----------
839	962	LABEL ANDROID_PHONE

845	968	LABEL IOS_TABLET</extracomment>
846	969	<translation>Folgende Daten Ihres Ausweises werden nach Eingabe der PIN ausgelesen und an den Anbieter übermittelt:</translation>
847	970	</message>
848		<message>
849		<source>Transactional information</source>
850		<extracomment>LABEL DESKTOP_QML
851		----------
852		LABEL ANDROID_PHONE
853		----------
854		LABEL ANDROID_TABLET
855		----------
856		LABEL IOS_PHONE
857		----------
858		LABEL IOS_TABLET</extracomment>
859		<translation>Transaktionsinformationen</translation>
860		</message>
861		<message>
862		<source>Required Data</source>
863		<extracomment>LABEL DESKTOP_QML
864		----------
865		LABEL ANDROID_PHONE
866		----------
867		LABEL ANDROID_TABLET
868		----------
869		LABEL IOS_PHONE
870		----------
871		LABEL IOS_TABLET</extracomment>
872		<translation>Erforderliche Daten</translation>
873		</message>
874		<message>
875		<source>Optional Data</source>
876		<extracomment>LABEL DESKTOP_QML
877		----------
878		LABEL ANDROID_PHONE
879		----------
880		LABEL ANDROID_TABLET
881		----------
882		LABEL IOS_PHONE
883		----------
884		LABEL IOS_TABLET</extracomment>
885		<translation>Optionale Daten</translation>
886		</message>
887		<message>
888		<source>Identify</source>
889		<extracomment>LABEL ANDROID_PHONE
890		----------
891		LABEL ANDROID_TABLET
892		----------
893		LABEL IOS_PHONE
894		----------
895		LABEL IOS_TABLET</extracomment>
896		<translation>Ausweisen</translation>
897		</message>
898		<message>
899		<source>Edit rights view</source>
900		<translation>Anzeige zum Ändern der Berechtigungen</translation>
901		</message>
902		<message>
903		<source>This is the edit rights view of the AusweisApp2.</source>
904		<translation>Dies ist die Anzeige zum Ändern der Berechtigungen der AusweisApp2.</translation>
905		</message>
906		<message>
907		<source>Click for more information about the provider</source>
908		<translation>Klicke hier für mehr Informationen zum Anbieter</translation>
909		</message>
910		<message>
911		<source>Proceed to %1 entry</source>
912		<extracomment>LABEL DESKTOP_QML %1 can be "card access number (CAN)" or "PIN"
913		----------
914		LABEL ANDROID_PHONE %1 can be "card access number (CAN)" or "PIN"
915		----------
916		LABEL ANDROID_TABLET %1 can be "card access number (CAN)" or "PIN"
917		----------
918		LABEL IOS_PHONE %1 can be "card access number (CAN)" or "PIN"
919		----------
920		LABEL IOS_TABLET %1 can be "card access number (CAN)" or "PIN"</extracomment>
921		<translation>Weiter zur %1-Eingabe</translation>
922		</message>
923		<message>
924		<source>You are about to identify yourself towards the following provider</source>
925		<extracomment>LABEL DESKTOP_QML</extracomment>
926		<translation>Sie möchten sich bei folgendem Anbieter ausweisen</translation>
927		</message>
928		<message>
929		<source>Show more information about the service provider</source>
930		<translation>Zeige mehr Informationen über den Anbieter</translation>
931		</message>
932		<message>
933		<source>card access number (CAN)</source>
934		<extracomment>LABEL DESKTOP_QML Inserted into "Proceed to %1 entry"
935		----------
936		LABEL ANDROID_PHONE Inserted into "Proceed to %1 entry"
937		----------
938		LABEL ANDROID_TABLET Inserted into "Proceed to %1 entry"
939		----------
940		LABEL IOS_PHONE Inserted into "Proceed to %1 entry"
941		----------
942		LABEL IOS_TABLET Inserted into "Proceed to %1 entry"</extracomment>
943		<translation>Zugangsnummer (CAN)</translation>
944		</message>
945		<message>
946		<source>PIN</source>
947		<extracomment>LABEL DESKTOP_QML Inserted into "Proceed to %1 entry"
948		----------
949		LABEL ANDROID_PHONE Inserted into "Proceed to %1 entry"
950		----------
951		LABEL ANDROID_TABLET Inserted into "Proceed to %1 entry"
952		----------
953		LABEL IOS_PHONE Inserted into "Proceed to %1 entry"
954		----------
955		LABEL IOS_TABLET Inserted into "Proceed to %1 entry"</extracomment>
956		<translation>PIN</translation>
957		</message>
958	971	</context>
959	972	<context>
960	973	<name>EnterPasswordView</name>

980	993	<translation>Die neue PIN und ihre Wiederholung stimmen nicht überein. Bitte korrigieren Sie Ihre Eingabe.</translation>
981	994	</message>
982	995	<message>
983		<source>Please enter your 6-digit PIN. Use the keyboard or numpad.</source>
984		<extracomment>INFO DESKTOP_QML The AA2 expects a PIN with 6 digits which can be entered via the physical or onscreen keyboard.</extracomment>
985		<translation>Bitte geben Sie Ihre sechsstellige PIN ein. Benutzen Sie dazu die Tastatur oder die Bildschirmtastatur.</translation>
	996	<source>Please enter your six-digit PIN.</source>
	997	<extracomment>INFO DESKTOP_QML The AA2 expects a PIN with six digits in an authentication.</extracomment>
	998	<translation>Bitte geben Sie Ihre sechsstellige PIN ein.</translation>
986	999	</message>
987	1000	<message>
988	1001	<source>More information</source>

990	1003	<translation>Mehr Informationen</translation>
991	1004	</message>
992	1005	<message>
993		<source>Please enter the 6-digit card access number (CAN).</source>
994		<extracomment>INFO DESKTOP_QML The operator is required to enter the 6-digit CAN in CAN-allowed authentication.</extracomment>
995		<translation>Bitte geben Sie Ihre sechsstellige Zugangsnummer (CAN) ein.</translation>
996		</message>
997		<message>
998		<source>A wrong PIN has been entered twice on your ID card. Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. You can find your card access number (CAN) on the front of your ID card.</source>
999		<extracomment>INFO DESKTOP_QML The PIN was entered wrongfully twice, this may have happened during an earlier session of the AA2, too. The user needs to enter the CAN for additional verification.
1000		----------
1001		INFO ANDROID IOS The wrong PIN was entered twice, the third attempt requires the CAN for additional verification, hint where the CAN is found.</extracomment>
1002		<translation>Die PIN Ihres Ausweises wurde zweimal falsch eingegeben. Für einen dritten Versuch müssen Sie vorher die sechsstellige Zugangsnummer (CAN) eingeben. Diese finden Sie auf der Vorderseite Ihres Ausweises.</translation>
1003		</message>
1004		<message>
1005		<source>The PIN of your ID card is blocked after three incorrect tries. The block can be lifted by entering your personal unblocking key (PUK).</source>
	1006	<source>Please enter the six-digit Card Access Number (CAN). You can find your Card Access Number (CAN) in the bottom right on the front of the ID card.</source>
	1007	<extracomment>INFO DESKTOP_QML The user is required to enter the six-digit CAN in CAN-allowed authentication.</extracomment>
	1008	<translation>Bitte geben Sie die sechsstellige Zugangsnummer (CAN) ein. Diese finden Sie unten rechts auf der Vorderseite des Ausweises.</translation>
	1009	</message>
	1010	<message>
	1011	<source>A wrong PIN has been entered twice on your ID card. For a third attempt, please first enter the six-digit Card Access Number (CAN). You can find your Card Access Number (CAN) in the bottom right on the front of your ID card.</source>
	1012	<extracomment>INFO ANDROID IOS The wrong PIN was entered twice, the third attempt requires the CAN for additional verification, hint where the CAN is found.</extracomment>
	1013	<translation>Die PIN Ihres Ausweises wurde zweimal falsch eingegeben. Für einen dritten Versuch geben Sie bitte zunächst die sechsstellige Zugangsnummer (CAN) ein. Diese finden Sie rechts unten auf der Vorderseite Ihres Ausweises.</translation>
	1014	</message>
	1015	<message>
	1016	<source>The PIN of your ID card is blocked after three incorrect attempts. Please enter the Personal Unblocking Key (PUK) to lift the block. You can find the key in your PIN letter.</source>
1006	1017	<extracomment>INFO DESKTOP_QML The PUK is required to unlock the ID card.</extracomment>
1007		<translation>Die PIN Ihres Ausweises ist nach dreimaliger Fehleingabe gesperrt. Die Sperrung können Sie mit der Entsperrnummer (PUK) aufheben.</translation>
1008		</message>
1009		<message>
1010		<source>Please enter a new 6-digit PIN now.</source>
1011		<extracomment>INFO DESKTOP_QML A new 6-digit PIN needs to be supplied.
1012		----------
1013		INFO ANDROID IOS A new 6-digit PIN needs to be supplied.</extracomment>
1014		<translation>Vergeben Sie bitte nun eine neue sechsstellige PIN.</translation>
1015		</message>
1016		<message>
1017		<source>Please confirm your new 6-digit PIN.</source>
	1018	<translation>Die PIN Ihres Ausweises ist nach dreimaliger Fehleingabe gesperrt. Bitte geben Sie zur Aufhebung der Sperrung die zehnstellige Entsperrnummer (PUK) ein. Diese finden Sie in Ihrem PIN-Brief.</translation>
	1019	</message>
	1020	<message>
	1021	<source>Please enter a new six-digit PIN now.</source>
	1022	<extracomment>INFO DESKTOP_QML A new six-digit PIN needs to be supplied.
	1023	----------
	1024	INFO ANDROID IOS A new six-digit PIN needs to be supplied.</extracomment>
	1025	<translation>Bitte geben Sie nun eine neue sechsstellige PIN ein.</translation>
	1026	</message>
	1027	<message>
	1028	<source>Please confirm your new six-digit PIN.</source>
1018	1029	<extracomment>INFO DESKTOP_QML The new PIN needs to be entered again for verification.
1019	1030	----------
1020	1031	INFO ANDROID IOS The new PIN needs to be confirmed.</extracomment>
1021		<translation>Wiederholen Sie bitte Ihre neue sechsstellige PIN.</translation>
	1032	<translation>Bitte wiederholen Sie die Eingabe Ihrer neuen sechsstelligen PIN.</translation>
1022	1033	</message>
1023	1034	<message>
1024	1035	<source>Unknown password type:</source>

1026	1037	<translation>Unbekannter Passwort-Typ:</translation>
1027	1038	</message>
1028	1039	<message>
1029		<source>Does your PIN have 6 digits?</source>
1030		<extracomment>LABEL DESKTOP_QML Button to switch to a 6-digit PIN.
1031		----------
1032		LABEL ANDROID IOS Button to switch to a 6-digit PIN.</extracomment>
	1040	<source>Does your PIN have six digits?</source>
	1041	<extracomment>LABEL DESKTOP_QML Button to switch to a six-digit PIN.
	1042	----------
	1043	LABEL ANDROID IOS Button to switch to a six-digit PIN.</extracomment>
1033	1044	<translation>Ist Ihre PIN sechsstellig?</translation>
1034	1045	</message>
1035	1046	<message>
1036		<source>Does your PIN have 5 digits?</source>
1037		<extracomment>LABEL DESKTOP_QML Button to switch to a transport PIN or start a change of the transport PIN.
1038		----------
1039		LABEL ANDROID IOS Button to switch to a transport PIN or start a change of the transport PIN.</extracomment>
	1047	<source>Does your PIN have five digits?</source>
	1048	<extracomment>LABEL DESKTOP_QML Button to switch to a Transport PIN or start a change of the Transport PIN.
	1049	----------
	1050	LABEL ANDROID IOS Button to switch to a Transport PIN or start a change of the Transport PIN.</extracomment>
1040	1051	<translation>Ist Ihre PIN fünfstellig?</translation>
1041	1052	</message>
1042	1053	<message>
1043		<source>Please enter the 6-digit card access number (CAN). You can find it on the front of the ID card.</source>
	1054	<source>Please enter the six-digit Card Access Number (CAN). You can find it in the bottom right on the front of the ID card.</source>
1044	1055	<extracomment>INFO ANDROID IOS The CAN needs to be entered in CAN-allowed mode, hint where the CAN can be found.</extracomment>
1045		<translation>Bitte geben Sie die sechsstellige Zugangsnummer (CAN) ein. Diese finden Sie auf der Vorderseite des Ausweises.</translation>
	1056	<translation>Bitte geben Sie die sechsstellige Zugangsnummer (CAN) ein. Diese finden Sie unten rechts auf der Vorderseite des Ausweises.</translation>
1046	1057	</message>
1047	1058	<message>
1048	1059	<source>A wrong PIN has been entered three times on your ID card. Your PIN is now blocked. To unblock your PIN you have to enter the PUK.</source>

1050	1061	<translation>Die PIN Ihres Ausweises wurde dreimal falsch eingegeben. Ihre PIN ist gesperrt. Zum Entsperren geben Sie bitte Ihre PUK ein.</translation>
1051	1062	</message>
1052	1063	<message>
1053		<source>Please enter the transport PIN from your PIN letter.</source>
1054		<extracomment>INFO ANDROID IOS The transport PIN is required by AA2, it needs to be change to an actual PIN.</extracomment>
	1064	<source>Please enter the Transport PIN from your PIN letter.</source>
	1065	<extracomment>INFO ANDROID IOS The Transport PIN is required by AA2, it needs to be change to an actual PIN.</extracomment>
1055	1066	<translation>Geben Sie bitte die Transport-PIN aus dem PIN-Brief ein.</translation>
1056	1067	</message>
1057	1068	<message>

1065	1076	<translation>Geben Sie bitte Ihre PIN ein.</translation>
1066	1077	</message>
1067	1078	<message>
1068		<source>Please enter your 5-digit Transport PIN. Use the keyboard or numpad.</source>
1069		<extracomment>INFO DESKTOP_QML The AA2 expects a PIN with 5 digits which can be entered via the physical or onscreen keyboard</extracomment>
1070		<translation>Bitte geben Sie Ihre fünfstellige Transport-PIN ein. Benutzen Sie dazu die Tastatur oder den Ziffernblock.</translation>
	1079	<source>Please enter the five-digit Transport PIN.</source>
	1080	<extracomment>INFO DESKTOP_QML The AA2 expects the Transport PIN with five digits.</extracomment>
	1081	<translation>Bitte geben Sie die fünfstellige Transport-PIN ein.</translation>
1071	1082	</message>
1072	1083	<message>
1073	1084	<source>%1. You can start to enter the number.</source>

1075	1086	<translation>%1. Sie können nun Ihre Nummer eingeben.</translation>
1076	1087	</message>
1077	1088	<message>
1078		<source>PIN entry</source>
1079		<extracomment>LABEL DESKTOP_QML</extracomment>
1080		<translation>PIN-Eingabe</translation>
1081		</message>
1082		<message>
1083		<source>CAN entry</source>
1084		<extracomment>LABEL DESKTOP_QML</extracomment>
1085		<translation>CAN-Eingabe</translation>
1086		</message>
1087		<message>
1088		<source>PUK entry</source>
1089		<extracomment>LABEL DESKTOP_QML</extracomment>
1090		<translation>PUK-Eingabe</translation>
1091		</message>
1092		<message>
1093		<source>Pairing code</source>
1094		<extracomment>LABEL DESKTOP_QML</extracomment>
1095		<translation>Kopplungscode</translation>
1096		</message>
1097		<message>
1098		<source>Start the pairing on your smartphone and enter the shown pairing code in order to use your smartphone as a card reader (SaC).</source>
	1089	<source>Enter PIN</source>
	1090	<extracomment>LABEL DESKTOP_QML</extracomment>
	1091	<translation>PIN eingeben</translation>
	1092	</message>
	1093	<message>
	1094	<source>Enter CAN</source>
	1095	<extracomment>LABEL DESKTOP_QML</extracomment>
	1096	<translation>CAN eingeben</translation>
	1097	</message>
	1098	<message>
	1099	<source>Enter PUK</source>
	1100	<extracomment>LABEL DESKTOP_QML</extracomment>
	1101	<translation>PUK eingeben</translation>
	1102	</message>
	1103	<message>
	1104	<source>Enter pairing code</source>
	1105	<extracomment>LABEL DESKTOP_QML</extracomment>
	1106	<translation>Kopplungscode eingeben</translation>
	1107	</message>
	1108	<message>
	1109	<source>Start the pairing on your smartphone and enter the pairing code shown there in order to use your smartphone as a card reader (SaC).</source>
1099	1110	<extracomment>INFO DESKTOP_QML The pairing code needs to be supplied.</extracomment>
1100		<translation>Starten Sie die Kopplung auf Ihrem Smartphone und geben Sie den angezeigten Kopplungscode ein um Ihr Smartphone als Kartenleser (SaK) zu verwenden.</translation>
	1111	<translation>Starten Sie die Kopplung auf Ihrem Smartphone und geben Sie den dort angezeigten Kopplungscode ein um Ihr Smartphone als Kartenleser (SaK) zu verwenden.</translation>
	1112	</message>
	1113	<message>
	1114	<source>Please enter your current six-digit PIN.</source>
	1115	<extracomment>INFO DESKTOP_QML The AA2 expects the current PIN with six digits in a PIN change.</extracomment>
	1116	<translation>Bitte geben Sie Ihre aktuelle sechsstellige PIN ein.</translation>
	1117	</message>
	1118	<message>
	1119	<source>Please enter your current PIN.</source>
	1120	<extracomment>LABEL ANDROID IOS</extracomment>
	1121	<translation>Geben Sie bitte Ihre aktuelle PIN ein.</translation>
	1122	</message>
	1123	<message>
	1124	<source>Enter Transport PIN</source>
	1125	<extracomment>LABEL DESKTOP_QML</extracomment>
	1126	<translation>Transport-PIN eingeben</translation>
1101	1127	</message>
1102	1128	</context>
1103	1129	<context>

1169	1195	<source>Please note that the old UI will be removed in the next version of %1!</source>
1170	1196	<translation>Bitte beachten Sie, dass die alte grafische Nutzeroberfläche in der nächsten Version der %1 entfernt wird!</translation>
1171	1197	</message>
	1198	<message>
	1199	<source>Network</source>
	1200	<extracomment>LABEL DESKTOP_QML</extracomment>
	1201	<translation>Netzwerk</translation>
	1202	</message>
	1203	<message>
	1204	<source>Use the proxy (%1) specified during the installation.</source>
	1205	<extracomment>LABEL DESKTOP_QML</extracomment>
	1206	<translation>Benutze den bei der Installation angegebenen Proxy (%1).</translation>
	1207	</message>
1172	1208	</context>
1173	1209	<context>
1174	1210	<name>GeneralSettingsWidget</name>

1256	1292	<translation>Dies ist die allgemeine Fortschrittsansicht der AusweisApp2.</translation>
1257	1293	</message>
1258	1294	<message>
1259		<source>Change PIN</source>
1260		<extracomment>LABEL DESKTOP_QML</extracomment>
1261		<translation>PIN ändern</translation>
1262		</message>
1263		<message>
1264		<source>Identify</source>
1265		<extracomment>LABEL DESKTOP_QML</extracomment>
1266		<translation>Ausweisen</translation>
	1295	<source>Place ID card</source>
	1296	<extracomment>LABEL DESKTOP_QML</extracomment>
	1297	<translation>Ausweis auflegen</translation>
1267	1298	</message>
1268	1299	<message>
1269	1300	<source>The device %1 was unpaired because it did not react to connection attempts. Pair the device again to use it as a card reader.</source>

1284	1315	<translation>Schritt %1 von 3</translation>
1285	1316	</message>
1286	1317	<message>
1287		<source>Searching for card reader</source>
1288		<extracomment>LABEL DESKTOP_QML</extracomment>
1289		<translation>Suche nach Kartenleser</translation>
	1318	<source>Connect USB card reader or smartphone</source>
	1319	<extracomment>LABEL DESKTOP_QML</extracomment>
	1320	<translation>USB-Kartenleser oder Smartphone verbinden</translation>
1290	1321	</message>
1291	1322	<message>
1292	1323	<source>Information</source>

1294	1325	<translation>Information</translation>
1295	1326	</message>
1296	1327	<message>
1297		<source>No card reader detected. Please make sure that a card reader is connected. Open the %1reader settings%2 to configure reader and get more information about supported readers.</source>
	1328	<source>No card reader detected. Please make sure that a USB card reader is connected or a smartphone as cardreader is paired and available. Open the %1reader settings%2 to configure readers and get more information about supported readers.</source>
1298	1329	<extracomment>INFO DESKTOP_QML AA2 is waiting for the card reader or the ID card.</extracomment>
1299		<translation>Es wurde kein Kartenleser gefunden. Bitte stellen Sie sicher, dass ein Kartenleser angeschlossen ist. Öffnen Sie die %1Einstellungen%2 um Kartenleser zu konfigurieren und mehr Informationen zu unterstützten Kartenlesern zu erhalten.</translation>
	1330	<translation>Es wurde kein Kartenleser gefunden. Bitte überprüfen Sie, ob ein USB-Kartenleser angeschlossen bzw. ein Smartphone als Kartenleser gekoppelt und verfügbar ist. Öffnen Sie die %1Einstellungen%2, um Kartenleser zu konfigurieren und weitere Hinweise zu erhalten.</translation>
1300	1331	</message>
1301	1332	<message>
1302	1333	<source>The online identification function of your ID card is not activated. Please contact the authority responsible for issuing your identification card to activate the online identification function.</source>

1309	1340	<translation>Bitte beachten Sie die Anzeige Ihres Kartenlesers.</translation>
1310	1341	</message>
1311	1342	<message>
1312		<source>Connected to %1. Please place the NFC interface of the smartphone on your ID card.</source>
	1343	<source>No ID card detected. Please make sure that the NFC interface of the smartphone (connected to %1) is correctly placed on your ID card.</source>
1313	1344	<extracomment>INFO DESKTOP_QML The AA2 is waiting for the smartphone to be placed on the id.</extracomment>
1314		<translation>Verbunden mit %1. Bitte platzieren Sie das Smartphone mit der NFC-Schnittstelle auf Ihrem Ausweis.</translation>
1315		</message>
1316		<message>
1317		<source>Please place the smartphone (connected to %1) on your ID card or put the ID card on the card reader.</source>
1318		<extracomment>INFO DESKTOP_QML The AA2 is waiting for an ID card to be inserted into the card reader (or smartphone for that matter).</extracomment>
1319		<translation>Bitte platzieren Sie das Smartphone (verbunden mit %1) auf Ihrem Ausweis oder legen den Ausweis auf den Kartenleser.</translation>
	1345	<translation>Es wurde kein Ausweis erkannt. Bitte stellen Sie sicher, dass die NFC-Schnittstelle des Smartphones (verbunden mit %1) korrekt auf Ihrem Ausweis platziert ist.</translation>
1320	1346	</message>
1321	1347	<message>
1322	1348	<source>The used card reader does not meet the technical requirements (Extended Length not supported).</source>

1324	1350	<translation>Der verwendete Kartenleser erfüllt leider nicht die technischen Voraussetzungen (Extended Length wird nicht unterstützt).</translation>
1325	1351	</message>
1326	1352	<message>
1327		<source>Please put the ID card on the card reader.</source>
	1353	<source>No ID card detected. Please ensure that your ID card is placed on the card reader.</source>
1328	1354	<extracomment>INFO DESKTOP_QML The AA2 is waiting for an ID card to be inserted into the card reader.</extracomment>
1329		<translation>Bitte legen Sie den Ausweis auf das Kartenlesegerät.</translation>
	1355	<translation>Es wurde kein Ausweis erkannt. Bitte stellen Sie sicher, dass Ihr Ausweis auf dem Kartenleser aufliegt.</translation>
	1356	</message>
	1357	<message>
	1358	<source>Please place the smartphone (connected to %1) on your ID card or put the ID card on the card reader.</source>
	1359	<extracomment>INFO DESKTOP_QML The AA2 is waiting for an ID card to be inserted into the card reader (or smartphone for that matter).</extracomment>
	1360	<translation>Bitte platzieren Sie das Smartphone (verbunden mit %1) auf Ihrem Ausweis oder legen Sie den Ausweis auf den Kartenleser.</translation>
1330	1361	</message>
1331	1362	</context>
1332	1363	<context>

1489	1520	<source>Save as PDF...</source>
1490	1521	<extracomment>LABEL DESKTOP_QML</extracomment>
1491	1522	<translation>Als PDF speichern...</translation>
	1523	</message>
	1524	<message>
	1525	<source>Portable Document Format</source>
	1526	<translation>Portable Document Format</translation>
1492	1527	</message>
1493	1528	</context>
1494	1529	<context>

1665	1700	<translation>Berechtigungszertifikat wird heruntergeladen</translation>
1666	1701	</message>
1667	1702	<message>
1668		<source>Please wait a moment...</source>
	1703	<source>Please wait a moment.</source>
1669	1704	<extracomment>INFO DESKTOP_QML Information message about cancellation process with present network connectivity
1670	1705	----------
1671	1706	INFO DESKTOP_QML Generic progress status message while no card communication is active.

1673	1708	INFO DESKTOP_QML Generic progress status message during authentication.
1674	1709	----------
1675	1710	INFO ANDROID IOS Generic status message during the authentication process.</extracomment>
1676		<translation>Bitte warten Sie einen Moment...</translation>
	1711	<translation>Bitte warten Sie einen Moment.</translation>
1677	1712	</message>
1678	1713	<message>
1679	1714	<source>The online identification function of your ID card is not activated. Please contact the authority responsible for issuing your identification card to activate the online identification function.</source>

1702	1737	<translation>Bitte stellen Sie eine Internetverbindung her.</translation>
1703	1738	</message>
1704	1739	<message>
1705		<source>Change transport PIN</source>
	1740	<source>Change Transport PIN</source>
1706	1741	<extracomment>LABEL ANDROID IOS</extracomment>
1707	1742	<translation>Transport-PIN ändern</translation>
1708	1743	</message>

1740	1775	- verbinden Sie das Smartphone mit dem Ladegerät</translation>
1741	1776	</message>
1742	1777	<message>
1743		<source>Did you change the transport PIN already?</source>
	1778	<source>Did you change the Transport PIN already?</source>
1744	1779	<translation>Haben Sie Ihre Transport-PIN bereits geändert?</translation>
1745	1780	</message>
1746	1781	<message>
1747		<source>Prior to the first use of the online identification function you have to replace the transport PIN by an individual 6-digit PIN. Online identification with transport PIN is not possible.</source>
1748		<translation>Vor der ersten Nutzung der Online-Ausweisfunktion müssen Sie die Transport-PIN durch eine persönliche sechsstellige PIN ersetzen. Die Online-Indentifikation ist mit der Transport-PIN nicht möglich.</translation>
1749		</message>
1750		<message>
1751		<source>No, change transport PIN now</source>
	1782	<source>Prior to the first use of the online identification function you have to replace the Transport PIN by an individual six-digit PIN. Online identification with Transport PIN is not possible.</source>
	1783	<translation>Vor der ersten Nutzung der Online-Ausweisfunktion müssen Sie die Transport-PIN durch eine persönliche sechsstellige PIN ersetzen. Die Online-Identifikation ist mit der Transport-PIN nicht möglich.</translation>
	1784	</message>
	1785	<message>
	1786	<source>No, change Transport PIN now</source>
1752	1787	<translation>Nein, PIN jetzt ändern</translation>
1753	1788	</message>
1754	1789	<message>
1755		<source>A wrong PIN has been entered twice on your ID card. Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. You can find your card access number (CAN) on the front of your ID card.</source>
	1790	<source>A wrong PIN has been entered twice on your ID card. For a third attempt, please first enter the six-digit Card Access Number (CAN). You can find your Card Access Number (CAN) in the bottom right on the front of your ID card.</source>
1756	1791	<extracomment>INFO ANDROID IOS The PIN was entered wrongfully two times, the third attempts requires additional CAN verification, hint where the CAN is found.</extracomment>
1757		<translation>Die PIN Ihres Ausweises wurde zweimal falsch eingegeben. Für einen dritten Versuch müssen Sie vorher die sechsstellige Zugangsnummer (CAN) eingeben. Diese finden Sie auf der Vorderseite Ihres Ausweises.</translation>
1758		</message>
1759		<message>
1760		<source>First you have to change your 5-digit transport PIN you received in your in PIN letter into a 6-digit PIN. You are currently leaving the started process and are forwarded to the PIN management. Please restart the desired process after the PIN has been changed.</source>
1761		<extracomment>INFO DESKTOP_QML The user clicked that the current PIN has 5 digits (transport PIN) which needs to be changed to a 6-digit PIN. The current process will be aborted and needs to be restarted manually by the user.
1762		----------
1763		INFO ANDROID IOS The user clicked that the current PIN has 5 digits (transport PIN), it needs to be changed to an ordinary 6-digit PIN. The current process needs to be restarted manually by the user.</extracomment>
	1792	<translation>Die PIN Ihres Ausweises wurde zweimal falsch eingegeben. Für einen dritten Versuch geben Sie bitte zunächst die sechsstellige Zugangsnummer (CAN) ein. Diese finden Sie unten rechts auf der Vorderseite Ihres Ausweises.</translation>
	1793	</message>
	1794	<message>
	1795	<source>First you have to change your five-digit Transport PIN you received in your in PIN letter into a six-digit PIN. You are currently leaving the started process and are forwarded to the PIN management. Please restart the desired process after the PIN has been changed.</source>
	1796	<extracomment>INFO DESKTOP_QML The user clicked that the current PIN has five digits (Transport PIN) which needs to be changed to a six-digit PIN. The current process will be aborted and needs to be restarted manually by the user.
	1797	----------
	1798	INFO ANDROID IOS The user clicked that the current PIN has five digits (Transport PIN), it needs to be changed to an ordinary six-digit PIN. The current process needs to be restarted manually by the user.</extracomment>
1764	1799	<translation>Sie müssen die fünfstellige Transport-PIN aus dem PIN-Brief zunächst in eine sechsstellige PIN ändern. Sie verlassen den laufenden Vorgang und werden zur PIN-Verwaltung weitergeleitet. Starten Sie den gewünschten Vorgang bitte nach der PIN-Änderung erneut.</translation>
1765	1800	</message>
1766	1801	<message>
1767		<source>Please don't move the ID card...</source>
	1802	<source>Please don't move the ID card.</source>
1768	1803	<extracomment>INFO DESKTOP_QML Second line text if a basic card reader is used and data is exchanged with the card/server in the background. Is not actually visible since the basic reader password handling is done by EnterPasswordView.
1769	1804	----------
1770	1805	INFO ANDROID IOS Second line text if a basic card reader is used and background communication with the card/server is running. Is not actually visible since the basic reader password handling is done by EnterPasswordView.</extracomment>
1771		<translation>Bitte den Ausweis nicht bewegen...</translation>
	1806	<translation>Bitte den Ausweis nicht bewegen.</translation>
1772	1807	</message>
1773	1808	<message>
1774	1809	<source>Aborting process and informing the service provider</source>

1780	1815	<extracomment>INFO DESKTOP_QML Information message about cancellation process without working network connectivity</extracomment>
1781	1816	<translation>Es wurden Netzwerkprobleme erkannt. Die Verbindung wird weiterhin für 30 Sekunden versucht.</translation>
1782	1817	</message>
	1818	<message>
	1819	<source>Error code: %1</source>
	1820	<extracomment>INFO DESKTOP_QML Error code (string) of current GlobalStatus code, shown as header of popup.</extracomment>
	1821	<translation>Fehlercode: %1</translation>
	1822	</message>
1783	1823	</context>
1784	1824	<context>
1785	1825	<name>LanguageSelectionPopup</name>

1924	1964	<source>Detach log viewer</source>
1925	1965	<translation>Protokoll separat anzeigen</translation>
1926	1966	</message>
	1967	<message>
	1968	<source>Logfiles</source>
	1969	<translation>Logdateien</translation>
	1970	</message>
1927	1971	</context>
1928	1972	<context>
1929	1973	<name>MainView</name>

1946	1990	<translation>Verlauf</translation>
1947	1991	</message>
1948	1992	<message>
1949		<source>PIN-Management</source>
1950		<extracomment>LABEL DESKTOP_QML</extracomment>
1951		<translation>PIN-Verwaltung</translation>
	1993	<source>Change PIN</source>
	1994	<extracomment>LABEL DESKTOP_QML</extracomment>
	1995	<translation>PIN ändern</translation>
1952	1996	</message>
1953	1997	<message>
1954	1998	<source>Settings</source>

1961	2005	<translation>Hilfe</translation>
1962	2006	</message>
1963	2007	<message>
1964		<source>Self-Authentication</source>
1965		<extracomment>LABEL DESKTOP_QML</extracomment>
1966		<translation>Selbstauskunft</translation>
	2008	<source>See my personal data</source>
	2009	<extracomment>LABEL DESKTOP_QML</extracomment>
	2010	<translation>Meine Daten einsehen</translation>
1967	2011	</message>
1968	2012	</context>
1969	2013	<context>
1970	2014	<name>MoreView</name>
1971	2015	<message>
1972	2016	<source>More</source>
1973		<extracomment>LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2017	<extracomment>LABEL IOS</extracomment>
1974	2018	<translation>Mehr</translation>
1975	2019	</message>
1976	2020	<message>

1979	2023	----------
1980	2024	LABEL ANDROID
1981	2025	----------
1982		LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2026	LABEL IOS</extracomment>
1983	2027	<translation>Versionsinformationen</translation>
1984	2028	</message>
1985	2029	<message>
1986	2030	<source>FAQ</source>
1987	2031	<extracomment>LABEL ANDROID
1988	2032	----------
1989		LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2033	LABEL IOS</extracomment>
1990	2034	<translation>FAQ</translation>
1991	2035	</message>
1992	2036	<message>
1993	2037	<source>Support</source>
1994	2038	<extracomment>LABEL ANDROID
1995	2039	----------
1996		LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2040	LABEL IOS</extracomment>
1997	2041	<translation>Support</translation>
1998	2042	</message>
1999	2043	<message>
2000	2044	<source>Rate app</source>
2001		<extracomment>LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2045	<extracomment>LABEL IOS</extracomment>
2002	2046	<translation>Bewerten</translation>
2003	2047	</message>
2004	2048	<message>
2005	2049	<source>Software license</source>
2006	2050	<extracomment>LABEL ANDROID
2007	2051	----------
2008		LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2052	LABEL IOS</extracomment>
2009	2053	<translation>Softwarelizenz</translation>
2010	2054	</message>
2011	2055	<message>
2012	2056	<source>https://www.ausweisapp.bund.de/en/download/android/</source>
2013		<extracomment>LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2057	<extracomment>LABEL IOS</extracomment>
2014	2058	<translation>https://www.ausweisapp.bund.de/download/android/</translation>
2015	2059	</message>
2016	2060	<message>
2017	2061	<source>https://www.ausweisapp.bund.de/en/download/ios/</source>
2018		<extracomment>LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2062	<extracomment>LABEL IOS</extracomment>
2019	2063	<translation>https://www.ausweisapp.bund.de/download/ios/</translation>
2020	2064	</message>
2021	2065	<message>
2022	2066	<source>https://www.ausweisapp.bund.de/en/download/windows-and-mac/</source>
2023		<extracomment>LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2067	<extracomment>LABEL IOS</extracomment>
2024	2068	<translation>https://www.ausweisapp.bund.de/download/windows-und-mac/</translation>
2025	2069	</message>
2026	2070	<message>
2027	2071	<source>History</source>
2028		<extracomment>LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2072	<extracomment>LABEL IOS</extracomment>
2029	2073	<translation>Verlauf</translation>
2030		</message>
2031		<message>
2032		<source>Developer options</source>
2033		<extracomment>LABEL ANDROID IOS DESKTOP_QML</extracomment>
2034		<translation>Entwickleroptionen</translation>
2035	2074	</message>
2036	2075	<message>
2037	2076	<source>Show log</source>
2038	2077	<extracomment>LABEL ANDROID
2039	2078	----------
2040		LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2079	LABEL IOS</extracomment>
2041	2080	<translation>Protokoll anzeigen</translation>
2042	2081	</message>
2043	2082	<message>
2044	2083	<source>Tutorial</source>
2045	2084	<extracomment>LABEL ANDROID
2046	2085	----------
2047		LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2086	LABEL IOS</extracomment>
2048	2087	<translation>Tutorial</translation>
2049	2088	</message>
2050	2089	<message>
2051	2090	<source>https://www.ausweisapp.bund.de/en/qa/frequently-asked-questions/</source>
2052		<extracomment>LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2091	<extracomment>LABEL IOS</extracomment>
2053	2092	<translation>https://www.ausweisapp.bund.de/fragen-und-antworten/haeufig-gestellte-fragen/</translation>
2054	2093	</message>
2055	2094	<message>
2056	2095	<source>https://www.ausweisapp.bund.de/en/qa/support/</source>
2057		<extracomment>LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2096	<extracomment>LABEL IOS</extracomment>
2058	2097	<translation>https://www.ausweisapp.bund.de/fragen-und-antworten/support/</translation>
2059	2098	</message>
2060	2099	<message>
2061	2100	<source>Report error</source>
2062	2101	<extracomment>LABEL ANDROID
2063	2102	----------
2064		LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2103	LABEL IOS</extracomment>
2065	2104	<translation>Melden Sie einen Fehler</translation>
2066	2105	</message>
2067	2106	<message>

2103	2142	<source>Release notes</source>
2104	2143	<extracomment>LABEL ANDROID
2105	2144	----------
2106		LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2145	LABEL IOS</extracomment>
2107	2146	<translation>Release Notes</translation>
2108	2147	</message>
2109	2148	<message>
2110	2149	<source>Settings</source>
2111		<extracomment>LABEL ANDROID IOS DESKTOP_QML</extracomment>
	2150	<extracomment>LABEL IOS</extracomment>
2112	2151	<translation>Einstellungen</translation>
2113	2152	</message>
2114	2153	<message>

2238	2277	<translation>Online-Hilfe</translation>
2239	2278	</message>
2240	2279	<message>
2241		<source>Help</source>
2242		<extracomment>LABEL DESKTOP_QML</extracomment>
2243		<translation>Hilfe</translation>
2244		</message>
2245		<message>
2246	2280	<source>Software licenses</source>
2247	2281	<extracomment>LABEL DESKTOP_QML</extracomment>
2248	2282	<translation>Softwarelizenzen</translation>

2354	2388	<translation>Hilfe & Feedback</translation>
2355	2389	</message>
2356	2390	<message>
2357		<source>Smartphone as card reader</source>
2358		<translation>Smartphone als Kartenleser</translation>
2359		</message>
2360		<message>
2361		<source>Developer options</source>
2362		<translation>Entwickleroptionen</translation>
	2391	<source>Remote service</source>
	2392	<translation>Fernzugriff</translation>
2363	2393	</message>
2364	2394	<message>
2365	2395	<source>More</source>

2382	2412	<translation>Diese Funktion steht auf Ihrem Gerät leider nicht zur Verfügung.</translation>
2383	2413	</message>
2384	2414	<message>
2385		<source>However you can use a seperate 'Bluetooth card reader' or a seperate 'smartphone as card reader' to utilize the online identification function.</source>
	2415	<source>However, you can use a separate 'smartphone as card reader' to utilize the online identification function.</source>
2386	2416	<extracomment>INFO ANDROID IOS AA2 can't use NFC on this device, suggest to use bluetooth instead.</extracomment>
2387		<translation>Sie können die Online-Ausweisfunktion aber mit einen separaten Bluetooth-Leser oder einem anderen Smartphone als Kartenleser nutzen.</translation>
	2417	<translation>Sie können die Online-Ausweisfunktion aber mit einem anderen Smartphone als Kartenleser nutzen.</translation>
2388	2418	</message>
2389	2419	<message>
2390	2420	<source>NFC is switched off.</source>

2406	2436	<translation>Verbindung wird hergestellt</translation>
2407	2437	</message>
2408	2438	<message>
2409		<source>Your device does not meet the technical requirements (Extended Length not supported). However you can use a seperate 'Bluetooth card reader' or a seperate 'smartphone as card reader' to utilize the online identification function.</source>
	2439	<source>Your device does not meet the technical requirements (Extended Length not supported). However you can use a separate 'smartphone as card reader' to utilize the online identification function.</source>
2410	2440	<extracomment>INFO ANDROID IOS The NFC interface does not meet the minimum requirements, using a bluetooth reader or a differnt smarthpone is suggested.</extracomment>
2411		<translation>Ihr Gerät erfüllt leider nicht die technischen Voraussetzungen (Extended Length). Sie können die Online-Ausweisfunktion aber mit einen separaten Bluetooth-Leser oder einem anderen Smartphone als Kartenleser nutzen.</translation>
	2441	<translation>Ihr Gerät erfüllt leider nicht die technischen Voraussetzungen (Extended Length). Sie können die Online-Ausweisfunktion aber mit einem anderen Smartphone als Kartenleser nutzen.</translation>
2412	2442	</message>
2413	2443	<message>
2414	2444	<source>The online identification function of your ID card is not activated. Please contact the authority responsible for issuing your identification card to activate the online identification function.</source>

2493	2523	<translation>Dies ist die Informationsansicht zu Passwörtern der AusweisApp2.</translation>
2494	2524	</message>
2495	2525	<message>
2496		<source>The personal identification number (PIN) is chosen by you and is required for every use of the online eID function. You can change it anytime and indefinitely if you know your valid PIN. For your 6-digit PIN choose a combination of numbers, that is not easy to guess, neither "123456" nor your birth date, or any other numbers printed on the ID card. If you are no longer aware of your valid PIN, you will need to contact the authority responsible for issuing your identification card to renew your PIN.<br><br>When changing the PIN for the first time, please use your 5-digit transport PIN. You will find the transport PIN in the letter you received from the authority responsible for issuing your identification card (marked in red) after you have applied for your identity card.<br><br>Please note that you can not use the online eID function with your 5-digit transport PIN. A change to a 6-digit PIN is mandatory.</source>
2497		<extracomment>INFO DESKTOP_QML Description text of PIN</extracomment>
2498		<translation>Die Geheimnummer (PIN) vergeben Sie selbst und benötigen Sie bei jeder Nutzung der Online-Ausweisfunktion. Sie können diese jederzeit und unbegrenzt oft ändern, solange Ihnen Ihre gültige PIN bekannt ist. Wählen Sie für Ihre sechsstellige PIN eine Zahlenkombination, die nicht leicht zu erraten ist, also weder "123456", noch Ihr Geburtsdatum oder andere Zahlen, die auf dem Ausweis aufgedruckt sind. Sollten Sie Ihre PIN vergessen haben, können Sie in der für die Ausgabe Ihres Ausweises zuständigen Behörde eine neue PIN setzen.<br><br>Zum erstmaligen Setzen Ihrer PIN verwenden Sie bitte die fünfstellige Transport-PIN. Sie finden diese in dem Schreiben, welches Sie nach Beantragung Ihres Ausweises von der zuständigen Behörde erhalten haben (rot markiert).<br><br>Bitte beachten Sie, dass die Online-Ausweisfunktion erst nach Änderung der fünfstelligen Transport-PIN in eine sechsstellige PIN genutzt werden kann.</translation>
2499		</message>
2500		<message>
2501		<source>The card access number (CAN) is required if the PIN has already been entered incorrectly twice. In order to prevent a third incorrect entry and thus the blocking of the PIN without your consent, the CAN is also requested at this point. The CAN is a 6-digit number that can be found on the front of the ID card. It is located at the bottom right next to the validity date (marked in red).</source>
	2526	<source>The Card Access Number (CAN) is required if the PIN has already been entered incorrectly twice. In order to prevent a third incorrect entry and thus the blocking of the PIN without your consent, the CAN is also requested at this point. The CAN is a six-digit number that can be found on the front of the ID card. It is located at the bottom right next to the validity date (marked in red).</source>
2502	2527	<extracomment>INFO DESKTOP_QML Description text of CAN if required for third PIN attempt</extracomment>
2503	2528	<translation>Die Zugangsnummer (CAN) wird verlangt, wenn die PIN bereits zwei Mal falsch eingegeben wurde. Um zu verhindern, dass ohne Ihre Zustimmung eine dritte Fehleingabe und somit die Sperrung der PIN erfolgen kann, wird an dieser Stelle zusätzlich die CAN abgefragt. Die CAN ist eine sechsstellige Zahl, die auf der Vorderseite des Ausweises unten rechts zu finden ist (rot markiert).</translation>
2504	2529	</message>
2505	2530	<message>
2506		<source>The personal unblocking key (PUK) is required if the PIN has been entered three times. At this point the PIN is blocked. The PUK is a 10-digit number you received with the letter sent to you by your competent authority (marked in red). Please note that you can only use the PUK to unblock the PIN entry. If you have forgotten your PIN, you can have a new PIN set at your competent authority.</source>
	2531	<source>The Personal Unblocking Key (PUK) is required if the PIN has been entered three times. At this point the PIN is blocked. The PUK is a ten-digit number you received with the letter sent to you by your competent authority (marked in red). Please note that you can only use the PUK to unblock the PIN entry. If you have forgotten your PIN, you can have a new PIN set at your competent authority.</source>
2507	2532	<extracomment>INFO DESKTOP_QML Description text of PUK</extracomment>
2508	2533	<translation>Die Entsperrnummer (PUK) wird verlangt, wenn die PIN drei Mal hintereinander falsch eingegeben wurde. Zu diesem Zeitpunkt ist die PIN gesperrt. Die PUK ist eine zehnstellige Zahl, die Sie mit dem Schreiben bekommen haben, welches Sie nach Beantragung Ihres Ausweises von der zuständigen Behörde erhalten haben (rot markiert). Bitte beachten Sie, dass Sie mit Ihrer PUK lediglich die PIN-Eingabe wieder entsperren können. Sollten Sie Ihre PIN vergessen haben, können Sie in der für die Ausgabe Ihres Ausweises zuständigen Behörde eine neue PIN setzen.</translation>
2509	2534	</message>

2538	2563	<translation>Smartphone als Kartenleser-Information</translation>
2539	2564	</message>
2540	2565	<message>
2541		<source>The card access number (CAN) allows to access the imprinted data of the ID card. In order to allow on-site reading of the personal data the service provider needs to acquire governmental authorization to do so. On-site reading is usually employed to automatically fill forms and prevent spelling mistakes when transfering the personal data.</source>
	2566	<source>The Card Access Number (CAN) allows to access the imprinted data of the ID card. In order to allow on-site reading of the personal data the service provider needs to acquire governmental authorization to do so. On-site reading is usually employed to automatically fill forms and prevent spelling mistakes when transfering the personal data.</source>
2542	2567	<extracomment>INFO DESKTOP_QML Description text of CAN-allowed authentication</extracomment>
2543	2568	<translation>Die Kartenzugriffsnummer (CAN) ermöglicht den Zugriff auf die auf dem Ausweis gespeicherten Daten. Um das Vor-Ort-Auslesen der persönlichen Daten zu Nutzen muss ein Diensteanbieter eine Zulassung durch eine staatliche Behörde erhalten. Die Vor-Ort-Auslesefunktion wird typischerweise zum automatischen Füllen von Formularen und insbesondere dem Verhindern von Fehlern beim Übertragen der persönlichen Daten eingesetzt.</translation>
2544	2569	</message>

2546	2571	<source>You may use your smartphone as a card reader with AusweisApp2. The smartphone needs to feature a supported NFC chipset and both devices, your smartphone and this machine, need to be connected to the same WiFi network.<br><br>To use your smartphone as a card reader you'll always need to activate the remote service in the AusweisApp2 on the smartphone. For the first time you'll also need to start the pairing mode on your smartphone, select the device from the list of available devices on this machine and then enter the pairing code shown on the phone.</source>
2547	2572	<extracomment>INFO DESKTOP_QML Description text of SaC pairing</extracomment>
2548	2573	<translation>Es besteht die Möglichkeit Ihr Smartphone als Kartenleser mit der AusweisApp2 zu verwenden. Das Smartphone muss einen unterstützten NFC-Chip verwenden und beide Geräte, sowohl das Smartphone als auch Ihr Rechner, müssen mit dem selben WLAN-Netz verbunden sein.<br><br>Um Ihr Smartphone als Kartenleser zu verwenden muss stets der Fernzugriff in der AusweisApp2 auf Ihrem Smartphone aktiviert sein. Für eine intiale Verbindung der Geräte muss zusätzlich der Kopplungsmodus auf dem Smartphone aktiviert werden, wählen Sie danach das Gerät aus der Liste der verfügbaren Geräte auf Ihrem Rechner und geben Sie den von Ihrem Smartphone dargestellten Kopplungscode ein.</translation>
	2574	</message>
	2575	<message>
	2576	<source>The Personal Identification Number (PIN) is chosen by you and is required for every use of the online eID function. You can change it anytime and indefinitely if you know your valid PIN. For your six-digit PIN choose a combination of numbers, that is not easy to guess, neither "123456" nor your birth date, or any other numbers printed on the ID card. If you are no longer aware of your valid PIN, you will need to contact the authority responsible for issuing your identification card to renew your PIN.<br><br>When changing the PIN for the first time, please use the five-digit Transport PIN. You will find the Transport PIN in the letter you received from the authority responsible for issuing your identification card (marked in red) after you have applied for your identity card.<br><br>Please note that you can not use the online eID function with the five-digit Transport PIN. A change to a six-digit PIN is mandatory.</source>
	2577	<extracomment>INFO DESKTOP_QML Description text of PIN</extracomment>
	2578	<translation>Die Persönliche Identifikationsnummer (PIN) vergeben Sie selbst und benötigen Sie bei jeder Nutzung der Online-Ausweisfunktion. Sie können diese jederzeit und unbegrenzt oft ändern, solange Ihnen Ihre gültige PIN bekannt ist. Wählen Sie für Ihre sechsstellige PIN eine Zahlenkombination, die nicht leicht zu erraten ist, also weder &quot;123456&quot;, noch Ihr Geburtsdatum oder andere Zahlen, die auf dem Ausweis aufgedruckt sind. Sollten Sie Ihre PIN vergessen haben, können Sie in der für die Ausgabe Ihres Ausweises zuständigen Behörde eine neue PIN setzen.<br><br>Zum erstmaligen Setzen Ihrer PIN verwenden Sie bitte die fünfstellige Transport-PIN. Sie finden diese in dem Schreiben, welches Sie nach Beantragung Ihres Ausweises von der zuständigen Behörde erhalten haben (rot markiert).<br><br>Bitte beachten Sie, dass die Online-Ausweisfunktion erst nach Änderung der fünfstelligen Transport-PIN in eine sechsstellige PIN genutzt werden kann.</translation>
2549	2579	</message>
2550	2580	</context>
2551	2581	<context>

2614	2644	<message>
2615	2645	<source>Select a secure PIN that consists of six digits. Do not select a number that can be guessed easily, such as "123456", your date of birth or any other number that is printed on your ID card.
2616	2646
2617		When you change your PIN for the first time, please enter your five-digit transport PIN in the field "Current PIN / Transport PIN". You received your transport PIN with the letter sent to you by your competent authority.
	2647	When you change your PIN for the first time, please enter the five-digit Transport PIN in the field "Current PIN / Transport PIN". You received your Transport PIN with the letter sent to you by your competent authority.
2618	2648
2619	2649	Please note that the PIN may only consist of digits (0-9).</source>
2620	2650	<translation>Wählen Sie für Ihre sechsstellige PIN eine Zahlenkombination, die nicht leicht zu erraten ist, also weder "123456", noch Ihr Geburtsdatum oder andere Zahlen, die auf dem Ausweis aufgedruckt sind.
2621	2651
2622		Bei der erstmaligen PIN-Änderung geben Sie bitte in das Feld "Aktuelle PIN / Transport-PIN" Ihre fünfstellige Transport-PIN ein. Sie finden die Transport-PIN in dem Schreiben, das Sie nach Beantragung Ihres Ausweises von der für die Ausgabe Ihres Ausweises zuständigen Behörde erhalten haben.</translation>
2623		</message>
2624		<message>
2625		<source>A wrong PIN has been entered twice on your ID card. Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. You can find your card access number (CAN) on the front of your ID card.</source>
2626		<translation>Die PIN Ihres Ausweises wurde zweimal falsch eingegeben. Für einen dritten Versuch müssen Sie vorher die sechsstellige Zugangsnummer (CAN) eingeben. Diese finden Sie auf der Vorderseite Ihres Ausweises.</translation>
	2652	Bei der erstmaligen PIN-Änderung geben Sie bitte in das Feld "Aktuelle PIN / Transport-PIN" die fünfstellige Transport-PIN ein. Sie finden die Transport-PIN in dem Schreiben, das Sie nach Beantragung Ihres Ausweises von der für die Ausgabe Ihres Ausweises zuständigen Behörde erhalten haben.</translation>
	2653	</message>
	2654	<message>
	2655	<source>A wrong PIN has been entered twice on your ID card. For a third attempt, please first enter the six-digit Card Access Number (CAN). You can find your Card Access Number (CAN) in the bottom right on the front of your ID card.</source>
	2656	<translation>Die PIN Ihres Ausweises wurde zweimal falsch eingegeben. Für einen dritten Versuch geben Sie bitte zunächst die sechsstellige Zugangsnummer (CAN) ein. Diese finden Sie unten rechts auf der Vorderseite Ihres Ausweises.</translation>
2627	2657	</message>
2628	2658	<message>
2629	2659	<source>Current PIN / Transport PIN:</source>

2638	2668	<translation>Bestätigen:</translation>
2639	2669	</message>
2640	2670	<message>
2641		<source>Card access number (CAN):</source>
	2671	<source>Card Access Number (CAN):</source>
2642	2672	<translation>Zugangsnummer (CAN):</translation>
2643	2673	</message>
2644	2674	<message>

2658	2688	<translation>deactivatedReaderImageLabel</translation>
2659	2689	</message>
2660	2690	<message>
2661		<source>Click on "Change PIN" to enter your card access number (CAN) and then set a new PIN. You can find your card access number (CAN) on the front side of your ID card next to the date of expiry. On the electronic residence permit the card access number (CAN) is printed above your signature.</source>
	2691	<source>Click on "Change PIN" to enter your Card Access Number (CAN) and then set a new PIN. You can find your Card Access Number (CAN) on the front side of your ID card next to the date of expiry. On the electronic residence permit the Card Access Number (CAN) is printed above your signature.</source>
2662	2692	<translation>"Klicken Sie auf "PIN ändern", um zunächst Ihre Zugangsnummer (CAN) einzugeben und anschließend eine neue PIN zu setzen. Die Zugangsnummer (CAN) finden Sie beim Personalausweis auf der Vorderseite rechts neben dem letzten Tag der Gültigkeitsdauer. Beim elektronischen Aufenthaltstitel finden Sie die Zugangsnummer (CAN) über Ihrer Unterschrift.</translation>
2663	2693	</message>
2664	2694	<message>

2705	2735	Bitte beachten Sie, dass Sie mit Ihrer PUK lediglich Ihren Online-Ausweis entsperren können. Sollten Sie Ihre PIN vergessen haben, können Sie von der für die Ausgabe Ihres Ausweises zuständigen Behörde eine neue PIN setzen lassen.</translation>
2706	2736	</message>
2707	2737	<message>
2708		<source>Display of the card access number (CAN) in the lower right corner of the id card</source>
	2738	<source>Display of the Card Access Number (CAN) in the lower right corner of the id card</source>
2709	2739	<translation>Darstellung der Kartenzugangsnummer (CAN) in der unteren rechten Ecke des Ausweises</translation>
2710	2740	</message>
2711	2741	</context>

2774	2804	<context>
2775	2805	<name>ProviderDetailButtonBar</name>
2776	2806	<message>
2777		<source>ONLINE APPLICATION</source>
2778		<extracomment>LABEL ANDROID_TABLET IOS_TABLET</extracomment>
2779		<translation>Online-Anwendung</translation>
2780		</message>
2781		<message>
2782		<source>To online application</source>
2783		<extracomment>LABEL DESKTOP_QML</extracomment>
2784		<translation>Zur Online-Anwendung</translation>
	2807	<source>To provider</source>
	2808	<extracomment>LABEL DESKTOP_QML
	2809	----------
	2810	LABEL ANDROID_TABLET IOS_TABLET</extracomment>
	2811	<translation>Zum Anbieter</translation>
2785	2812	</message>
2786	2813	</context>
2787	2814	<context>

3097	3124	</message>
3098	3125	</context>
3099	3126	<context>
	3127	<name>ProxyCredentialsPopup</name>
	3128	<message>
	3129	<source>Proxy credential username</source>
	3130	<extracomment>LABEL DESKTOP Accessible name.</extracomment>
	3131	<translation>Benutzername für den Proxy</translation>
	3132	</message>
	3133	<message>
	3134	<source>Proxy credential password</source>
	3135	<extracomment>LABEL DESKTOP Accessible name.</extracomment>
	3136	<translation>Passwort für den Proxy</translation>
	3137	</message>
	3138	<message>
	3139	<source>Sign in</source>
	3140	<extracomment>LABEL DESKTOP Title of the proxy credentials popup.
	3141	----------
	3142	LABEL DESKTOP Text of the button in the proxy credentials popup.</extracomment>
	3143	<translation>Anmelden</translation>
	3144	</message>
	3145	<message>
	3146	<source>The proxy %1 requires username and password.</source>
	3147	<extracomment>LABEL DESKTOP Text of the proxy credentials popup. An example for %1 is http://proxy.example.com:1337.</extracomment>
	3148	<translation>Für den Proxy %1 sind ein Nutzername und ein Passwort erforderlich.</translation>
	3149	</message>
	3150	<message>
	3151	<source>Username</source>
	3152	<extracomment>LABEL DESKTOP Label of the textfield for the username.</extracomment>
	3153	<translation>Nutzername</translation>
	3154	</message>
	3155	<message>
	3156	<source>Password</source>
	3157	<extracomment>LABEL DESKTOP Label of the textfield for the password.</extracomment>
	3158	<translation>Passwort</translation>
	3159	</message>
	3160	</context>
	3161	<context>
3100	3162	<name>QObject</name>
3101	3163	<message>
3102	3164	<source>Please describe the error that occurred.</source>

3114	3176	<source>Critical errors:</source>
3115	3177	<translation>Kritische Fehler:</translation>
3116	3178	</message>
	3179	<message>
	3180	<source>Service URL</source>
	3181	<translation>Service URL</translation>
	3182	</message>
	3183	<message>
	3184	<source>Parameter of occurred error:</source>
	3185	<translation>Parameter des aufgetretenen Fehlers:</translation>
	3186	</message>
3117	3187	</context>
3118	3188	<context>
3119	3189	<name>RandomPinDialog</name>

3195	3265	<translation>Eingabe des Kopplungscodes</translation>
3196	3266	</message>
3197	3267	<message>
3198		<source>Enter the 4-digit pairing code shown on your other device.</source>
	3268	<source>Enter the four-digit pairing code shown on your other device.</source>
3199	3269	<translation>Geben Sie den vierstelligen Kopplungscode ein, der auf dem anderen Gerät angezeigt wird.</translation>
3200	3270	</message>
3201	3271	</context>

3322	3392	<extracomment>LABEL ANDROID IOS</extracomment>
3323	3393	<translation>Kopplungscode: %1</translation>
3324	3394	</message>
	3395	<message>
	3396	<source>Enable WiFi</source>
	3397	<extracomment>LABEL ANDROID IOS</extracomment>
	3398	<translation>WLAN aktivieren</translation>
	3399	</message>
3325	3400	</context>
3326	3401	<context>
3327	3402	<name>RemoteServiceViewRemote</name>

3342	3417	</message>
3343	3418	<message>
3344	3419	<source>No unpaired smartphone as card reader (SaC) available. Please make sure that the smartphone as card reader (SaC) functionality in AusweisApp2 on your other device is activated an that both devices are connected to the same WiFi.</source>
3345		<extracomment>INFO ANDROID IOS No SaC was found on the network, both devices need to be connected to the same wifi network.</extracomment>
3346		<translation>Kein ungekoppeltes Smartphone als Kartenleser verfügbar. Bitte stellen Sie sicher, dass die Funktion "Fernzugriff" in der AusweisApp2 auf Ihrem Smartphone aktiviert ist und beide Geräte mit demselben WLAN verbunden sind.</translation>
	3420	<extracomment>INFO ANDROID IOS No SaC was found on the network, both devices need to be connected to the same WiFi network.</extracomment>
	3421	<translation>Kein ungekoppeltes Smartphone als Kartenleser verfügbar. Bitte stellen Sie sicher, dass die Funktion "Fernzugriff" in der AusweisApp2 auf Ihrem Smartphone aktiviert ist und beide Geräte mit demselben WLAN verbunden sind.</translation>
3347	3422	</message>
3348	3423	<message>
3349	3424	<source>Start the pairing mode on your smartphone if you haven't done it already.</source>

3390	3465	<name>RemoteWorkflow</name>
3391	3466	<message>
3392	3467	<source>Continue</source>
3393		<extracomment>LABEL DESKTOP_QML</extracomment>
	3468	<extracomment>LABEL ANDROID IOS</extracomment>
3394	3469	<translation>Fortsetzen</translation>
3395	3470	</message>
3396	3471	<message>
3397	3472	<source>Pair device</source>
3398		<extracomment>LABEL DESKTOP_QML</extracomment>
	3473	<extracomment>LABEL ANDROID IOS</extracomment>
3399	3474	<translation>Gerät koppeln</translation>
3400	3475	</message>
3401	3476	<message>
3402		<source>Enable Wifi</source>
3403		<extracomment>LABEL DESKTOP_QML</extracomment>
	3477	<source>Enable WiFi</source>
	3478	<extracomment>LABEL ANDROID IOS</extracomment>
3404	3479	<translation>WLAN aktivieren</translation>
3405	3480	</message>
3406	3481	<message>
3407	3482	<source>Establish connection</source>
3408		<extracomment>LABEL DESKTOP_QML</extracomment>
	3483	<extracomment>LABEL ANDROID IOS</extracomment>
3409	3484	<translation>Verbindung wird hergestellt</translation>
3410	3485	</message>
3411	3486	<message>

3419	3494	<translation>Die Online-Ausweisfunktion Ihres Ausweises ist nicht aktiviert. Bitte wenden Sie sich an die Behörde, die Ihren Ausweis ausgegeben hat, um die Online-Ausweisfunktion zu aktivieren.</translation>
3420	3495	</message>
3421	3496	<message>
	3497	<source>Determine card</source>
	3498	<extracomment>LABEL ANDROID IOS</extracomment>
	3499	<translation>Ermittle Ausweis</translation>
	3500	</message>
	3501	<message>
	3502	<source>The device %1 was unpaired because it did not react to connection attempts. Pair the device again to use it as a card reader.</source>
	3503	<extracomment>INFO ANDROID IOS The paired smartphone was removed since it did not respond to connection attempts. It needs to be paired again before using it.</extracomment>
	3504	<translation>Das Gerät %1 wurde entkoppelt, da es nicht auf Verbindungsversuche reagiert hat. Koppeln Sie das Gerät erneut, um es wieder als Kartenleser zu verwenden.</translation>
	3505	</message>
	3506	<message>
	3507	<source>To use the remote service WiFi has to be activated. Please activate WiFi in your device settings.</source>
	3508	<extracomment>INFO ANDROID IOS The WiFi module needs to be enabled in the system settings to use the remote service.</extracomment>
	3509	<translation>Um den Fernzugriff zu nutzen, muss WLAN aktiviert werden. Bitte aktivieren Sie WLAN in Ihren Einstellungen.</translation>
	3510	</message>
	3511	<message>
	3512	<source>No paired smartphone as cardreader (SaC) with activated "remote service" available.</source>
	3513	<extracomment>INFO ANDROID IOS No paired and reachable device was found, hint that the remote device needs to be actually started for this feature.</extracomment>
	3514	<translation>Kein gekoppeltes Smartphone als Kartenleser mit aktiviertem "Fernzugriff" verfügbar.</translation>
	3515	</message>
	3516	<message>
3422	3517	<source>Connected to %1. Please place the NFC interface of the smartphone on your ID card.</source>
3423	3518	<extracomment>INFO ANDROID IOS The connection to the smartphone was established, the ID card may be inserted.</extracomment>
3424	3519	<translation>Verbunden mit %1. Bitte platzieren Sie das Smartphone mit der NFC-Schnittstelle auf Ihrem Ausweis.</translation>
3425	3520	</message>
3426		<message>
3427		<source>Determine card</source>
3428		<extracomment>LABEL DESKTOP_QML</extracomment>
3429		<translation>Ermittle Ausweis</translation>
3430		</message>
3431		<message>
3432		<source>The device %1 was unpaired because it did not react to connection attempts. Pair the device again to use it as a card reader.</source>
3433		<extracomment>INFO ANDROID IOS The paired smartphone was removed since it did not respond to connection attempts. It needs to be paired again before using it.</extracomment>
3434		<translation>Das Gerät %1 wurde entkoppelt, da es nicht auf Verbindungsversuche reagiert hat. Koppeln Sie das Gerät erneut, um es wieder als Kartenleser zu verwenden.</translation>
3435		</message>
3436		<message>
3437		<source>To use the remote service WiFi has to be activated. Please activate WiFi in your device settings.</source>
3438		<extracomment>INFO ANDROID IOS The wifi module needs to be enabled in the system settings to use the remote service.</extracomment>
3439		<translation>Um den Fernzugriff zu nutzen, muss WLAN aktiviert werden. Bitte aktivieren Sie WLAN in Ihren Einstellungen.</translation>
3440		</message>
3441		<message>
3442		<source>No paired smartphone as cardreader (SaC) with activated "remote service" available.</source>
3443		<extracomment>INFO ANDROID IOS No paired and reachable device was found, hint that the remote device needs to be actually started for this feature.</extracomment>
3444		<translation>Kein gekoppeltes Smartphone als Kartenleser mit aktiviertem "Fernzugriff" verfügbar.</translation>
3445		</message>
3446	3521	</context>
3447	3522	<context>
3448	3523	<name>ResultView</name>

3468	3543	<source>Send email</source>
3469	3544	<extracomment>LABEL DESKTOP_QML</extracomment>
3470	3545	<translation>E-Mail senden</translation>
	3546	</message>
	3547	<message>
	3548	<source>Save logfile</source>
	3549	<extracomment>LABEL DESKTOP_QML</extracomment>
	3550	<translation>Protokolldatei speichern</translation>
	3551	</message>
	3552	<message>
	3553	<source>See details</source>
	3554	<extracomment>LABEL DESKTOP_QML</extracomment>
	3555	<translation>Details anzeigen</translation>
	3556	</message>
	3557	<message>
	3558	<source>Logfiles</source>
	3559	<translation>Logdateien</translation>
	3560	</message>
	3561	</context>
	3562	<context>
	3563	<name>ScreenOrientationSelectionPopup</name>
	3564	<message>
	3565	<source>Select screen orientation</source>
	3566	<extracomment>LABEL ANDROID</extracomment>
	3567	<translation>Bildschirmausrichtung wählen</translation>
	3568	</message>
	3569	<message>
	3570	<source>Set screen orientation to portrait</source>
	3571	<extracomment>LABEL ANDROID</extracomment>
	3572	<translation>Bildschirmausrichtung auf Hochformat setzen</translation>
	3573	</message>
	3574	<message>
	3575	<source>Portrait</source>
	3576	<extracomment>LABEL ANDROID</extracomment>
	3577	<translation>Hochformat</translation>
	3578	</message>
	3579	<message>
	3580	<source>recommended</source>
	3581	<translation>empfohlen</translation>
	3582	</message>
	3583	<message>
	3584	<source>Set screen orientation to landscape</source>
	3585	<extracomment>LABEL ANDROID</extracomment>
	3586	<translation>Bildschirmausrichtung auf Querformat setzen</translation>
	3587	</message>
	3588	<message>
	3589	<source>Landscape</source>
	3590	<extracomment>LABEL ANDROID</extracomment>
	3591	<translation>Querformat</translation>
	3592	</message>
	3593	<message>
	3594	<source>Using a screen orientation unfit for your device may result in display errors.</source>
	3595	<extracomment>LABEL ANDROID</extracomment>
	3596	<translation>Die Verwendung einer, für Ihr Gerät nicht geeigneten Bildschirmausrichtung kann zu Anzeigefehlern führen.</translation>
3471	3597	</message>
3472	3598	</context>
3473	3599	<context>

3520	3646	<translation>Verlauf</translation>
3521	3647	</message>
3522	3648	<message>
3523		<source>Save authentification history</source>
	3649	<source>Save authentication history</source>
3524	3650	<extracomment>LABEL DESKTOP_QML</extracomment>
3525	3651	<translation>Verlauf der Ausweisvorgänge speichern</translation>
3526	3652	</message>

3562	3688	<message>
3563	3689	<source>History is empty</source>
3564	3690	<translation>Es gibt keine Einträge im Verlauf</translation>
3565		</message>
3566		<message>
3567		<source>Avoid visual feedback in the on screen keypad</source>
3568		<extracomment>LABEL DESKTOP_QML</extracomment>
3569		<translation>Deaktiviere die Animation der Tasten auf der Bildschirmtastatur</translation>
3570	3691	</message>
3571	3692	<message>
3572	3693	<source>Delete history</source>

3603	3724	<extracomment>LABEL DESKTOP_QML The automatic update check is disabled (or no network connection was present during app start), a manual check for update is required.</extracomment>
3604	3725	<translation>Keine Aktualisierungsinformationen vorhanden, bitte prüfen Sie manuell auf verfügbare Aktualisierungen.</translation>
3605	3726	</message>
	3727	<message>
	3728	<source>Deleted %1 entries from the history.</source>
	3729	<extracomment>INFO DESKTOP_QML Feedback how many history entries were removed.</extracomment>
	3730	<translation>Es wurden %1 Einträge aus dem Verlauf gelöscht.</translation>
	3731	</message>
	3732	<message>
	3733	<source>Visual feedback when pressing keypad buttons</source>
	3734	<extracomment>LABEL DESKTOP_QML</extracomment>
	3735	<translation>Animation der Tasten auf der Bildschirmtastatur</translation>
	3736	</message>
3606	3737	</context>
3607	3738	<context>
3608	3739	<name>SelfAuthenticationData</name>

3655	3786	<extracomment>LABEL DESKTOP_QML Title of the self authentication result data view</extracomment>
3656	3787	<translation>Ausgelesene Daten der Selbstauskunft</translation>
3657	3788	</message>
	3789	<message>
	3790	<source>Portable Document Format</source>
	3791	<translation>Portable Document Format</translation>
	3792	</message>
3658	3793	</context>
3659	3794	<context>
3660	3795	<name>SelfAuthenticationView</name>

3700	3835	----------
3701	3836	LABEL ANDROID IOS</extracomment>
3702	3837	<translation>Meine Daten einsehen</translation>
	3838	</message>
	3839	<message>
	3840	<source>https://www.ausweisapp.bund.de/datenschutz/</source>
	3841	<translation>https://www.ausweisapp.bund.de/datenschutz/</translation>
	3842	</message>
	3843	<message>
	3844	<source>Click to open link to data privacy statement in browser: %1</source>
	3845	<translation>Öffne den Link der Datenschutzerklärung im Browser: %1</translation>
	3846	</message>
	3847	<message>
	3848	<source>This is the self-authentication view of the AusweisApp2.</source>
	3849	<translation>Dies ist die Darstellung der Selbstauskunft der AusweisApp2.</translation>
	3850	</message>
	3851	<message>
	3852	<source>Self-Authentication.</source>
	3853	<extracomment>LABEL DESKTOP_QML</extracomment>
	3854	<translation>Selbstauskunft.</translation>
3703	3855	</message>
3704	3856	<message>
3705	3857	<source>%1 more presses to toggle the testmode for the self-authentication.</source>

3716	3868	<extracomment>INFO ANDROID IOS Used in notifications when the user taps the magnifying glass</extracomment>
3717	3869	<translation>Testmodus für die Selbstauskunft deaktiviert.</translation>
3718	3870	</message>
3719		<message>
3720		<source>https://www.ausweisapp.bund.de/datenschutz/</source>
3721		<translation>https://www.ausweisapp.bund.de/datenschutz/</translation>
3722		</message>
3723		<message>
3724		<source>Click to open link to data privacy statement in browser: %1</source>
3725		<translation>Öffne den Link der Datenschutzerklärung im Browser: %1</translation>
3726		</message>
3727		<message>
3728		<source>This is the self-authentication view of the AusweisApp2.</source>
3729		<translation>Dies ist die Darstellung der Selbstauskunft der AusweisApp2.</translation>
3730		</message>
3731		<message>
3732		<source>Self-Authentication.</source>
3733		<extracomment>LABEL DESKTOP_QML</extracomment>
3734		<translation>Selbstauskunft.</translation>
3735		</message>
3736	3871	</context>
3737	3872	<context>
3738	3873	<name>SelfInfoWidget</name>

3814	3949	<translation>Debugoptionen</translation>
3815	3950	</message>
3816	3951	<message>
3817		<source>Pairing the device ...</source>
3818		<extracomment>LABEL DESKTOP_QML</extracomment>
3819		<translation>Das Gerät wird gekoppelt ...</translation>
3820		</message>
3821		<message>
3822		<source>The device "%1" has been paired.</source>
3823		<translation>Das Gerät "%1" wurde gekoppelt.</translation>
3824		</message>
3825		<message>
3826		<source>Pairing to "%1" failed:</source>
3827		<extracomment>ERROR DESKTOP_QML An error occurred while pairing the device.</extracomment>
3828		<translation>Die Kopplung mit "%1" ist fehlgeschlagen:</translation>
3829		</message>
3830		<message>
3831	3952	<source>Device name</source>
3832	3953	<extracomment>LABEL ANDROID IOS</extracomment>
3833	3954	<translation>Gerätename</translation>

3848	3969	<translation>Zufällige Anordnung der Ziffern</translation>
3849	3970	</message>
3850	3971	<message>
3851		<source>Avoid visual feedback in the on screen keypad</source>
3852		<extracomment>LABEL ANDROID IOS</extracomment>
3853		<translation>Deaktiviere die Animation der Tasten auf der Bildschirmtastatur</translation>
3854		</message>
3855		<message>
3856	3972	<source>History</source>
3857		<extracomment>LABEL ANDROID IOS</extracomment>
	3973	<extracomment>LABEL ANDROID IOS
	3974	----------
	3975	LABEL ALL_PLATFORMS</extracomment>
3858	3976	<translation>Verlauf</translation>
3859	3977	</message>
3860	3978	<message>
3861		<source>Save authentification history</source>
	3979	<source>Save authentication history</source>
3862	3980	<extracomment>LABEL ANDROID IOS</extracomment>
3863	3981	<translation>Verlauf der Ausweisvorgänge speichern</translation>
3864	3982	</message>

3873	3991	<translation>Smartphone als Kartenleser</translation>
3874	3992	</message>
3875	3993	<message>
3876		<source>Click here to use another smartphone as a card reader</source>
3877		<extracomment>LABEL ANDROID IOS</extracomment>
3878		<translation>Klicken Sie hier um ein anderes Smartphone als Kartenleser zu verwenden</translation>
	3994	<source>Configure remote service for another device</source>
	3995	<extracomment>LABEL ANDROID IOS</extracomment>
	3996	<translation>Ein anderes Gerät für den Fernzugriff konfigurieren</translation>
3879	3997	</message>
3880	3998	<message>
3881	3999	<source>Randomize the order of the on screen keypad buttons</source>

3883	4001	<translation>Ziffern der Bildschirmtastatur zufällig anordnen</translation>
3884	4002	</message>
3885	4003	<message>
3886		<source>Privacy keypad</source>
3887		<extracomment>LABEL ANDROID IOS</extracomment>
3888		<translation>Vertrauliche Bildschirmtastatur</translation>
	4004	<source>Screen orientation</source>
	4005	<extracomment>LABEL ANDROID</extracomment>
	4006	<translation>Bildschirmausrichtung</translation>
	4007	</message>
	4008	<message>
	4009	<source>Landscape</source>
	4010	<extracomment>LABEL ANDROID</extracomment>
	4011	<translation>Querformat</translation>
	4012	</message>
	4013	<message>
	4014	<source>Portrait</source>
	4015	<extracomment>LABEL ANDROID</extracomment>
	4016	<translation>Hochformat</translation>
	4017	</message>
	4018	<message>
	4019	<source>Keypad animations</source>
	4020	<extracomment>LABEL ANDROID IOS</extracomment>
	4021	<translation>Tasten-Animationen</translation>
	4022	</message>
	4023	<message>
	4024	<source>Visual feedback when pressing keypad buttons</source>
	4025	<extracomment>LABEL ANDROID IOS</extracomment>
	4026	<translation>Animation der Tasten auf der Bildschirmtastatur</translation>
	4027	</message>
	4028	<message>
	4029	<source>CAN allowed mode</source>
	4030	<extracomment>LABEL ANDROID IOS</extracomment>
	4031	<translation>CAN-allowed-Modus</translation>
	4032	</message>
	4033	<message>
	4034	<source>Support CAN allowed mode</source>
	4035	<extracomment>LABEL ANDROID IOS</extracomment>
	4036	<translation>CAN-allowed-Modus unterstützen</translation>
	4037	</message>
	4038	<message>
	4039	<source>Allow the id card to be used with only the CAN</source>
	4040	<extracomment>LABEL ANDROID IOS</extracomment>
	4041	<translation>Unterstütze die Verwendung des Ausweis nur mit der CAN</translation>
	4042	</message>
	4043	<message>
	4044	<source>Skip rights page</source>
	4045	<extracomment>LABEL ANDROID IOS</extracomment>
	4046	<translation>Anzeige der Bereichtigungen überspringen</translation>
	4047	</message>
	4048	<message>
	4049	<source>Do not show the rights page, when in can allowed mode</source>
	4050	<extracomment>LABEL ANDROID IOS</extracomment>
	4051	<translation>Überspringe die Anzeige der Berechtigungen im CAN-allowed-Modus</translation>
	4052	</message>
	4053	<message>
	4054	<source>Developer Mode</source>
	4055	<extracomment>LABEL ANDROID IOS</extracomment>
	4056	<translation>Entwicklermodus</translation>
	4057	</message>
	4058	<message>
	4059	<source>Use a more tolerant mode</source>
	4060	<extracomment>LABEL ANDROID IOS</extracomment>
	4061	<translation>Benutze einen toleranten Modus</translation>
	4062	</message>
	4063	<message>
	4064	<source>Layout style</source>
	4065	<extracomment>LABEL ANDROID IOS</extracomment>
	4066	<translation>Layout-Stil</translation>
	4067	</message>
	4068	<message>
	4069	<source>iOS</source>
	4070	<extracomment>LABEL ALL_PLATFORMS</extracomment>
	4071	<translation>iOS</translation>
	4072	</message>
	4073	<message>
	4074	<source>Android</source>
	4075	<extracomment>LABEL ALL_PLATFORMS</extracomment>
	4076	<translation>Android</translation>
	4077	</message>
	4078	<message>
	4079	<source>Tablet, Android</source>
	4080	<extracomment>LABEL ALL_PLATFORMS</extracomment>
	4081	<translation>Tablet, Android</translation>
	4082	</message>
	4083	<message>
	4084	<source>Create dummy entries</source>
	4085	<extracomment>LABEL ANDROID IOS</extracomment>
	4086	<translation>Erstelle Scheindaten</translation>
	4087	</message>
	4088	<message>
	4089	<source>Logfile</source>
	4090	<extracomment>LABEL ALL_PLATFORMS</extracomment>
	4091	<translation>Protokolldatei</translation>
	4092	</message>
	4093	<message>
	4094	<source>Developer Options</source>
	4095	<extracomment>LABEL ANDROID IOS</extracomment>
	4096	<translation>Entwickleroptionen</translation>
	4097	</message>
	4098	<message>
	4099	<source>Testmode for the self-authentication</source>
	4100	<extracomment>LABEL ANDROID IOS</extracomment>
	4101	<translation>Testmodus für die Selbstauskunft</translation>
	4102	</message>
	4103	<message>
	4104	<source>Use the test environment during a self-authentication</source>
	4105	<extracomment>LABEL ANDROID IOS</extracomment>
	4106	<translation>Benutze die Test-Umgebung während der Selbstauskunft</translation>
3889	4107	</message>
3890	4108	</context>
3891	4109	<context>

3934	4152	</message>
3935	4153	<message>
3936	4154	<source>Do you want to set your PIN now?</source>
3937		<extracomment>INFO DESKTOP_QML Inquiry message if the 5-digit transport PIN should be changed to an ordinary PIN (now).</extracomment>
	4155	<extracomment>INFO DESKTOP_QML Inquiry message if the five-digit Transport PIN should be changed to an ordinary PIN (now).</extracomment>
3938	4156	<translation>Möchten Sie jetzt Ihre PIN setzen?</translation>
3939	4157	</message>
3940	4158	<message>
3941		<source>If you have not already done so you have to change your 5-digit transport PIN to a 6-digit PIN before you can use the online-ID function.</source>
	4159	<source>If you have not already done so you have to change the five-digit Transport PIN to a six-digit PIN before you can use the online-ID function.</source>
3942	4160	<extracomment>INFO DESKTOP_QML Hint that this change may be carried out form the main menu as well and that it is required to use the online authentication feature of the ID card.</extracomment>
3943	4161	<translation>Falls noch nicht geschehen, müssen Sie vor der erstmaligen Nutzung der Online-Ausweisfunktion die fünfstellige Transport-PIN in eine sechsstellige PIN ändern.</translation>
3944	4162	</message>

3975	4193	<translation>Einrichtungsschritt zum Verlauf</translation>
3976	4194	</message>
3977	4195	<message>
3978		<source>Change transport PIN setup step</source>
	4196	<source>Change Transport PIN setup step</source>
3979	4197	<translation>Einrichtungsschritt zur Änderung der Transport PIN</translation>
3980	4198	</message>
3981	4199	<message>

4292	4510	<translation>Vor der erstmaligen Nutzung der Online-Ausweisfunktion bitte die</translation>
4293	4511	</message>
4294	4512	<message>
4295		<source>5 digits long</source>
	4513	<source>five digits long</source>
4296	4514	<extracomment>LABEL ANDROID IOS</extracomment>
4297	4515	<translation>fünfstellige</translation>
4298	4516	</message>
4299	4517	<message>
4300		<source>transport PIN</source>
	4518	<source>Transport PIN</source>
4301	4519	<extracomment>LABEL ANDROID IOS</extracomment>
4302	4520	<translation>Transport-PIN</translation>
4303	4521	</message>

4307	4525	<translation>durch eine persönliche</translation>
4308	4526	</message>
4309	4527	<message>
4310		<source>6 digits long PIN</source>
	4528	<source>six digits long PIN</source>
4311	4529	<extracomment>LABEL ANDROID IOS</extracomment>
4312	4530	<translation>sechsstellige PIN</translation>
4313	4531	</message>

4387	4605	<translation>Sie können dieses Tutorial jederzeit wieder über den Bereich "Hilfe & Feedback" aufrufen.</translation>
4388	4606	</message>
4389	4607	<message>
4390		<source>The transport PIN is sent to you by the Bundesdruckerei via mail.</source>
	4608	<source>The Transport PIN is sent to you by the Bundesdruckerei via mail.</source>
4391	4609	<extracomment>LABEL ANDROID IOS</extracomment>
4392	4610	<translation>Die Transport-PIN wird Ihnen von der Bundesdruckerei per Brief zugesandt.</translation>
4393	4611	</message>

4402	4620	<translation>Sie können dieses Tutorial jederzeit wieder über den Bereich "Mehr" aufrufen.</translation>
4403	4621	</message>
4404	4622	<message>
4405		<source>Please note: The transport PIN can only be used for your first PIN change. If you have already set your personal PIN (e.g. while picking up your ID card) only the set PIN is valid.</source>
	4623	<source>Please note: The Transport PIN can only be used for your first PIN change. If you have already set your personal PIN (e.g. while picking up your ID card) only the set PIN is valid.</source>
4406	4624	<extracomment>LABEL ANDROID IOS</extracomment>
4407	4625	<translation>Hinweis: Die Transport-PIN kann nur für die erstmalige PIN-Änderung verwendet werden. Sollten Sie (z.B. bei der Abholung Ihres Ausweises) bereits eine persönliche PIN gesetzt haben, ist nur noch diese gültig.</translation>
4408	4626	</message>
4409	4627	<message>
4410		<source>You can always set a new PIN at the issuing authority if the (transport) PIN is not known.</source>
	4628	<source>You can always set a new PIN at the issuing authority if the (Transport) PIN is not known.</source>
4411	4629	<extracomment>LABEL ANDROID IOS</extracomment>
4412	4630	<translation>Ist Ihnen die (Transport-)PIN nicht bekannt, können Sie in der zuständigen Behörde jederzeit eine neue PIN setzen.</translation>
	4631	</message>
	4632	<message>
	4633	<source>Open YouTube video</source>
	4634	<extracomment>LABEL ANDROID IOS</extracomment>
	4635	<translation>Öffne das YouTube-Video</translation>
4413	4636	</message>
4414	4637	</context>
4415	4638	<context>

4505	4728	<translation>Jetzt</translation>
4506	4729	</message>
4507	4730	<message>
4508		<source>6 digits long PIN</source>
	4731	<source>six digits long PIN</source>
4509	4732	<extracomment>LABEL ANDROID IOS</extracomment>
4510	4733	<translation>sechsstellige PIN</translation>
4511	4734	</message>

4520	4743	<translation>am Kartenleser eingeben!</translation>
4521	4744	</message>
4522	4745	<message>
4523		<source>This is only possible if you have exchanged the 5 digits long transport PIN with a 6 digits long personal PIN beforehand.</source>
4524		<extracomment>LABEL ANDROID IOS</extracomment>
4525		<translation>Funktioniert nur, wenn Sie Ihre fünfstellige Transport-PIN bereits in Ihre persönliche sechsstellige PIN geändert haben.</translation>
	4746	<source>This is only possible if you have exchanged the five digits long Transport PIN with a six digits long personal PIN beforehand.</source>
	4747	<extracomment>LABEL ANDROID IOS</extracomment>
	4748	<translation>Funktioniert nur, wenn Sie die fünfstellige Transport-PIN bereits in Ihre persönliche sechsstellige PIN geändert haben.</translation>
4526	4749	</message>
4527	4750	<message>
4528	4751	<source>qrc:///images/tutorial/screenshot_choose_reader_%1_en.png</source>
4529	4752	<translation>qrc:///images/tutorial/screenshot_choose_reader_%1_de.png</translation>
	4753	</message>
	4754	<message>
	4755	<source>Deprecation warning</source>
	4756	<translation>Abkündigungshinweis</translation>
	4757	</message>
	4758	<message>
	4759	<source>Bluetooth support will be removed in the next version of %1!</source>
	4760	<translation>Die Bluetooth-Unterstützung wird in der nächsten Version der %1 entfernt!</translation>
4530	4761	</message>
4531	4762	</context>
4532	4763	<context>

4619	4850	<translation>Jetzt</translation>
4620	4851	</message>
4621	4852	<message>
4622		<source>6 digits long PIN</source>
	4853	<source>six digits long PIN</source>
4623	4854	<extracomment>LABEL ANDROID IOS</extracomment>
4624	4855	<translation>sechsstellige PIN</translation>
4625	4856	</message>

4634	4865	<translation>eingeben!</translation>
4635	4866	</message>
4636	4867	<message>
4637		<source>This is only possible if you have exchanged the 5 digits long transport PIN with a 6 digits long personal PIN beforehand.</source>
4638		<extracomment>LABEL ANDROID IOS</extracomment>
4639		<translation>Funktioniert nur, wenn Sie Ihre fünfstellige Transport-PIN bereits in Ihre persönliche sechsstellige PIN geändert haben.</translation>
	4868	<source>This is only possible if you have exchanged the five digits long Transport PIN with a six digits long personal PIN beforehand.</source>
	4869	<extracomment>LABEL ANDROID IOS</extracomment>
	4870	<translation>Funktioniert nur, wenn Sie die fünfstellige Transport-PIN bereits in Ihre persönliche sechsstellige PIN geändert haben.</translation>
4640	4871	</message>
4641	4872	<message>
4642	4873	<source>App on iPhone <b>with</b> NFC chip as card reader</source>

4653	4884	<extracomment>LABEL ANDROID IOS</extracomment>
4654	4885	<translation>Sie können sich auch dieses YouTube-Video ansehen das den Prozess erläutert.</translation>
4655	4886	</message>
	4887	<message>
	4888	<source>Open YouTube video</source>
	4889	<extracomment>LABEL ANDROID IOS</extracomment>
	4890	<translation>Öffne das YouTube-Video</translation>
	4891	</message>
4656	4892	</context>
4657	4893	<context>
4658	4894	<name>TutorialReaderMethodSacDesktop</name>

4672	4908	<translation>App auf Computer <b>ohne</b> NFC-Chip</translation>
4673	4909	</message>
4674	4910	<message>
4675		<source>Both devices have to be connected to the same wifi network</source>
	4911	<source>Both devices have to be connected to the same WiFi network</source>
4676	4912	<extracomment>LABEL ANDROID IOS</extracomment>
4677	4913	<translation>Beide Geräte müssen im selben WLAN sein</translation>
4678	4914	</message>

4792	5028	<translation>Eingeben</translation>
4793	5029	</message>
4794	5030	<message>
4795		<source>6 digits long PIN</source>
	5031	<source>six digits long PIN</source>
4796	5032	<extracomment>LABEL ANDROID IOS</extracomment>
4797	5033	<translation>sechsstellige PIN</translation>
4798	5034	</message>

4807	5043	<translation>eingeben!</translation>
4808	5044	</message>
4809	5045	<message>
4810		<source>This is only possible if you have exchanged the 5 digits long transport PIN with a 6 digits long personal PIN beforehand.</source>
4811		<extracomment>LABEL ANDROID IOS</extracomment>
4812		<translation>Funktioniert nur, wenn Sie Ihre fünfstellige Transport-PIN bereits in Ihre persönliche sechsstellige PIN geändert haben.</translation>
	5046	<source>This is only possible if you have exchanged the five digits long Transport PIN with a six digits long personal PIN beforehand.</source>
	5047	<extracomment>LABEL ANDROID IOS</extracomment>
	5048	<translation>Funktioniert nur, wenn Sie die fünfstellige Transport-PIN bereits in Ihre persönliche sechsstellige PIN geändert haben.</translation>
4813	5049	</message>
4814	5050	<message>
4815	5051	<source>qrc:///images/tutorial/generated/reader_sac_menu_%1_en.svg</source>

4846	5082	<extracomment>LABEL ANDROID IOS</extracomment>
4847	5083	<translation>Sie können sich auch dieses YouTube-Video ansehen das den Prozess erläutert.</translation>
4848	5084	</message>
	5085	<message>
	5086	<source>Open YouTube video</source>
	5087	<extracomment>LABEL ANDROID IOS</extracomment>
	5088	<translation>Öffne das YouTube-Video</translation>
	5089	</message>
4849	5090	</context>
4850	5091	<context>
4851	5092	<name>TutorialReaderMethodSacMobile</name>

4860	5101	<translation>App auf Tablet oder Telefon <b>ohne</b> NFC-Chip</translation>
4861	5102	</message>
4862	5103	<message>
4863		<source>Both devices have to be connected to the same wifi network</source>
	5104	<source>Both devices have to be connected to the same WiFi network</source>
4864	5105	<extracomment>LABEL ANDROID IOS</extracomment>
4865	5106	<translation>Beide Geräte müssen im selben WLAN sein</translation>
4866	5107	</message>

4945	5186	<translation>Weiter zur PIN-Eingabe</translation>
4946	5187	</message>
4947	5188	<message>
4948		<source>Tap on Wifi</source>
	5189	<source>Tap on WiFi</source>
4949	5190	<extracomment>LABEL ANDROID IOS</extracomment>
4950	5191	<translation>Tap auf WLAN</translation>
4951	5192	</message>

4980	5221	<translation>Eingeben</translation>
4981	5222	</message>
4982	5223	<message>
4983		<source>6 digits long PIN</source>
	5224	<source>six digits long PIN</source>
4984	5225	<extracomment>LABEL ANDROID IOS</extracomment>
4985	5226	<translation>sechsstellige PIN</translation>
4986	5227	</message>

4995	5236	<translation>eingeben!</translation>
4996	5237	</message>
4997	5238	<message>
4998		<source>This is only possible if you have exchanged the 5 digits long transport PIN with a 6 digits long personal PIN beforehand.</source>
4999		<extracomment>LABEL ANDROID IOS</extracomment>
5000		<translation>Funktioniert nur, wenn Sie Ihre fünfstellige Transport-PIN bereits in Ihre persönliche sechsstellige PIN geändert haben.</translation>
	5239	<source>This is only possible if you have exchanged the five digits long Transport PIN with a six digits long personal PIN beforehand.</source>
	5240	<extracomment>LABEL ANDROID IOS</extracomment>
	5241	<translation>Funktioniert nur, wenn Sie die fünfstellige Transport-PIN bereits in Ihre persönliche sechsstellige PIN geändert haben.</translation>
5001	5242	</message>
5002	5243	<message>
5003	5244	<source>qrc:///images/tutorial/generated/reader_sac_menu_%1_en.svg</source>

5155	5396	<extracomment>LABEL ANDROID IOS</extracomment>
5156	5397	<translation>qrc:///images/tutorial/screenshot_cert_%1_de.png</translation>
5157	5398	</message>
	5399	<message>
	5400	<source>Open YouTube video</source>
	5401	<extracomment>LABEL ANDROID IOS</extracomment>
	5402	<translation>Öffne das YouTube-Video</translation>
	5403	</message>
5158	5404	</context>
5159	5405	<context>
5160	5406	<name>TutorialWhere</name>

5209	5455	<translation>Jetzt</translation>
5210	5456	</message>
5211	5457	<message>
5212		<source>6 digits long PIN</source>
	5458	<source>six digits long PIN</source>
5213	5459	<extracomment>LABEL ANDROID IOS</extracomment>
5214	5460	<translation>sechsstellige PIN</translation>
5215	5461	</message>

5391	5637	<extracomment>LABEL DESKTOP_QML</extracomment>
5392	5638	<translation>Entwickleroptionen deaktiviert.</translation>
5393	5639	</message>
	5640	<message>
	5641	<source>%1 more presses to toggle the advanced settings.</source>
	5642	<extracomment>INFO ANDROID IOS Used in notifications when the user taps the version information</extracomment>
	5643	<translation>%1 weitere Klicks um die erweiterten Einstellungen umzuschalten.</translation>
	5644	</message>
	5645	<message>
	5646	<source>Advanced settings activated.</source>
	5647	<extracomment>LABEL ANDROID IOS</extracomment>
	5648	<translation>Erweiterte Einstellungen aktiviert.</translation>
	5649	</message>
	5650	<message>
	5651	<source>Advanced settings deactivated.</source>
	5652	<extracomment>LABEL ANDROID IOS</extracomment>
	5653	<translation>Erweiterte Einstellungen deaktiviert.</translation>
	5654	</message>
5394	5655	</context>
5395	5656	<context>
5396	5657	<name>WhiteListSurveyView</name>

5420	5681	<translation>Vielen Dank für Ihre Mithilfe!</translation>
5421	5682	</message>
5422	5683	<message>
5423		<source>Cancel</source>
5424		<extracomment>LABEL ANDROID IOS</extracomment>
5425		<translation>Abbrechen</translation>
5426		</message>
5427		<message>
5428		<source>Transmit</source>
	5684	<source>Do not send</source>
	5685	<extracomment>LABEL ANDROID IOS</extracomment>
	5686	<translation>Nicht senden</translation>
	5687	</message>
	5688	<message>
	5689	<source>Send</source>
5429	5690	<extracomment>LABEL ANDROID IOS</extracomment>
5430	5691	<translation>Senden</translation>
5431	5692	</message>

5649	5910	<translation>Möchten Sie den Entwicklermodus deaktivieren?</translation>
5650	5911	</message>
5651	5912	<message>
5652		<source>No, change transport PIN now</source>
	5913	<source>No, change Transport PIN now</source>
5653	5914	<translation>Nein, PIN jetzt ändern</translation>
5654	5915	</message>
5655	5916	<message>

5681	5942	<translation>Anwendung: %1</translation>
5682	5943	</message>
5683	5944	<message>
5684		<source>Did you change the transport PIN already?<br><br>Prior to the first use of the online identification function you have to replace the transport PIN by an individual 6-digit PIN. Online identification with transport PIN is not possible.</source>
5685		<translation>Haben Sie Ihre Transport-PIN schon geändert? <br><br>Bevor Sie das erste Mal die Online-Ausweisfunktion nutzen können, müssen Sie Ihre Transport-PIN durch eine persönliche, sechsstellige PIN ersetzen. Die Benutzung der Online-Ausweisfunktion ist mit der Transport-PIN nicht möglich.</translation>
	5945	<source>Did you change the Transport PIN already?<br><br>Prior to the first use of the online identification function you have to replace the Transport PIN by an individual six-digit PIN. Online identification with Transport PIN is not possible.</source>
	5946	<translation>Haben Sie Ihre Transport-PIN schon geändert?<br><br>Bevor Sie das erste Mal die Online-Ausweisfunktion nutzen können, müssen Sie Ihre Transport-PIN durch eine persönliche, sechsstellige PIN ersetzen. Die Benutzung der Online-Ausweisfunktion ist mit der Transport-PIN nicht möglich.</translation>
5686	5947	</message>
5687	5948	</context>
5688	5949	<context>

5855	6116	<translation>Speichern</translation>
5856	6117	</message>
5857	6118	<message>
5858		<source>Text files</source>
	6119	<source>Textfiles</source>
5859	6120	<translation>Textdateien</translation>
5860	6121	</message>
5861	6122	<message>

6044	6305	<message>
6045	6306	<source>No IP addresses assigned</source>
6046	6307	<translation>Keine IP-Adressen zugewiesen</translation>
6047		</message>
6048		<message>
6049		<source>Warning: The current firewall status can be obscured by additional Group Policies on your system, often set by system administrators.</source>
6050		<translation>Warnung: Der aktuelle Firewall-Status kann durch zusätzliche Gruppenregeln, die oftmals von Administratoren gesetzt werden, auf Ihrem System verschleiert sein.</translation>
6051	6308	</message>
6052	6309	<message>
6053	6310	<source>An error occurred while trying to gather firewall information. Please check the log for more information.</source>

6650	6907	<message>
6651	6908	<source>An unknown network error occurred. Check your network connection and try to restart the app.</source>
6652	6909	<extracomment>ERROR ALL_PLATFORMS Other critial network error by Qt.</extracomment>
6653		<translation>Ein unbekannter Netzwerkfehler ist aufgetreten. Überprüfen Sie Ihre Netwerkverbindung und versuchen Sie die App neu zu starten.</translation>
	6910	<translation>Ein unbekannter Netzwerkfehler ist aufgetreten. Überprüfen Sie Ihre Netzwerkverbindung und versuchen Sie, die App neu zu starten.</translation>
6654	6911	</message>
6655	6912	<message>
6656	6913	<source>The selected card reader cannot be accessed anymore.</source>

6689	6946	</message>
6690	6947	<message>
6691	6948	<source>The process has been cancelled.</source>
6692		<extracomment>ERROR ALL_PLATFORMS The user cancelled the authentication in either the UI or the card reader.</extracomment>
	6949	<extracomment>ERROR ALL_PLATFORMS The user cancelled the authentication in the UI.</extracomment>
6693	6950	<translation>Der Vorgang wurde abgebrochen.</translation>
6694	6951	</message>
6695	6952	<message>

6722	6979	<translation>Die eingegebene PIN ist nicht korrekt.</translation>
6723	6980	</message>
6724	6981	<message>
6725		<source>The given card access number (CAN) is not correct.</source>
	6982	<source>The given Card Access Number (CAN) is not correct.</source>
6726	6983	<extracomment>ERROR ALL_PLATFORMS The ID card declined the CAN.</extracomment>
6727	6984	<translation>Die eingegebene Zugangsnummer (CAN) ist nicht korrekt.</translation>
6728	6985	</message>

6836	7093	<extracomment>LABEL ALL_PLATFORMS</extracomment>
6837	7094	<translation>https://www.ausweisapp.bund.de/fragen-und-antworten/support/</translation>
6838	7095	</message>
	7096	<message>
	7097	<source>The process has been cancelled by the card reader.</source>
	7098	<extracomment>ERROR ALL_PLATFORMS The user cancelled the authentication on his card reader.</extracomment>
	7099	<translation>Der Vorgang wurde durch den Kartenleser abgebrochen.</translation>
	7100	</message>
6839	7101	</context>
6840	7102	<context>
6841	7103	<name>governikus::GuiUtils</name>
6842	7104	<message>
6843		<source>Wrong card access number (CAN)</source>
	7105	<source>Wrong Card Access Number (CAN)</source>
6844	7106	<translation>Falsche Zugangsnummer (CAN)</translation>
6845	7107	</message>
6846	7108	<message>
6847		<source>The given card access number (CAN) is not correct. You have one more try to enter the correct PIN. Please mind that you have to acknowledge this last try with your card access number (CAN).</source>
	7109	<source>The given Card Access Number (CAN) is not correct. You have one more try to enter the correct PIN. Please mind that you have to acknowledge this last try with your Card Access Number (CAN).</source>
6848	7110	<translation>Die eingegebene Zugangsnummer (CAN) ist nicht korrekt. Sie haben noch einen weiteren Versuch die korrekte PIN einzugeben. Beachten Sie, dass Sie diesen letzten Versuch mit der Zugangsnummer (CAN) bestätigen müssen.</translation>
6849	7111	</message>
6850	7112	<message>

6860	7122	<translation>Bitte geben Sie Ihre PUK erneut ein.</translation>
6861	7123	</message>
6862	7124	<message>
6863		<source>The given card access number (CAN) is not correct.</source>
	7125	<source>The given Card Access Number (CAN) is not correct.</source>
6864	7126	<translation>Die eingegebene Zugangsnummer (CAN) ist ungültig.</translation>
6865	7127	</message>
6866	7128	<message>

6876	7138	<translation>Ihre PIN ist nach dreimaliger Fehleingabe gesperrt. Die Nutzung der Online-Ausweisfunktion ist in diesem Zustand nicht mehr möglich.</p><p>Sie können die PIN im folgenden Dialog entsperren. Die Anwendung unterstützt Sie in den nun notwendigen Schritten.</translation>
6877	7139	</message>
6878	7140	<message>
6879		<source>The given PIN is not correct. You have one more try to enter the correct PIN. Please mind that you have to acknowledge this last try with your card access number (CAN).</source>
	7141	<source>The given PIN is not correct. You have one more try to enter the correct PIN. Please mind that you have to acknowledge this last try with your Card Access Number (CAN).</source>
6880	7142	<translation>Die eingegebene PIN ist nicht korrekt. Sie haben noch einen weiteren Versuch die korrekte PIN einzugeben. Beachten Sie, dass Sie diesen letzten Versuch mit der Zugangsnummer (CAN) bestätigen müssen.</translation>
6881	7143	</message>
6882	7144	<message>

7067	7329	<source>Could not send log! Please configure your mail client first.</source>
7068	7330	<translation>Konnte das Protokoll nicht senden! Bitte konfigurieren Sie Ihr E-Mail-Programm.</translation>
7069	7331	</message>
	7332	<message>
	7333	<source>Successfully saved logfile to "%1"</source>
	7334	<translation>Protokolldatei erfolgreich gespeichert unter "%1"</translation>
	7335	</message>
	7336	<message>
	7337	<source>Error while saving logfile to "%1"</source>
	7338	<translation>Fehler beim Speichern der Protokolldatei unter "%1"</translation>
	7339	</message>
	7340	<message>
	7341	<source>The logfile is disabled.</source>
	7342	<translation>Die Protokolldatei ist deaktiviert.</translation>
	7343	</message>
7070	7344	</context>
7071	7345	<context>
7072	7346	<name>governikus::NotificationModel</name>

7078	7352	<context>
7079	7353	<name>governikus::NumberModel</name>
7080	7354	<message>
7081		<source>The given PIN is not correct. You have 2 tries to enter the correct PIN.</source>
7082		<extracomment>INFO ALL_PLATFORMS The wrong PIN was entered on the first attempt.</extracomment>
7083		<translation>Die eingegebene PIN ist nicht korrekt. Sie haben noch 2 weitere Versuche die korrekte PIN einzugeben.</translation>
7084		</message>
7085		<message>
7086		<source>A wrong PIN has been entered twice on your ID card. Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. You can find your card access number (CAN) on the front of your ID card.</source>
7087		<extracomment>INFO ALL_PLATFORMS The wrong PIN was entered twice, the next attempt requires the CAN for additional verification.</extracomment>
7088		<translation>Die PIN Ihres Ausweises wurde zweimal falsch eingegeben. Für einen dritten Versuch müssen Sie vorher die sechsstellige Zugangsnummer (CAN) eingeben. Diese finden Sie auf der Vorderseite Ihres Ausweises.</translation>
7089		</message>
7090		<message>
7091		<source>A wrong PIN has been entered three times on your ID card. Your PIN is now blocked. To unblock your PIN you have to enter the PUK.</source>
7092		<extracomment>INFO ALL_PLATFORMS The PIN was entered wrongfully three times, the ID card needs to be unlocked using the PUK.</extracomment>
7093		<translation>Die PIN Ihres Ausweises wurde dreimal falsch eingegeben. Ihre PIN ist gesperrt. Zum Entsperren geben Sie bitte Ihre PUK ein.</translation>
7094		</message>
7095		<message>
7096		<source>The entered card access number (CAN) is incorrect. Please try again.</source>
	7355	<source>The entered Card Access Number (CAN) is incorrect. Please try again.</source>
7097	7356	<extracomment>INFO ALL_PLATFORMS The CAN was entered wrongfully and needs to be supplied again.</extracomment>
7098	7357	<translation>Die eingegebene Zugangsnummer (CAN) ist nicht korrekt. Bitte versuchen Sie es erneut.</translation>
7099	7358	</message>

7102	7361	<extracomment>INFO ALL_PLATFORMS The PUK entered wrongfully and needs to be supplied again.</extracomment>
7103	7362	<translation>Die eingegebene PUK ist nicht korrekt. Bitte versuchen Sie es erneut.</translation>
7104	7363	</message>
	7364	<message>
	7365	<source>Transport PIN</source>
	7366	<translation>Transport PIN</translation>
	7367	</message>
	7368	<message>
	7369	<source>PIN</source>
	7370	<translation>PIN</translation>
	7371	</message>
	7372	<message>
	7373	<source>A wrong %1 has been entered twice on your ID card. For a third attempt, please first enter the six-digit Card Access Number (CAN). You can find your Card Access Number (CAN) in the bottom right on the front of your ID card.</source>
	7374	<extracomment>INFO ALL_PLATFORMS The wrong (Transport) PIN was entered twice, the next attempt requires the CAN for additional verification.</extracomment>
	7375	<translation>Die %1 Ihres Ausweises wurde zweimal falsch eingegeben. Für einen dritten Versuch geben Sie bitte zunächst die sechsstellige Zugangsnummer (CAN) ein. Diese finden Sie unten rechts auf der Vorderseite Ihres Ausweises.</translation>
	7376	</message>
	7377	<message>
	7378	<source>The given %1 is not correct. You have two attempts to enter the correct %1.</source>
	7379	<extracomment>INFO ALL_PLATFORMS The wrong (Transport) PIN was entered on the first attempt.</extracomment>
	7380	<translation>Die eingegebene %1 ist nicht korrekt. Sie haben noch zwei weitere Versuche die korrekte %1 einzugeben.</translation>
	7381	</message>
	7382	<message>
	7383	<source>A wrong %1 has been entered three times on your ID card. Your %1 is now blocked. You have to enter the PUK to remove the block.</source>
	7384	<extracomment>INFO ALL_PLATFORMS The (Transport) PIN was entered wrongfully three times, the ID card needs to be unlocked using the PUK.</extracomment>
	7385	<translation>Die %1 Ihres Ausweises wurde dreimal falsch eingegeben. Ihre %1 ist gesperrt. Zum Entsperren geben Sie bitte Ihre PUK ein.</translation>
	7386	</message>
7105	7387	</context>
7106	7388	<context>
7107	7389	<name>governikus::PdfCreator</name>

7416	7698	<message>
7417	7699	<source>No smartphone as card reader (Sac) available. Please make sure to activate the "remote service" on your smartphone and to connect both devices to the same WiFi. See %1 for details of use.</source>
7418	7700	<extracomment>INFO ALL_PLATFORMS No smartphone with enabled remote service was found on the same network.</extracomment>
7419		<translation>Kein Smartphone als Kartenleser verfügbar. Bitte stellen Sie sicher, dass die die Funktion "Fernzugriff" in der AusweisApp2 auf Ihrem Smartphone aktiviert ist und beide Geräte mit demselben WLAN verbunden sind. Informationen zur Verwendung befinden sich unter %1.</translation>
	7701	<translation>Kein Smartphone als Kartenleser verfügbar. Bitte stellen Sie sicher, dass die die Funktion "Fernzugriff" in der AusweisApp2 auf Ihrem Smartphone aktiviert ist und beide Geräte mit demselben WLAN verbunden sind. Informationen zur Verwendung finden Sie in der %1.</translation>
7420	7702	</message>
7421	7703	</context>
7422	7704	<context>

7426	7708	<translation>Es sind nur Ziffern (0-9) erlaubt.</translation>
7427	7709	</message>
7428	7710	<message>
7429		<source>A pairing code has to be 4 digits long.</source>
7430		<translation>Ein Kopplungscode besteht aus 4 Ziffern.</translation>
	7711	<source>A pairing code has to be four digits long.</source>
	7712	<translation>Ein Kopplungscode besteht aus vier Ziffern.</translation>
7431	7713	</message>
7432	7714	</context>
7433	7715	<context>

7444	7726	</message>
7445	7727	<message>
7446	7728	<source>Please connect your WiFi to use the remote service.</source>
7447		<extracomment>INFO ALL_PLATFORMS The wifi feature is not enabled but required to use the smartphone as a card reader (SaK).</extracomment>
	7729	<extracomment>INFO ALL_PLATFORMS The WiFi feature is not enabled but required to use the smartphone as a card reader (SaK).</extracomment>
7448	7730	<translation>Bitte verbinden Sie sich mit Ihrem WLAN, um den Fernzugriff zu benutzen.</translation>
7449	7731	</message>
7450	7732	<message>

7649	7931	<translation>Fast fertig!</translation>
7650	7932	</message>
7651	7933	<message>
7652		<source>Prior to the first use of the online identification function, you have to replace the transport PIN by an individual 6-digit PIN. The transport PIN was sent to you by postal mail.</source>
	7934	<source>Prior to the first use of the online identification function, you have to replace the Transport PIN by an individual six-digit PIN. The Transport PIN was sent to you by postal mail.</source>
7653	7935	<translation>Vor der ersten Nutzung der Online-Ausweisfunktion müssen Sie die Transport-PIN durch eine persönliche sechsstellige PIN ersetzen. Sie finden Ihre Transport-PIN in dem PIN-Brief, welcher Ihnen postalisch zugesandt wurde.</translation>
7654	7936	</message>
7655	7937	<message>

7657	7939	<translation>Sie können die AusweisApp2 nun verwenden. Weitere Informationen zur Software und der Online-Ausweisfunktion erhalten Sie in der %1Online-Hilfe%2.</translation>
7658	7940	</message>
7659	7941	<message>
7660		<source>Personal 6-digit PIN</source>
	7942	<source>Personal six-digit PIN</source>
7661	7943	<translation>Persönliche sechsstellige PIN</translation>
7662	7944	</message>
7663	7945	</context>

7810	8092	<translation>bitte geben sie ihre zugangsnummer (can) ein</translation>
7811	8093	</message>
7812	8094	<message>
7813		<source>Card access number (CAN):</source>
	8095	<source>Card Access Number (CAN):</source>
7814	8096	<translation>Zugangsnummer (CAN):</translation>
7815	8097	</message>
7816	8098	<message>

7822	8104	<translation>Jetzt ausweisen</translation>
7823	8105	</message>
7824	8106	<message>
7825		<source>Please enter the 6-digit card access number (CAN) for identification.</source>
	8107	<source>Please enter the six-digit Card Access Number (CAN) for identification.</source>
7826	8108	<translation>Bitte geben Sie Ihre sechsstellige Zugangsnummer (CAN) ein.</translation>
7827	8109	</message>
7828	8110	<message>
7829		<source>Please enter your 6-digit card access number (CAN) and your PIN for identification.</source>
7830		<translation>Bitte geben Sie Ihre sechstellige Zugangsnummer (CAN) und Ihre PIN ein, um sich auszuweisen.</translation>
7831		</message>
7832		<message>
7833		<source>Please enter your 6-digit PIN for identification</source>
	8111	<source>Please enter your six-digit Card Access Number (CAN) and your PIN for identification.</source>
	8112	<translation>Bitte geben Sie Ihre sechsstellige Zugangsnummer (CAN) und Ihre PIN ein, um sich auszuweisen.</translation>
	8113	</message>
	8114	<message>
	8115	<source>Please enter your six-digit PIN for identification</source>
7834	8116	<translation>Bitte geben Sie Ihre sechsstellige PIN ein, um sich auszuweisen</translation>
7835	8117	</message>
7836	8118	<message>

8094	8376	<message>
8095	8377	<source>The connection to the browser was lost. No forwarding was executed. Please try to call the URL again manually: %1</source>
8096	8378	<extracomment>ERROR ALL_PLATFORMS The connection to the browser was lost/timed out..</extracomment>
8097		<translation>Die Verbindung zum Browser ging verloren. Es konnte keine Weiterleitung durchgeführt werden. Bitte versuchen Sie die URL manuell aufzurufen: %1</translation>
	8379	<translation>Die Verbindung zum Browser ging verloren. Es konnte keine Weiterleitung durchgeführt werden. Bitte versuchen Sie, die URL manuell aufzurufen: %1</translation>
8098	8380	</message>
8099	8381	<message>
8100	8382	<source>https://www.ausweisapp.bund.de/en/qa/report-an-error/</source>

8218	8500	<translation>Um die Anwendung zu schließen, drücken Sie zweimal schnell die Zurück-Taste.</translation>
8219	8501	</message>
8220	8502	<message>
8221		<source>Text files</source>
8222		<extracomment>LABEL DESKTOP_QML</extracomment>
8223		<translation>Textdateien</translation>
8224		</message>
8225		<message>
8226	8503	<source>Another application uses %1</source>
8227	8504	<extracomment>INFO DESKTOP_QML The AA2 is currently remote controlled via the SDK interface, concurrent usage of the AA2 is not possible.</extracomment>
8228	8505	<translation>Eine andere Anwendung verwendet %1</translation>

8234	8511	</message>
8235	8512	<message>
8236	8513	<source>The program remains available via the icon in the system tray. Click on the %1 icon to reopen the user interface.</source>
8237		<extracomment>INFO DESKTOP_QML Content of the popup that is shown when the AA2 is closed for the first time.</extracomment>
	8514	<extracomment>INFO DESKTOP_QML Content of the popup that is shown when the AA2 is closed for the first time.
	8515	----------
	8516	INFO DESKTOP_QML Content of the popup that is shown when the AA2 is closed and a workflow is still active and the close/minimize info was not disabled.</extracomment>
8238	8517	<translation>Das Programm steht weiterhin im Infobereich zur Verfügung. Klicken Sie auf das Symbol der %1, um die Anwendung wieder zu öffnen.</translation>
8239	8518	</message>
8240	8519	<message>

8282	8561	<source>%1 - Detached log viewer</source>
8283	8562	<translation>%1 - Protokolldateianzeige</translation>
8284	8563	</message>
	8564	<message>
	8565	<source>This will cancel the current operation and hide the UI of %1. You can restart the operation at any time.</source>
	8566	<extracomment>INFO DESKTOP_QML Content of the popup that is shown when the AA2 is closed and a workflow is still active.</extracomment>
	8567	<translation>Hiermit wird der aktuelle Vorgang abgebrochen und die Benutzeroberfläche der %1 geschlossen. Sie können den Vorgang jederzeit erneut starten.</translation>
	8568	</message>
	8569	<message>
	8570	<source>Abort operation</source>
	8571	<extracomment>INFO DESKTOP_QML Header of the popup that is shown when the AA2 is closed and a workflow is still active</extracomment>
	8572	<translation>Vorgang abbrechen</translation>
	8573	</message>
8285	8574	</context>
8286	8575	</TS>

+2

-2

resources/travis/setup.sh less more

4	4
5	5	readonly CLONE_DIR="${CLONE_DIR:-$(pwd)}"
6	6
7		MINIROOTFS_VERSION="3.11.2"
8		MINIROOTFS_SHA="e9d9ea8c59fc4e836f733d51bea78a30cf41e6a2a774ca2406427a29249684ab"
	7	MINIROOTFS_VERSION="3.12.0"
	8	MINIROOTFS_SHA="0beb54cf9bf69d085f9fcd291ff28b3335184d08b706d535f425e8180851edc9"
9	9
10	10	MINIROOTFS="alpine-minirootfs-${MINIROOTFS_VERSION}-x86_64.tar.gz"
11	11	MINIROOTFS_URI="http://dl-cdn.alpinelinux.org/alpine/v${MINIROOTFS_VERSION%.*}/releases/x86_64/$MINIROOTFS"

+698

-546

resources/updatable-files/supported-providers.json less more

0	0	{
	1	"$schema": "../json-schemas/supported-providers.json",
1	2	"callcosts" : [
2	3	{
3	4	"prefixes" : ["1371", "1375"],

99	100	"mobileDesign": false,
100	101	"shortName": {"" : ":::(bit)kasten"},
101	102	"longDescription": {"": "Der :::(bit)kasten ist ein elektronischer Briefkasten, in dem Sie Ihre Post elektronisch von teilnehmenden Unternehmen und Behörden zum Beispiel Rechnungen, Vertragsunterlagen oder Bescheide sicher und rechtsverbindlich empfangen. Ihre Post erhalten Sie wie bisher anhand Ihrer Postanschrift, nur eben digital. Sie müssen keine persönliche Daten an Dritte herausgeben, Ihre Postadresse reicht für den elektronischen Versand an den :::(bit)kasten aus.<br/>Eine Registrierung für den :::(bit)kasten ist nicht zwingend erforderlich. Ob Sie sich ein Konto anlegen möchten, entscheiden Sie selbst. Nach Login mit Ihrer Online-Ausweisfunktion können Sie Ihre Post abrufen und verwalten.<br/>Da Ihre Post nicht mehr als Papierpost verschickt werden muss, sparen Sie Zeit und senken den Papierverbrauch."},
102		"address": "https://www.bitkasten.de/",
103		"homepage": "https://www.bitkasten.de/",
	103	"address": "https://www.bitkasten.de",
	104	"homepage": "https://www.bitkasten.de",
104	105	"phone": "+49 911 6000 2874",
105	106	"email": "nachricht@bitkasten.de",
106	107	"postalAddress": "Wallensteinstr. 63<br/>90431 Nürnberg",
107	108	"category": "other",
108		"tcTokenUrl": "https://www.bitkasten.de/portal/api/login/npa/createRequest?returnUrl=https%3A%2F%2Fwww.bitkasten.de%2Fportal%2Fapi%2Flogin%2Fnpa%2Flogin.html",
109		"subjectUrls": ["https://www.bitkasten.de"]
110		},
111		{
112		"exclude": ["ios"],
	109	"subjectUrls": ["https://mein.bitkasten.de"]
	110	},
	111	{
113	112	"shortName": {"" : "Akteneinsicht in Stasi-Unterlagen"},
114	113	"longName": {"" : "Akteneinsicht in Stasi-Unterlagen"},
115	114	"shortDescription": {"": "Antragstellung auf Einsicht in Stasi-Unterlagen für Privatpersonen."},
116	115	"longDescription": {"": "Privatpersonen können online mittels neuem Personalausweis ohne weitere Wege die Einsichtnahme in die von der Stasi angelegten Akten zur eigenen Person oder zu verstorbenen/vermissten nahen Angehörigen beantragen."},
117	116	"address": "https://www.bstu.bund.de/DE/Akteneinsicht/Privatpersonen/Online-Antrag/online-antrag_node.html",
118	117	"homepage": "https://www.bstu.bund.de",
119		"phone": "+49 30 23 24-7000",
	118	"phone": "+49 30 23 24 7000",
120	119	"email": "post@bstu.bund.de",
121	120	"postalAddress": "Der Bundesbeauftragte für die Unterlagen des Staatssicherheitsdienstes der ehemaligen Deutschen Demokratischen Republik (BStU)<br/>Karl-Liebknecht-Straße 31/33<br/>10178 Berlin",
122	121	"image": "stasi_image.jpg",
123	122	"icon": "stasi_icon.png",
124	123	"category": "citizen",
125		"subjectUrls": ["https://www.bstu-formulare.de/lip"]
	124	"subjectUrls": ["https://www.bstu-formulare.de"]
	125	},
	126	{
	127	"shortName": {"" : "Service-Portal Hochsauerlandkreis"},
	128	"longName": {"": "Antragstellung an die Kreisverwaltung im Hochsauerlandkreis"},
	129	"shortDescription": {"": "Übersicht über die verschiedenen Online-Anträge"},
	130	"longDescription": {"": "Stellen Sie hier Ihre Anträge an die Kreisverwaltung. Das Angebot wird laufend erweitert."},
	131	"address": "https://portal.citkomm.de/hsk/services",
	132	"homepage": "https://portal.citkomm.de/hsk/services",
	133	"phone": "+49 291 94 0",
	134	"email": "post@hochsauerlandkreis.de",
	135	"postalAddress": "Steinstraße 27<br/>59872 Meschede",
	136	"image": "HSK_image.jpg",
	137	"icon": "HSK_icon.png",
	138	"category": "citizen",
	139	"subjectUrlInfo": "Using service from Servicekonto Nordrhein-Westfalen (https://servicekonto.nrw)."
126	140	},
127	141	{
128	142	"shortName": {"": "eID-Mahnantrag"},

131	145	"longDescription": {"": "Dienst zur Stellung von Anträgen und Abgabe von Erklärungen im Mahnverfahren nach der Zivilprozessordnung vor den bundesdeutschen Mahngerichten."},
132	146	"address": "https://www.online-mahnantrag.de",
133	147	"homepage": "https://www.online-mahnantrag.de",
134		"phone": "",
135	148	"email": "poststelle@jum.bwl.de",
136		"postalAdress": "Ministerium der Justiz und für Europa<br/>Koordinierungsstelle für das Automatisierte Mahnverfahren<br/>Schillerplatz 4<br/>70173 Stuttgart",
	149	"postalAddress": "Ministerium der Justiz und für Europa<br/>Koordinierungsstelle für das Automatisierte Mahnverfahren<br/>Schillerplatz 4<br/>70173 Stuttgart",
137	150	"image": "MahnantragJustizministeriumBaWue_image.jpg",
138	151	"icon": "MahnantragJustizministeriumBaWue_icon.png",
139	152	"category": "citizen",
140		"tcTokenUrlInfo" : "",
141		"subjectUrls": []
	153	"subjectUrls": ["https://www.online-mahnantrag.de"]
	154	},
	155	{
	156	"shortName": {"" : "Online-Registerauskunft"},
	157	"longName": {"" : "Auskunft aus den Zentralen Registern des Kraftfahrt-Bundesamtes"},
	158	"shortDescription": {"": "Mit der Anwendung können Privatpersonen eine Auskunft aus dem Fahreignungsregister (Punkteauskunft), aus dem Zentralen Fahrzeugregister (Fahrzeugzulassungen) sowie aus dem Zentralen Fahrerlaubnisregister (Führerschein) des Kraftfahrt-Bundesamtes erhalten. Diese umfasst ausgewählte Daten, die zu der jeweiligen Person gespeichert sind."},
	159	"longDescription": {"": "Die Online-Auskunft aus dem Zentralen Fahrzeugregister umfasst Informationen zur Fahrzeugbeschreibung, den Halterdaten, der Haftpflichtversicherung, der letzten Haupt- bzw. Sicherheitsüberprüfung, der Fahrzeughistorie und den zulassungsrechtlich relevanten Ereignissen. Daten von vormaligen Haltern und interne Verwaltungsdaten sind von der Auskunft ausgenommen.<br/>Die Online-Auskunft aus dem Fahreignungsregister umfasst Informationen zu den eingetragenen Verkehrsverstößen, deren Punktbewertung und Löschungsdatum.<br/>Die Online-Auskunft aus dem Zentralen Fahrerlaubnisregister umfasst Informationen zu Fahrerlaubnissen, die seit dem 01.01.1999 erteilt, erweitert oder umgeschrieben wurden. Über die anderen vor dem 01.01.1999 ausgestellten Führerscheine führt nur die jeweils ausstellende Fahrerlaubnisbehörde eine Kartei/Datei."},
	160	"address": "https://www.kba-online.de/registerauskunft/app/registeranfrage.html",
	161	"homepage": "https://www.kba.de",
	162	"phone": "+49 461 316 1717",
	163	"email": "Anwenderbetreuung@kba.de",
	164	"postalAddress": "Kraftfahrt-Bundesamt<br/>24932 Flensburg",
	165	"icon": "KraftfahrtBundesamt_icon.png",
	166	"category": "citizen",
	167	"subjectUrls": ["https://www.kba-online.de"]
142	168	},
143	169	{
144	170	"shortName": {"" : "AusweisIDent"},
145	171	"longName": {"" : "AusweisIDent Identifizierungsdienst"},
146	172	"shortDescription": {"": "AusweisIDent ist eine neue Lösung für Unternehmen zur schnellen und günstigen Online-Identifikation neuer Kunden mit der Online-Ausweisfunktion des Personalausweises oder des elektronischen Aufenthaltstitels."},
147	173	"longDescription": {"": "AusweisIDent ergänzt am Markt etablierte Verfahren um die medienbruchfreie und sichere Online-Identifizierung. Nutzer weisen sich mit der Applikation und der Online-Ausweisfunktion des Personalausweises oder des elektronischen Aufenthaltstitels online aus. Das Identifizierungsverfahren wurde von der Bundesdruckerei gemeinsam mit Governikus entwickelt. AusweisIDent eignet sich für die Identifizierung von Personen für eine Web-Anwendung. Über eine Zwei-Faktor-Authentisierung durch den Kunden werden höchste Sicherheitsanforderungen bei der Kundenregistrierung erfüllt. Die Identitätsprüfungen erfolgen gesetzeskonform nach demGesetz zur Förderung der elektronischen Verwaltung (eGovG), dem Gesetz über das Aufspüren von Gewinnen aus schweren Straftaten (GWG), dem Telekommunikationsgesetz (TKG) sowie nach Bundesdatenschutzgesetz (BDSG) und der EUDatenschutzgrundverordnung (EU-DSGVO)."},
148		"address": "https://www.ausweisident.de/",
149		"homepage": "https://www.ausweisident.de/",
	174	"address": "https://www.ausweisident.de",
	175	"homepage": "https://www.ausweisident.de",
	176	"email": "sales@bdr.de",
	177	"phone": "+49 30 25 98 18 30",
	178	"postalAddress": "Bundesdruckerei GmbH <br/>Kommandantenstraße 18 <br/>10969 Berlin",
150	179	"image": "ausweisident_image.jpg",
151	180	"icon": "ausweisident_icon.png",
152	181	"category": "other",
153		"subjectUrls": ["https://www.ausweisident.de"]
	182	"subjectUrls": ["https://ausweisident.eid-service.de"]
	183	},
	184	{
	185	"shortName": {"" : "BAföG Online"},
	186	"address": "https://www.bafoegonline.bva.bund.de/bafoeg-bo/Bafoeg/flow/anmeldenMitIdPreFlow?anmeldenAuswahl=PA_MIT_ONLINE_AUSWEISFUNKTION",
	187	"homepage": "https://www.bafoegonline.bva.bund.de",
	188	"longDescription": {"": "Mit Ihrer Online-Ausweisfunktion können Sie sich beim Bundesverwaltungsamt für das BAföG-Rückzahlungsverfahren anmelden und sowohl Ihre persönlichen Daten als auch die erforderlichen Nachweise sicher und schnell elektronisch übermitteln. Sie müssen die Nachweise nicht mehr per Post senden.<br/>Die Online-Ausweisfunktion vereinfacht und beschleunigt das BAföG-Rückzahlungsverfahren."},
	189	"phone": "+49 22899358 4500",
	190	"postalAddress": "Bundesverwaltungsamt<br/>BT-BAföG<br/>50728 Köln",
	191	"category": "citizen",
	192	"subjectUrls": ["https://e-id.bva.bund.de"]
	193	},
	194	{
	195	"exclude": ["ios"],
	196	"shortName": {"" : "BAföG Online Bayern (AKDB)"},
	197	"longDescription": {"": "In Bayern können Sie Ihr BAföG für ein Studium bzw. eine Ausbildung in Bayern, Österreich, Liechtenstein oder der Schweiz nicht nur auf dem Postweg oder durch persönliche Abgabe beim Amt beantragen, sondern auch mit der Online-Ausweisfunktion bequem und schnell im Internet.<br/>Ihr Antrag muss dann nicht mehr ausgedruckt, unterschrieben und versandt werden, sondern gilt mit der Übermittlung Ihrer Daten als wirksam gestellt. Beizufügende und nachzureichende Unterlagen sowie Bescheinigungen können Sie über die Upload-Funktion ebenfalls elektronisch übermitteln.<br/>Nach Übermittlung der Daten wird Ihnen der Antrag als PDF-Dokument zum Download angeboten. Der Bescheid wird Ihnen per Post zugestellt."},
	198	"address": "https://afoegfofa.osrz-akdb.de",
	199	"homepage": "https://afoegfofa.osrz-akdb.de",
	200	"phone": "+49 89 5903 0",
	201	"postalAddress": "Anstalt für Kommunale Datenverarbeitung in Bayern (AKDB)<br/>Hansastraße 12-16<br/>80686 München",
	202	"category": "citizen",
	203	"subjectUrlInfo": "Using service from Bürgerservice-Portale der bayerischen Kommunen (https://www.buergerserviceportal.de)."
	204	},
	205	{
	206	"exclude": ["ios"],
	207	"shortName": {"" : "BAföG Online Bayern (Studentenwerk)"},
	208	"address": "https://www.bafoeg-bayern.de",
	209	"homepage": "https://www.bafoeg-bayern.de",
	210	"phone": "+49 800 223 63 41",
	211	"email": "webmaster@bafoeg-bayern.de",
	212	"postalAddress": "Studentenwerk Niederbayern/Oberpfalz, Anstalt des öffentlichen Rechts<br/>Administration BAföG-Bayern<br/>Albertus-Magnus-Straße 4<br/>93053 Regensburg",
	213	"category": "citizen",
	214	"subjectUrlInfo": "Using service from Bürgerservice-Portale der bayerischen Kommunen (https://www.buergerserviceportal.de)."
154	215	},
155	216	{
156	217	"exclude": ["ios"],

160	221	"longDescription": {"": "Sie wollen einen Antrag auf Ausbildungsförderung nach dem BAföG stellen? Mit dem neuen Personalausweis / elektronischen Aufenthaltstitel können Sie Ihren Antrag elektronisch signieren und an das Amt übermitteln. Ebenso können Ihre Eltern und ggf. Ihr Ehepartner die nötigen Formulare signieren."},
161	222	"address": "https://www.berlin-bafoeg.de",
162	223	"homepage": "https://www.berlin-bafoeg.de",
163		"phone": "+49 30 939 39 - 70",
	224	"phone": "+49 30 939 39 70",
164	225	"email": "info@stw.berlin",
165	226	"postalAddress": "studierendenWERK BERLIN<br/>BAföG-Amt<br/>Behrenstraße 40/41<br/>10117 Berlin",
166	227	"image": "BafoegBerlin_image.jpg",
167	228	"icon": "BafoegBerlin_icon.png",
168	229	"category": "citizen",
169		"subjectUrls": []
	230	"subjectUrlInfo": "Using service from Service-Portal Berlin (https://eid-prod.connect.verwalt-berlin.de)."
	231	},
	232	{
	233	"exclude": ["ios"],
	234	"shortName": {"" : "BAföG Online Brandenburg"},
	235	"longDescription": {"": "In Brandenburg können Sie Ihr BAföG nicht nur auf dem Postweg oder durch persönliche Abgabe beim Amt beantragen, sondern auch bequem und schnell im Internet.<br/>Ihr Antrag muss dann nicht mehr ausgedruckt, unterschrieben und versandt werden, sondern gilt mit der Übermittlung Ihrer Daten als wirksam gestellt. Beizufügende und nachzureichende Unterlagen sowie Bescheinigungen können Sie über die Upload-Funktion ebenfalls elektronisch übermitteln.<br/>Nach Übermittlung der Daten wird Ihnen der Antrag als PDF-Dokument zum Download angeboten. Der Bescheid wird Ihnen per Post zugestellt."},
	236	"address": "https://www.bafoeg-brandenburg.de",
	237	"homepage": "https://www.bafoeg-brandenburg.de",
	238	"phone": "+49 331 866 45 60",
	239	"email": "mwfk@mwfk.brandenburg.de",
	240	"postalAddress": "Ministerium für Wissenschaft, Forschung und Kultur<br/>Presse- und Öffentlichkeitsarbeit ",
	241	"category": "citizen",
	242	"subjectUrls": ["https://www.bafoeg-brandenburg.de"]
	243	},
	244	{
	245	"exclude": ["ios"],
	246	"shortName": {"" : "BAföG Online Hamburg"},
	247	"longDescription": {"": "In Hamburg können Sie Ihr BAföG nicht nur auf dem Postweg oder durch persönliche Abgabe beim Amt beantragen, sondern auch bequem und schnell im Internet.<br/>Ihr Antrag muss dann nicht mehr ausgedruckt, unterschrieben und versandt werden, sondern gilt mit der Übermittlung Ihrer Daten als wirksam gestellt. Beizufügende und nachzureichende Unterlagen sowie Bescheinigungen können Sie über die neue Upload-Funktion ebenfalls elektronisch übermitteln.<br/>Nach Übermittlung der Daten wird Ihnen der Antrag als PDF-Dokument zum Download angeboten. Der Bescheid wird Ihnen per Post zugestellt."},
	248	"address": "https://bafoeg-online.hamburg.de",
	249	"homepage": "https://bafoeg-online.hamburg.de",
	250	"phone": "+49 800 223 63 41",
	251	"email": "Marita.Porr@bwfg.hamburg.de",
	252	"postalAddress": "Ressortleiter Online-Redaktion der Behörde für Wissenschaft, Forschung und Gleichstellung:<br/>Kommunikation<br/>Daniel Drexelius<br/>Hamburger Straße 37<br/>22083 Hamburg",
	253	"category": "citizen",
	254	"subjectUrlInfo": "Using service from Hamburg Service Online-Bürgerdienste (https://idp.servicekonto.serviceportal.hamburg.de)."
	255	},
	256	{
	257	"exclude": ["ios"],
	258	"shortName": {"" : "BAföG Online Mecklenburg-Vorpommern"},
	259	"address": "https://www.regierung-mv.de/Landesregierung/bm/Wissenschaft/Studium/Studienfinanzierung%20(BafoeG)",
	260	"homepage": "https://www.regierung-mv.de",
	261	"postalAddress": "Ministerium für Bildung, Wissenschaft und Kultur Mecklenburg-Vorpommern<br/>Werderstraße 124<br/>19055 Schwerin",
	262	"category": "citizen",
	263	"subjectUrls": ["https://fms.mv-regierung.de"]
	264	},
	265	{
	266	"exclude": ["ios"],
	267	"shortName": {"" : "BAföG Online Nordrhein-Westfalen"},
	268	"longDescription": {"": "In Nordrhein-Westfalen können Sie mit der Online-Ausweisfunktion Ihren Antrag auf BAföG für eine Ausbildung (Schulausbildung, Studium in Nordrhein-Westfalen sowie Studium in Belgien, den Niederlanden oder Luxemburg) oder Ihren Antrag auf Aufstiegsfortbildungsförderung (z. B. für die Meisterausbildung) in Nordrhein-Westfalen bequem und schnell im Internet stellen.<br/>Ihr Antrag muss dann nicht mehr ausgedruckt, unterschrieben und versandt werden, sondern gilt mit der Übermittlung Ihrer Daten als wirksam gestellt. Beizufügende und nachzureichende Unterlagen sowie Bescheinigungen können Sie über die Upload-Funktion ebenfalls elektronisch übermitteln.<br/>Nach Übermittlung der Daten wird Ihnen der Antrag als PDF-Dokument zum Download angeboten. Der Bescheid wird Ihnen per Post zugestellt."},
	269	"address": "https://www.bafoeg-online.nrw.de/bafoeg/StartNutzung.html",
	270	"homepage": "https://www.bafoeg-online.nrw.de/bafoeg/StartNutzung.html",
	271	"phone": "+49 211 896 04",
	272	"email": "poststelle@miwf.nrw.de",
	273	"postalAddress": "Ministerium für Innovation, Wissenschaft und Forschung des Landes Nordrhein-Westfalen<br/>Besucher- und Lieferanschrift<br/>Völklinger Straße 49<br/>40221 Düsseldorf",
	274	"category": "citizen",
	275	"subjectUrlInfo": "Using service from Servicekonto Nordrhein-Westfalen (https://servicekonto.nrw)."
	276	},
	277	{
	278	"exclude": ["ios"],
	279	"shortName": {"" : "BAföG Online Sachsen"},
	280	"address": "https://fs.egov.sachsen.de/formserv/findform?shortname=bafoeg&formtecid=11&areashortname=SMWK_bafoeg",
	281	"homepage": "https://www.studieren.sachsen.de",
	282	"phone": "+49 351 564 1080",
	283	"email": "info@sk.sachsen.de",
	284	"postalAddress": "Sächsische Staatskanzlei<br/>Redaktion Amt24 / Bürgerbüro<br/>01095 Dresden",
	285	"category": "citizen",
	286	"subjectUrls": ["https://eidconnect.egov.sachsen.de"]
	287	},
	288	{
	289	"exclude": ["ios"],
	290	"shortName": {"" : "BAföG Online Schleswig-Holstein"},
	291	"longDescription": {"": "In Schleswig-Holstein können Sie Ihr BAföG nicht nur auf dem Postweg oder durch persönliche Abgabe beim Amt beantragen, sondern auch bequem und schnell im Internet.<br/>Ihr Antrag muss dann nicht mehr ausgedruckt, unterschrieben und versandt werden, sondern gilt mit der Übermittlung Ihrer Daten als wirksam gestellt. Beizufügende und nachzureichende Unterlagen sowie Bescheinigungen können Sie über die Upload-Funktion ebenfalls elektronisch übermitteln.<br/>Nach Übermittlung der Daten wird Ihnen der Antrag als PDF-Dokument zum Download angeboten. Der Bescheid wird Ihnen per Post zugestellt."},
	292	"address": "https://bafoeg.schleswig-holstein.de/BAfoeGOnline/ABAfoeG",
	293	"homepage": "https://bafoeg.schleswig-holstein.de",
	294	"phone": "+49 431 988 0",
	295	"email": "bafoeg@sozmi.landsh.de",
	296	"postalAddress": "Ministerium für Soziales, Gesundheit, Wissenschaft und Gleichstellung des Landes Schleswig-Holstein<br/>Abteilung VIII 5<br/>Düsternbrooker Weg 104<br/>24105 Kiel",
	297	"category": "citizen",
	298	"subjectUrls": ["https://idp.serviceportal.schleswig-holstein.de"]
170	299	},
171	300	{
172	301	"exclude": ["ios"],

175	304	"shortDescription": {"": "BAföG und AFBG Online-Antragstellung Hessen"},
176	305	"longDescription": {"": "Mit Hilfe dieses Angebotes können Antragstellende, Ehegatten / eingetragene Lebenspartner und Eltern die erforderlichen Antragsformblätter online ausfüllen, mit Hilfe der eID rechtswirksam unterschreiben und papierlos dem zuständigen Amt übermitteln."},
177	306	"address": "https://www.bafoeg-hessen.de",
178		"homepage": "https://wissenschaft.hessen.de/",
179		"phone": "+49 611 32 - 3551",
	307	"homepage": "https://wissenschaft.hessen.de",
	308	"phone": "+49 611 32 3551",
180	309	"email": "hebav@hmwk.hessen.de",
181	310	"postalAddress": "Hessisches Ministerium für Wissenschaft und Kunst<br/>Rheinstraße 23-25<br/>65185 Wiesbaden ",
182	311	"image": "BafoegHessen_image.jpg",
183	312	"icon": "BafoegHessen_icon.png",
184	313	"category": "citizen",
185		"subjectUrls": ["https://www.bafoeg-hessen.de"]
186		},
187		{
188		"shortName": {"" : "BAföG Online"},
189		"address": "https://www.bafoegonline.bva.bund.de/",
190		"homepage": "https://www.bva.bund.de/DE/Themen/Bildung/BAfoeG/bafoeg_node.html",
191		"longDescription": {"": "Mit Ihrer Online-Ausweisfunktion können Sie sich beim Bundesverwaltungsamt für das BAföG-Rückzahlungsverfahren anmelden und sowohl Ihre persönlichen Daten als auch die erforderlichen Nachweise sicher und schnell elektronisch übermitteln. Sie müssen die Nachweise nicht mehr per Post senden.<br/>Die Online-Ausweisfunktion vereinfacht und beschleunigt das BAföG-Rückzahlungsverfahren."},
192		"phone": "+49 22899358 - 4500",
193		"email": "",
194		"postalAddress": "Bundesverwaltungsamt<br/>BT-BAföG<br/>50728 Köln",
195		"category": "citizen",
196		"tcTokenUrl" : "",
197		"clientUrl" : "https://www.bafoegonline.bva.bund.de/bafoeg-online/Bafoeg/flow/anmeldenMitNpaPreFlow",
198		"subjectUrls": ["https://e-id.bva.bund.de"]
199		},
200		{
201		"exclude": ["ios"],
202		"shortName": {"" : "BAföG Online Bayern (AKDB)"},
203		"longDescription": {"": "In Bayern können Sie Ihr BAföG für ein Studium bzw. eine Ausbildung in Bayern, Österreich, Liechtenstein oder der Schweiz nicht nur auf dem Postweg oder durch persönliche Abgabe beim Amt beantragen, sondern auch mit der Online-Ausweisfunktion bequem und schnell im Internet.<br/>Ihr Antrag muss dann nicht mehr ausgedruckt, unterschrieben und versandt werden, sondern gilt mit der Übermittlung Ihrer Daten als wirksam gestellt. Beizufügende und nachzureichende Unterlagen sowie Bescheinigungen können Sie über die Upload-Funktion ebenfalls elektronisch übermitteln.<br/>Nach Übermittlung der Daten wird Ihnen der Antrag als PDF-Dokument zum Download angeboten. Der Bescheid wird Ihnen per Post zugestellt."},
204		"address": "https://afoegfofa.osrz-akdb.de",
205		"homepage": "https://afoegfofa.osrz-akdb.de",
206		"phone": "+49 89 / 5903 - 0",
207		"email": "",
208		"postalAddress": "Anstalt für Kommunale Datenverarbeitung in Bayern (AKDB)<br/>Hansastraße 12-16<br/>80686 München",
209		"category": "citizen",
210		"subjectUrls": ["https://www.buergerserviceportal.de"]
211		},
212		{
213		"exclude": ["ios"],
214		"shortName": {"" : "BAföG Online Bayern (Studentenwerk)"},
215		"address": "https://www.bafoeg-bayern.de",
216		"homepage": "https://www.bafoeg-bayern.de",
217		"phone": "+49 800-223 63 41",
218		"email": "webmaster@bafoeg-bayern.de",
219		"postalAddress": "Studentenwerk Niederbayern/Oberpfalz, Anstalt des öffentlichen Rechts<br/>Administration BAföG-Bayern<br/>Albertus-Magnus-Straße 4<br/>93053 Regensburg",
220		"category": "citizen",
221		"subjectUrls": []
222		},
223		{
224		"exclude": ["ios"],
225		"shortName": {"" : "BAföG Online Brandenburg"},
226		"longDescription": {"": "In Brandenburg können Sie Ihr BAföG nicht nur auf dem Postweg oder durch persönliche Abgabe beim Amt beantragen, sondern auch bequem und schnell im Internet.<br/>Ihr Antrag muss dann nicht mehr ausgedruckt, unterschrieben und versandt werden, sondern gilt mit der Übermittlung Ihrer Daten als wirksam gestellt. Beizufügende und nachzureichende Unterlagen sowie Bescheinigungen können Sie über die Upload-Funktion ebenfalls elektronisch übermitteln.<br/>Nach Übermittlung der Daten wird Ihnen der Antrag als PDF-Dokument zum Download angeboten. Der Bescheid wird Ihnen per Post zugestellt."},
227		"address": "https://www.bafoeg-brandenburg.de",
228		"homepage": "https://www.bafoeg-brandenburg.de",
229		"phone": "+49 331 / 866 45 60",
230		"email": "mwfk@mwfk.brandenburg.de",
231		"postalAddress": "Ministerium für Wissenschaft, Forschung und Kultur<br/>Presse- und Öffentlichkeitsarbeit ",
232		"category": "citizen",
233		"subjectUrls": ["https://www.bafoeg-brandenburg.de"]
234		},
235		{
236		"exclude": ["ios"],
237		"shortName": {"" : "BAföG Online Hamburg"},
238		"longDescription": {"": "In Hamburg können Sie Ihr BAföG nicht nur auf dem Postweg oder durch persönliche Abgabe beim Amt beantragen, sondern auch bequem und schnell im Internet.<br/>Ihr Antrag muss dann nicht mehr ausgedruckt, unterschrieben und versandt werden, sondern gilt mit der Übermittlung Ihrer Daten als wirksam gestellt. Beizufügende und nachzureichende Unterlagen sowie Bescheinigungen können Sie über die neue Upload-Funktion ebenfalls elektronisch übermitteln.<br/>Nach Übermittlung der Daten wird Ihnen der Antrag als PDF-Dokument zum Download angeboten. Der Bescheid wird Ihnen per Post zugestellt."},
239		"address": "https://bafoeg-online.hamburg.de",
240		"homepage": "https://bafoeg-online.hamburg.de",
241		"phone": "+49 800-223 63 41",
242		"email": "Marita.Porr@bwfg.hamburg.de",
243		"postalAddress": "Ressortleiter Online-Redaktion der Behörde für Wissenschaft, Forschung und Gleichstellung:<br/>Kommunikation<br/>Daniel Drexelius<br/>Hamburger Straße 37<br/>22083 Hamburg",
244		"category": "citizen",
245		"subjectUrls": ["https://bafoeg-online.hamburg.de"]
246		},
247		{
248		"exclude": ["ios"],
249		"shortName": {"" : "BAföG Online Mecklenburg-Vorpommern"},
250		"address": "https://www.regierung-mv.de/Landesregierung/bm/Wissenschaft/Studium/Studienfinanzierung%20(BafoeG)",
251		"homepage": "https://www.regierung-mv.de/",
252		"phone": "",
253		"email": "",
254		"postalAddress": "Ministerium für Bildung, Wissenschaft und Kultur Mecklenburg-Vorpommern<br/>Werderstraße 124<br/>19055 Schwerin",
255		"category": "citizen",
256		"subjectUrls": ["https://fms.mv-regierung.de"]
257		},
258		{
259		"exclude": ["ios"],
260		"shortName": {"" : "BAföG Online Nordrhein-Westfalen"},
261		"longDescription": {"": "In Nordrhein-Westfalen können Sie mit der Online-Ausweisfunktion Ihren Antrag auf BAföG für eine Ausbildung (Schulausbildung, Studium in Nordrhein-Westfalen sowie Studium in Belgien, den Niederlanden oder Luxemburg) oder Ihren Antrag auf Aufstiegsfortbildungsförderung (z. B. für die Meisterausbildung) in Nordrhein-Westfalen bequem und schnell im Internet stellen.<br/>Ihr Antrag muss dann nicht mehr ausgedruckt, unterschrieben und versandt werden, sondern gilt mit der Übermittlung Ihrer Daten als wirksam gestellt. Beizufügende und nachzureichende Unterlagen sowie Bescheinigungen können Sie über die Upload-Funktion ebenfalls elektronisch übermitteln.<br/>Nach Übermittlung der Daten wird Ihnen der Antrag als PDF-Dokument zum Download angeboten. Der Bescheid wird Ihnen per Post zugestellt."},
262		"address": "https://www.bafoeg-online.nrw.de/bafoeg/StartNutzung.html",
263		"homepage": "https://www.bafoeg-online.nrw.de/bafoeg/StartNutzung.html",
264		"phone": "+49 211 896-04",
265		"email": " poststelle@miwf.nrw.de",
266		"postalAddress": "Ministerium für Innovation, Wissenschaft und Forschung des Landes Nordrhein-Westfalen<br/>Besucher- und Lieferanschrift<br/>Völklinger Straße 49<br/>40221 Düsseldorf",
267		"category": "citizen",
268		"subjectUrls": ["https://www.bafoeg-online.nrw.de/bafoeg"]
269		},
270		{
271		"exclude": ["ios"],
272		"shortName": {"" : "BAföG Online Sachsen"},
273		"address": "https://fs.egov.sachsen.de/formserv/findform?shortname=bafoeg&formtecid=11&areashortname=SMWK_bafoeg",
274		"homepage": "https://www.studieren.sachsen.de/",
275		"phone": "+49 351 564-1080",
276		"email": "info@sk.sachsen.de",
277		"postalAddress": "Sächsische Staatskanzlei<br/>Redaktion Amt24 / Bürgerbüro<br/>01095 Dresden",
278		"category": "citizen",
279		"subjectUrls": ["https://fs.egov.sachsen.de"]
280		},
281		{
282		"exclude": ["ios"],
283		"shortName": {"" : "BAföG Online Schleswig-Holstein"},
284		"longDescription": {"": "In Schleswig-Holstein können Sie Ihr BAföG nicht nur auf dem Postweg oder durch persönliche Abgabe beim Amt beantragen, sondern auch bequem und schnell im Internet.<br/>Ihr Antrag muss dann nicht mehr ausgedruckt, unterschrieben und versandt werden, sondern gilt mit der Übermittlung Ihrer Daten als wirksam gestellt. Beizufügende und nachzureichende Unterlagen sowie Bescheinigungen können Sie über die Upload-Funktion ebenfalls elektronisch übermitteln.<br/>Nach Übermittlung der Daten wird Ihnen der Antrag als PDF-Dokument zum Download angeboten. Der Bescheid wird Ihnen per Post zugestellt."},
285		"address": "https://bafoeg.schleswig-holstein.de/BAfoeGOnline/ABAfoeG/",
286		"homepage": "https://bafoeg.schleswig-holstein.de/",
287		"phone": "+49 431 988-0",
288		"email": "bafoeg@sozmi.landsh.de",
289		"postalAddress": "Ministerium für Soziales, Gesundheit, Wissenschaft und Gleichstellung des Landes Schleswig-Holstein<br/>Abteilung VIII 5<br/>Düsternbrooker Weg 104<br/>24105 Kiel",
290		"category": "citizen"
	314	"subjectUrls": ["https://mein-service.hessen.de"]
291	315	},
292	316	{
293	317	"shortName": {"" : "Beantragung Schwerbehindertenausweis Bayern"},
294	318	"longDescription": {"": "Einen Schwerbehindertenantrag können Sie bei der Landesbehörde Zentrum Bayern Familie und Soziales (ZBFS) mit der Online-Ausweisfunktion komplett papierlos stellen.<br/>Der papierlose Antrag ist ein bedeutender Schritt auf dem Weg zur digitalen Verwaltung – online, schnell und unkompliziert.<br/>Das Online-Verfahren hat weitere Vorteile. Gerade für sehbehinderte Menschen ist die papiergebundene Schriftform ein Hindernis. Digitale Angebote bieten ihnen die Chance, Behördenangelegenheiten ein Stück weit selbständiger erledigen zu können.<br/>Zu 100 Prozent digital – ein bisschen weniger lästiger Papierkram. Digitalisierung ist somit ein Beitrag zur Inklusion."},
295	319	"address": "https://www.schwerbehindertenantrag.bayern.de",
296		"homepage": "https://www.zbfs.bayern.de/",
297		"phone": "+49 921 605-03",
	320	"homepage": "https://www.zbfs.bayern.de",
	321	"phone": "+49 921 605 03",
298	322	"email": "poststelle@zbfs.bayern.de",
299	323	"postalAddress": "Zentrum Bayern Familie und Soziales<br/>95440 Bayreuth",
300	324	"category": "citizen",
301		"subjectUrls": ["https://www.buergerserviceportal.de"]
	325	"subjectUrlInfo": "Using service from Bürgerservice-Portale der bayerischen Kommunen (https://www.buergerserviceportal.de)."
302	326	},
303	327	{
304	328	"shortName": {"" : "Beantragung Schwerbehindertenausweis Saarland"},
305	329	"longDescription": {"": "Als erstes Bundesland bietet Ihnen das Saarland mit Schweb.NET Online die Möglichkeit, Ihren Erst- und Verschlimmerungsantrag auf Feststellung einer Behinderung nach dem Schwerbehindertenrecht online beim Landesamt für Soziales zu stellen.<br/>Weite Wege werden dadurch vermieden. Bearbeitungszeiten und Arbeitsabläufe werden verkürzt.<br/>Der Antrag ist selbsterklärend und nutzerfreundlich. "},
306	330	"address": "https://gatewaylas.saarland.de/FV/Onlineantrag",
307	331	"homepage": "https://www.saarland.de/index.htm",
308		"phone": "+49 681/9978-2181",
309		"email": "",
	332	"phone": "+49 681 9978 2181",
310	333	"postalAddress": "Ministerium für Soziales, Gesundheit, Frauen und Familie<br/>Franz-Josef-Röder-Straße 23<br/>66119 Saarbrücken",
311	334	"category": "citizen",
312		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
313	335	"subjectUrls": ["https://tbklas.saarland.de"]
	336	},
	337	{
	338	"shortName": {"" : "Braunschweig iKfz"},
	339	"address": "https://stadt-braunschweig.govconnect.de",
	340	"homepage": "https://braunschweig.de",
	341	"phone": "+49 531 4701",
	342	"email": "stadt@braunschweig.de",
	343	"postalAddress": "Stadt Braunschweig<br/>Platz der Deutschen Einheit 1<br/>38100 Braunschweig",
	344	"category": "citizen",
	345	"subjectUrls": ["https://e-id.niedersachsen.de"]
314	346	},
315	347	{
316	348	"exclude": ["ios"],
317	349	"shortName": {"" : "Bundesagentur für Arbeit"},
318	350	"longDescription": {"": "Mit der Online-Ausweisfunktion des Personalausweises können Sie sich bei der Bundesagentur für Arbeit einfach und zuverlässig über Ihr Kindergeld informieren. Die Anwendung bietet u.a. die Möglichkeit:<br/>- sich über den Antragstatus und die Berechnungsgrundlage für den eigenen Kindergeldbezug zu informieren<br/>- Ihre persönlichen Daten online zu ändern, z. B. Ihre Adresse<br/>- für Kunden der Familienkasse Änderungen vollständig papierlos zu übermitteln."},
319	351	"address": "https://www.arbeitsagentur.de/npa",
320		"homepage": "https://www.arbeitsagentur.de/",
321		"phone": "+49 911/179-0",
322		"email": "Zentrale@arbeitsagentur.de ",
	352	"homepage": "https://www.arbeitsagentur.de",
	353	"phone": "+49 911 179 0",
	354	"email": "Zentrale@arbeitsagentur.de",
323	355	"postalAddress": "Bundesagentur für Arbeit<br/>Regensburger Straße 104<br/>90478 Nürnberg",
324	356	"category": "other",
325		"tcTokenUrl" : "",
326		"clientUrl" : "https://formular.arbeitsagentur.de/eantrag/fallinfo-npa.page",
327	357	"subjectUrls": ["https://formular.arbeitsagentur.de"]
328	358	},
329	359	{

331	361	"shortName": {"" : "Bundestag ePetition"},
332	362	"longDescription": {"": "Mit der Online-Ausweisfunktion des Personalausweises können Sie sich einfach und sicher am Petitionsportal des Deutschen Bundestages<br/>- registrieren,<br/>- eine Petition einreichen sowie<br/>- eine Petition mitzeichnen."},
333	363	"address": "https://epetitionen.bundestag.de/epet/anmelden.html",
334		"homepage": "https://www.bundestag.de/",
335		"phone": "+49 30 227-35257",
	364	"homepage": "https://www.bundestag.de",
	365	"phone": "+49 30 227 35257",
336	366	"email": "post.pet@bundestag.de",
337	367	"postalAddress": "Sekretariat des Petitionsausschusses<br/>Platz der Republik 1<br/>11011 Berlin",
338	368	"category": "citizen",
339		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
340	369	"subjectUrls": ["https://epetitionen.bundestag.de"]
341	370	},
342	371	{

344	373	"shortName": {"" : "Bürgerantrag Bremen"},
345	374	"longDescription": {"": "Mit der Online-Ausweisfunktion können Sie im Bundesland Bremen Bürgeranträge elektronisch mitzeichnen oder Unterschriften für Ihren eigenen Bürgerantrag sammeln. Mit nur 5.000 Mitzeichnerinnen und Mitzeichnern – egal ob online oder auf Papier – können Sie Anträge direkt in den Bremische Bürgerschaft (Landtag) einbringen. Für die Stadtbürgerschaft Bremen genügen sogar 4.000 Unterschriften."},
346	375	"address": "https://www.buergerantrag.bremen.de",
347		"homepage": "https://www.bremische-buergerschaft.de/",
348		"phone": "",
	376	"homepage": "https://www.bremische-buergerschaft.de",
349	377	"email": "webmaster@buergerschaft.bremen.de",
350		"postalAddress": "",
351		"category": "citizen",
352		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
	378	"category": "citizen",
353	379	"subjectUrls": ["https://servicekonto.bremen.de"]
354	380	},
355	381	{
356	382	"shortName": {"" : "Bürgerdienste der Stadt Münster"},
357	383	"longDescription": {"": "Die Stadt Münster bietet auf ihrer Webseite eine Reihe von Online-Diensten an. Dort können Sie mit der Online-Ausweisfunktion unter anderem:<br/>- eine Personenstandsurkunde bestellen,<br/>- Ihr Wunschkennzeichen beantragen,<br/>- geografische Karten bestellen,<br/>- Elektroschrott zur Abholung anmelden,<br/>- eine Erklärung zum Elterneinkommen für die Festsetzung des Elternbeitrags für die Kindertagesbetreuung abgeben,<br/>- eine Sondernutzungserlaubnis für private Baumaßnahmen an öffentlichen Straßen beantragen,<br/>- eine Großanlage mit zentraler Trinkwassererwärmung anzeigen,<br/>- einen Fahrradfund melden,<br/>- ein Reitkennzeichen beantragen,<br/>- Mietspiegel-Broschüren bestellen."},
358	384	"address": "https://www.stadt-muenster.de/rathaus/online-dienste.html",
359		"homepage": "https://www.muenster.de/",
360		"phone": "+49 251/4 92-0",
	385	"homepage": "https://www.muenster.de",
	386	"phone": "+49 251 4 92 0",
361	387	"email": "stadtverwaltung@stadt-muenster.de",
362	388	"postalAddress": "Stadt Münster<br/>48127 Münster",
363	389	"category": "citizen",
364		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
365		"subjectUrls": []
	390	"subjectUrlInfo": "Using service from Servicekonto Nordrhein-Westfalen (https://servicekonto.nrw)."
366	391	},
367	392	{
368	393	"shortName": {"" : "Bürgerportal Baden-Württemberg"},
369	394	"longDescription": {"": "Das Bürgerportal ,mein service-bw' bietet Bürgerinnen und Bürgern mit dem Personalausweis praktische Anwendungen für die Online-Ausweisfunktion. Das Portal bietet seinen Nutzern unter anderem:<br/>- sicheres Registrieren und Anmelden, um Behördengänge im Internet zu erledigen<br/>- verschlüsselte Ablage persönlicher Daten und Dateien in einem Datenspeicher im Internet, dem sogenannten Dokumentensafe<br/>- orts- und zeitunabhängiger Zugang zu den Daten im Dokumentensafe sowie die Möglichkeit, diese elektronisch an Behörden weiterzuleiten (z. B. für eine Gewerbeanmeldung)."},
370	395	"address": "https://service-bw.de/zfinder-bw-web/welcome.do?showMsbwDetails=1",
371		"homepage": "https://www.service-bw.de/",
372		"phone": "",
	396	"homepage": "https://www.service-bw.de",
373	397	"email": "service-bw@im.bwl.de",
374	398	"postalAddress": "Ministerium für Inneres, Digitalisierung und Migration Baden-Württemberg<br/>Willy-Brandt-Straße 41<br/>70173 Stuttgart",
375	399	"category": "citizen",
376		"tcTokenUrlInfo" : "Unable to locate URL",
377	400	"subjectUrls": ["https://eid.service-bw.de"]
378	401	},
379	402	{
380	403	"shortName": {"" : "Bürgerportal Rheinland Pfalz"},
381	404	"longDescription": {"": "Über 80% der Meldebehörden und über 90% der Standesämter in Rheinland-Pfalz bieten Ihnen über das Portal www.rlpdirekt.de Verwaltungsleistungen mit der Online-Ausweisfunktion an, für die Sie nicht mehr zur Behörde gehen müssen, z. B.:<br/>- Kfz abmelden<br/>- Führungszeugnis beantragen,<br/>- Meldebescheinigung beantragen,<br/>- Aufenthaltsbescheinigung beantragen,<br/>- Übermittlungssperre einrichten,<br/>- Auskunft aus dem Gewerbezentralregister beantragen,<br/>- Beurkundung im Personenstandswesen beantragen.<br/>Welche Dienste in Ihrer Kommune mit der Online-Ausweisfunktion genutzt werden können, erfahren Sie, wenn Sie auf dem Portal unter \"Stadt/Ort\" Ihren Wohnort eingeben."},
382		"address": "https://www.rlpdirekt.de/",
383		"homepage": "https://www.rlpdirekt.de/",
384		"phone": "+49 6131 / 6277-0",
	405	"address": "https://www.rlpdirekt.de",
	406	"homepage": "https://www.rlpdirekt.de",
	407	"phone": "+49 6131 6277 0",
385	408	"email": "support@kommwis.de",
386	409	"postalAddress": "KommWis GmbH<br/>Gesellschaft für Kommunikation und Wissenstransfer mbH<br/>Hindenburgplatz 3<br/>55118 Mainz",
387	410	"category": "citizen",
388		"tcTokenUrlInfo" : "PLZ required",
389		"subjectUrls": []
	411	"subjectUrls": ["https://tbk.ewois.de"]
	412	},
	413	{
	414	"shortName": {"" : "Bürgerservice Magdeburg"},
	415	"longDescription": {"": "Die internetbasierte Außerbetriebsetzung und Wiederzulassung eines Kraftfahrzeuges können über das Portal der Landeshauptstadt Magdeburg beantragt werden."},
	416	"address": "https://www.magdeburg.de/loadDocument.phtml?ObjSvrID=37&ObjID=27929",
	417	"homepage": "https://www.magdeburg.de/Start/B%C3%BCrger-Stadt/Verwaltung-Service/B%C3%BCrgerService",
	418	"phone": "+49 391 54 00",
	419	"email": "info@magdeburg.de",
	420	"postalAddress": "Landeshauptstadt Magdeburg<br/>Alter Markt 6<br/>39104 Magdeburg",
	421	"category": "citizen",
	422	"subjectUrlInfo": "Using service from Serviceportal Sachsen-Anhalt (https://bk.sachsen-anhalt-connect.de)"
	423	},
	424	{
	425	"shortName": {"" : "Bürgerservice-Portal Krz"},
	426	"longName": {"" : "Bürgerservice-Portal Kommunales Rechenzentrum Minden-Ravensberg/Lippe"},
	427	"address": "https://www.buergerserviceportal.nrw/krz/classic",
	428	"homepage": "https://www.buergerserviceportal.nrw/krz",
	429	"category": "citizen",
	430	"subjectUrls": ["https://www.buergerserviceportal.nrw"]
390	431	},
391	432	{
392	433	"exclude": ["ios"],

395	436	"shortDescription": {"": "Anträge an die Kreisverwaltung Herford online erfassen."},
396	437	"longDescription": {"": "In unserem Bürgerservice-Portal können Sie Anträge an die Kreisverwaltung Herford online erfassen und direkt zur weiteren Bearbeitung an die zuständigen Stellen übermitteln."},
397	438	"address": "https://www.buergerserviceportal.nrw/krz/lkrherford",
398		"homepage": "https://www.kreis-herford.de/",
399		"phone": "+49 5223/988 - 500",
	439	"homepage": "https://www.kreis-herford.de",
	440	"phone": "+49 5223 988 500",
400	441	"email": "portal@kreis-herford.de",
401	442	"postalAddress": "Kreis Herford<br/>Amtshausstraße 3<br/>32051 Herford",
402	443	"image": "KreisHerford_image.jpg",
403	444	"icon": "KreisHerford_icon.png",
404	445	"category": "citizen",
405		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
406		"subjectUrls": ["https://www.buergerserviceportal.nrw"]
	446	"subjectUrlInfo": "Using service from Bürgerservice-Portal Krz (https://www.buergerserviceportal.nrw)."
407	447	},
408	448	{
409	449	"exclude": ["ios"],

412	452	"shortDescription": {"": "Anträge an den Kreis Minden-Lübbecke online erfassen."},
413	453	"longDescription": {"": "In unserem Portal können Sie Ihren Antrag an den Kreis Minden-Lübbecke direkt online erfassen und elektronisch übermitteln."},
414	454	"address": "https://www.buergerserviceportal.nrw/krz/mindenluebbecke",
415		"homepage": "https://www.minden-luebbecke.de/",
416		"phone": "+49 571 807-0",
	455	"homepage": "https://www.minden-luebbecke.de",
	456	"phone": "+49 571 807 0",
417	457	"email": "info@minden-luebbecke.de",
418	458	"postalAddress": "Kreis Minden-Lübbecke<br/>Portastraße 13<br/>32423 Minden",
419	459	"image": "KreisMindenLuebbeke_image.jpg",
420	460	"icon": "KreisMindenLuebbeke_icon.png",
421	461	"category": "citizen",
422		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
423		"subjectUrls": ["https://www.buergerserviceportal.nrw"]
	462	"subjectUrlInfo": "Using service from Bürgerservice-Portal Krz (https://www.buergerserviceportal.nrw)."
	463	},
	464	{
	465	"exclude": ["ios"],
	466	"shortName": {"" : "Bürgerservice-Portal Saarbrücken"},
	467	"longDescription": {"": "Im Rahmen des Bürgerservice-Portals haben Sie die Möglichkeit, Anträge zu erfassen und diese direkt an die Landeshauptstadt Saarbrücken zur weiteren Bearbeitung weiterzuleiten."},
	468	"address": "https://sl.buergerserviceportal.de/saarland/saarbruecken",
	469	"homepage": "https://sl.buergerserviceportal.de/saarland/saarbruecken",
	470	"phone": "+49 681 90 50",
	471	"email": "stadt@saarbruecken.de",
	472	"postalAddress": "Landeshauptstadt Saarbrücken<br/>Rathausplatz 1<br/>66111 Saarbrücken",
	473	"category": "citizen",
	474	"subjectUrls": ["https://sl.buergerserviceportal.de"]
	475	},
	476	{
	477	"exclude": ["ios"],
	478	"shortName": {"" : "Bürgerservice-Portal Stadt Lage"},
	479	"longName": {"" : "Bürgerservice-Portal Stadt Lage"},
	480	"shortDescription": {"": "Anträge online erfassen und an die Verwaltung weiterleiten."},
	481	"longDescription": {"": "Das Bürgerservice-Portal bietet die Möglichkeit, Anträge an die Verwaltung der Stadt Lage online zu erfassen und elektronisch zur weiteren Bearbeitung weiterzuleiten."},
	482	"address": "https://www.buergerserviceportal.nrw/krz/lage",
	483	"homepage": "https://www.lage.de",
	484	"phone": "+49 5232 601300",
	485	"email": "Buergerbuero@lage.de",
	486	"postalAddress": "Bürgerbüro Lage<br/>Bergstraße 21<br/>32791 Lage",
	487	"image": "StadtLage_image.jpg",
	488	"icon": "StadtLage_icon.png",
	489	"category": "citizen",
	490	"subjectUrlInfo": "Using service from Bürgerservice-Portal Krz (https://www.buergerserviceportal.nrw)."
	491	},
	492	{
	493	"exclude": ["ios"],
	494	"shortName": {"" : "Bürgerservice-Portal Stadt Norderstedt"},
	495	"longDescription": {"": "In Norderstedt können Sie mit der Online-Ausweisfunktion über das Bürgerservice-Portal folgende Bürgerdienste nutzen:<br/>- Meldebestätigung<br/>- Aufenthaltsbescheinigung<br/>- Übermittlungssperren<br/>- Umzug innerhalb der Stadt<br/>- Voranzeige einer Anmeldung<br/>- Briefwahlunterlagen<br/>- Führungszeugnis<br/>Darüber hinaus können Sie Ihr persönliches Bürgerkonto einrichten. Nach Einrichtung des Bürgerkontos werden die bei einer Nutzung des Bürgerservice-Portals notwendigen persönlichen Daten komfortabel aus Ihrem Bürgerkonto übernommen. Damit sparen Sie Zeit und erleichtern den Behörden die Bearbeitung Ihres Antrags."},
	496	"address": "https://norderstedt.de/digital",
	497	"homepage": "https://www.norderstedt.de",
	498	"phone": "+49 40 535 95 0 ",
	499	"email": "info@norderstedt.de",
	500	"postalAddress": "Stadt Norderstedt<br/>Rathausallee 50<br/>22846 Norderstedt",
	501	"category": "citizen",
	502	"subjectUrls": ["https://sh.buergerserviceportal.de"]
	503	},
	504	{
	505	"exclude": ["ios"],
	506	"shortName": {"" : "Bürgerservice-Portal Wiesbaden"},
	507	"longDescription": {"": "In Wiesbaden können Sie mit der Online-Ausweisfunktion über das Bürgerservice-Portal<br/>- Briefwahlunterlagen,<br/>- Meldebestätigungen,<br/>- Aufenthaltsbescheinigungen,<br/>- Übermittlungssperren,<br/>- Führungszeugnisse und<br/>- Auskünfte aus dem Gewerbezentralregister beantragen."},
	508	"address": "https://www.buergerserviceportal.de/hessen/wiesbaden",
	509	"homepage": "https://www.wiesbaden.de",
	510	"phone": "+49 611 31 8300",
	511	"email": "buergeramt@wiesbaden.de",
	512	"postalAddress": "Postfach 3920<br/>65029 Wiesbaden",
	513	"category": "citizen",
	514	"subjectUrls": ["https://he.buergerserviceportal.de"]
	515	},
	516	{
	517	"exclude": ["ios"],
	518	"shortName": {"" : "Bürgerservice-Portale der bayerischen Kommunen"},
	519	"longDescription": {"": "Das BayernPortal ist das zentrale Verwaltungsportal für den Freistaat Bayern und die bayerischen Kommunen.<br/>Es bietet Ihnen eine einheitliche Anlaufstelle sowie einen einheitlichen Zugang zu den staatlichen und kommunalen Verwaltungsdienstleistungen in Bayern. Sie erreichen darüber mehr als 150 Online-Dienstleistungen, mehr als 2.000 Fachdatenbanken, über 2.500 Formulare und Merkblätter sowie mehr als 20.000 Ansprechpartnerinnen und Ansprechpartner bei Behörden.<br/>Über das BayernPortal können Sie sich zudem ein Servicekonto einrichten, das BayernID genannt wird und mit dem Sie die Verwaltungsdienstleistungen aller angeschlossenen Kommunen und des Freistaats Bayern einfach und sicher nutzen können. Die Einrichtung Ihrer BayernID und die Anmeldung an diesem persönlichen Servicekonto können Sie auch mit der Online-Ausweisfunktion vornehmen.<br/>Ihre in Ihrem Servicekonto gespeicherten Daten werden automatisch in Ihre Anträge übernommen. Dadurch sparen Sie Zeit und erleichtern der Behörde die Bearbeitung Ihres Anliegens.<br/>In Verbindung mit dem Bayerischen E-Government Gesetz bietet Ihnen die BayernID die Möglichkeit, die in vielen Fällen erforderliche Schriftform zu ersetzen und damit Ihre Anträge ohne handschriftliche Unterschrift, d. h. vollständig online abzuwickeln. Sie müssen nicht mehr zur Behörde gehen oder Unterlagen per Post senden."},
	520	"address": "https://www.buergerserviceportal.de/bayern/classic",
	521	"homepage": "https://www.freistaat.bayern",
	522	"phone": "+49 89 12 22 20",
	523	"email": "direkt@bayern.de",
	524	"postalAddress": "Postfach 22 00 03<br/>80535 München",
	525	"category": "citizen",
	526	"subjectUrls": ["https://www.buergerserviceportal.de"]
	527	},
	528	{
	529	"exclude": ["ios"],
	530	"shortName": {"" : "d.velop – foxdox.de: Dokumente sicher ablegen"},
	531	"longDescription": {"": "Dokumente, Verträge, Reiseunterlagen, Bilder und vieles mehr können Sie einfach in Ihren persönlichen foxdox-Account hochladen. <br/>Sie melden sich mit der Online-Ausweisfunktion an und können von überall und jederzeit auf Ihre Dokumentenablage zugreifen, z. B. um sie innerhalb der Familie, Ihren Kollegen oder auch Ihrem Steuerberater zur Verfügung zu stellen. <br/>Quittungen und Belege können Sie einfach fotografieren oder scannen, hochladen und sicher in Ihrem foxdox-Account mit übersichtlichem Ordner-System speichern. Eine separate Ablage oder Kopien sind nicht mehr notwendig. Alle Daten liegen sicher und verschlüsselt in einem Rechenzentrum in Deutschland.<br/>Ein Standard-Account ist kostenfrei erhältlich."},
	532	"address": "https://mein.foxdox.de",
	533	"homepage": "https://www.d-velop.de/foxdox/foxdox-home",
	534	"phone": "+49 2542 9307 0",
	535	"email": "support@foxdox.de",
	536	"postalAddress": "d.velop business services GmbH<br/>Schildarpstraße 6-8<br/>48712 Gescher",
	537	"category": "other",
	538	"subjectUrls": ["https://mein.foxdox.de"]
	539	},
	540	{
	541	"shortName": {"" : "Deutsche Rentenversicherung"},
	542	"longDescription": {"": "Mit der Online-Ausweisfunktion im neuen Personalausweis können Sie ...<br/>- auf Informationen Ihres Rentenkontos im Kundenbereich ,eService' sicher zugreifen (z. B. Versicherungsverlauf und Beitragsrechnung),<br/>- Ihre Rentenauskunft online abrufen,<br/>- schnell und einfach Ihre persönlichen Daten ändern (z. B. Ihre Adresse und Bankverbindung)."},
	543	"address": "https://www.eservice-drv.de/OnlineDiensteWeb/init.do?npa=true",
	544	"homepage": "https://www.deutsche-rentenversicherung.de",
	545	"phone": "+49 800 100 048070",
	546	"email": "Online-Dienste@deutsche-rentenversicherung.de",
	547	"postalAddress": "Ruhrstraße 2<br/>10709 Berlin",
	548	"category": "citizen",
	549	"subjectUrls": ["https://www.eservice-drv.de"]
	550	},
	551	{
	552	"exclude": ["ios"],
	553	"shortName": {"" : "eAntrag der Investitionsbank Berlin (IBB)"},
	554	"longDescription": {"": "Im Kundenportal der Investitionsbank Berlin können Sie verschiedene Förder-Produkte durchgängig elektronisch beantragen:<br/>- Berlin Kapital<br/>- IBB Familienbaudarlehen<br/>- IBB Wohnraum modernisieren<br/>- KMU-Fonds über 25.000 Euro<br/>- Liquiditätshilfen BERLIN<br/>- Mikrokredit aus dem KMU-Fonds<br/>- Pro FIT (Projektvorschlagsphase)<br/>- Pro FIT (Frühphasenfinanzierung)<br/>Für die rechtsverbindliche, fristwahrende Antragstellung der Produkte<br/>- GRW<br/>- Innovationsassistent<br/>- PFI - Gemeinschaft<br/>- PFI - KMU<br/>- PFI - Netzwerk<br/>- ProFIT (Projektantragsphase)<br/>gilt aus verwaltungsrechtlichen Anforderungen das Schriftformerfordernis: Die elektronische Antragstellung ist zwingend nachträglich schriftlich zu bestätigen.<br/>Mit der Online-Ausweisfunktion können Sie sich bequem und sicher elektronisch legitimieren und müssen dadurch Ihre Identität weder per Postident-Verfahren noch persönlich vor Ort nachweisen.<br/>Nach Ihrer Legitimierung können Sie über eine persönliche Dokumentenablage die rechtsverbindliche Kommunikation mit Ihrem IBB-Ansprechpartner online – und unabhängig von Öffnungszeiten oder Postwegen – über das Kundenportal erledigen."},
	555	"address": "https://www.ibb.de/de/service/eantrag/eantrag.html",
	556	"homepage": "https://www.ibb.de",
	557	"phone": "+49 30 2125 0",
	558	"email": "info@ibb.de",
	559	"postalAddress": "Investitionsbank Berlin (IBB)<br/>Bundesallee 210<br/>10719 Berlin",
	560	"category": "finance",
	561	"subjectUrls": ["https://registrierung-eantrag.ibb.de"]
	562	},
	563	{
	564	"exclude": ["ios"],
	565	"shortName": {"" : "ekom21-KGRZ Hessen"},
	566	"address": "https://kfzonline.ekom21.de/kfzonline.public/start.html?oe=00.00.06.439000",
	567	"homepage": "https://kfzonline.ekom21.de/kfzonline.public/start.html?oe=00.00.06.439000",
	568	"email": "ekom21@ekom21.de",
	569	"postalAddress": "ekom21-KGRZ Hessen<br/>Carlo-Mierendorff-Straße 11<br/>35398 Gießen",
	570	"category": "citizen",
	571	"subjectUrls": ["https://kfzonline.ekom21.de"]
	572	},
	573	{
	574	"shortName": {"" : "ELSTER"},
	575	"longName": {"" : "ELSTER - Die elektronische Steuererklärung"},
	576	"shortDescription": {"": "Abwicklung der Steuererklärungen und -anmeldungen über das Internet."},
	577	"longDescription": {"": "ELSTER bietet im Rahmen der Registrierung, welche Voraussetzung für die Abwicklung der Steuererklärungen und Steueranmeldungen über das Internet ist, die Möglichkeit der Nutzung der Online-Ausweisfunktion."},
	578	"address": "https://www.elster.de",
	579	"homepage": "https://www.elster.de",
	580	"phone": "+49 89 9991 0",
	581	"email": "info@elster.de",
	582	"postalAddress": "Bayerisches Landesamt für Steuern - Dienststelle München<br/>80284 München",
	583	"image": "elster_image.png",
	584	"icon": "elster_icon.png",
	585	"category": "citizen",
	586	"subjectUrls": ["https://www.elster.de"]
	587	},
	588	{
	589	"exclude": ["ios"],
	590	"shortName": {"" : "Frankfurt am Main - KFZ online"},
	591	"address": "https://kfzonline.ekom21.de/kfzonline.public/start.html?oe=00.00.06.412000",
	592	"homepage": "https://frankfurt.de/leistungen/Fahrzeug-und-Verkehr-8957833",
	593	"phone": "+49 69 115",
	594	"email": "buergerberatung@stadt-frankfurt.de",
	595	"postalAddress": "Bürgerberatung<br/>Hinter dem Lämmchen 6<br/>60311 Frankfurt am Main ",
	596	"category": "citizen",
	597	"subjectUrlInfo": "Using service from ekom21-KGRZ Hessen (https://kfzonline.ekom21.de)."
	598	},
	599	{
	600	"exclude": ["ios"],
	601	"shortName": {"" : "Führungszeugnis und Auskunft aus dem Gewerbezentralregister"},
	602	"longDescription": {"": "Sie benötigen ein Führungszeugnis oder eine Auskunft aus dem Gewerbezentralregister? Mit dem Personalausweis im Scheckkartenformat können Sie einen Behördengang sparen. Weitere Voraussetzungen sind die freigeschaltete Online-Ausweisfunktion und ein passender Kartenleser für Ihren Computer. Auf diese Weise kann eindeutig identifiziert werden, wer den Antrag stellt. Ausländische Mitbürger, die keinen deutschen Personalausweis besitzen, können in gleicher Weise die entsprechende Funktion ihres elektronischen Aufenthaltstitels nutzen.<br/>Neben Führungszeugnissen können auch Auskünfte aus dem Gewerbezentralregister über das neue Online-Portal des BfJ beantragt werden. Solche Auskünfte benötigen Unternehmen, die sich in Ausschreibungsverfahren um öffentliche Aufträge bewerben, recht häufig. Auch hier kann das Online-Verfahren den Aufwand erheblich senken."},
	603	"address": "https://www.fuehrungszeugnis.bund.de",
	604	"homepage": "https://www.bundesjustizamt.de",
	605	"phone": "+49 228 99 410 40",
	606	"email": "poststelle@bfj.bund.de",
	607	"postalAddress": "Bundesamt für Justiz<br/>53094 Bonn",
	608	"category": "citizen",
	609	"subjectUrls": ["https://www.fuehrungszeugnis.bund.de"]
	610	},
	611	{
	612	"shortName": {"" : "Hamburg Service Online-Bürgerdienste"},
	613	"longName": {"" : "Hamburg Service Online-Bürgerdienste"},
	614	"shortDescription": {"": "Digitales Dienstleistungsangebot der Freien und Hansestadt Hamburg (FHH)"},
	615	"longDescription": {"": "Digitales Dienstleistungsangebot der Freien und Hansestadt Hamburg (FHH)"},
	616	"address": "https://servicekonto.serviceportal.hamburg.de/Servicekonto/Registration/SelectServicekontotype/ShowMenu",
	617	"homepage": "https://serviceportal.hamburg.de",
	618	"phone": "+49 40 42823 2420",
	619	"email": "dataporthamburggateway-service@dataport.de",
	620	"postalAddress": "Freie und Hansestadt Hamburg<br/>Erster Bürgermeister Dr. Peter Tschentscher Rathausmarkt 1<br/>20095 Hamburg",
	621	"category": "citizen",
	622	"subjectUrls": ["https://idp.servicekonto.serviceportal.hamburg.de"],
	623	"icon": "hamburg_serviceportal_icon.png"
	624	},
	625	{
	626	"shortName": {"" : "Identitätsprüfungen nach der eIDAS und dem Geldwäschegesetz"},
	627	"longDescription": {"": "Die identity Trust Management AG bietet Unternehmen die Möglichkeit, ihre Kunden schnell und sicher mit der Online-Ausweisfunktion zu identifizieren. <br/>Kunden der Kooperationspartner der identity Trust Management AG können die Identitätsprüfung nach dem Signaturgesetz und dem Geldwäschegesetz auch direkt über die Internetseite der identity Trust Management AG vornehmen."},
	628	"address": "https://www.identity.tm",
	629	"homepage": "https://www.identity.tm",
	630	"phone": "+49 211 68 77 3 0",
	631	"email": "kontakt@identity.tm",
	632	"postalAddress": "identity Trust Management AG<br/>Lierenfelder Straße 51<br/>40231 Düsseldorf",
	633	"category": "other",
	634	"subjectUrlInfo": "Generic service provider. Order number required to start authentication."
	635	},
	636	{
	637	"exclude": ["ios"],
	638	"shortName": {"" : "invenio"},
	639	"longName": {"" : "invenio - Rechercheanwendung für Archivgut des Bundesarchivs"},
	640	"shortDescription": {"" : "invenio ermöglicht die Recherche in den Beständen des Bundesarchivs. Über invenio können Sie außerdem digitalisierte Unterlagen ansehen und Archivgut zur Einsicht in den Lesesaal bestellen. Die eID-Funktion Ihres Personalausweises dient Ihrer eindeutigen Identifizierung außerhalb des Lesesaals, sodass Ihnen zusätzlich zu den frei verfügbaren Informationen zugangsbeschränkte Erschließungsinformationen über das Internet zur Verfügung gestellt werden können."},
	641	"longDescription": {"": "Ein Großteil der Erschließungsinformationen und Digitalisate in der Rechercheanwendung invenio ist frei im Internet zugänglich und unterliegt keinen Schutzfristen oder sonstigen Benutzungsbeschränkungen. Archivalien und deren Erschließungsinformationen, auf denen noch Benutzungsbeschränkungen liegen, können im Einzelfall auf Antrag zugänglich gemacht werden und im Lesesaal eingesehen werden. Wenn Sie nicht selbst vor Ort im Lesesaal recherchieren können, bietet Ihnen das Bundesarchiv mit der eID-Funktion die Möglichkeit, sich über das Internet auszuweisen und so Zugriff auf grundsätzlich noch unter Schutzfristen und anderen Benutzungsbeschränkungen liegenden Informationen zu erhalten. Nach der Verbindung Ihres Benutzerkontos mit der eID werden Ihnen vom Bundesarchiv die für Ihr Benutzungsthema erforderlichen Rechte auf Antrag freigeschaltet. Sofern Sie die entsprechenden Anträge bereits zu einem früheren Zeitpunkt gestellt haben, müssen Sie diese nicht erneut stellen. Sie können dann die Recherche in den benutzungsbeschränkten Beständen durchführen, die Ihnen bisher nur an den PCs im Benutzersaal des Bundesarchivs möglich war. Die Entscheidung über Schutzfristverkürzungen und das Freischalten von Rechten für invenio liegt bei den archivischen Fachreferaten des Bundesarchivs."},
	642	"image": "invenio_image.png",
	643	"icon": "invenio_icon.png",
	644	"address": "https://invenio.bundesarchiv.de/invenio",
	645	"homepage": "https://www.bundesarchiv.de",
	646	"phone": "+49 261 505 777",
	647	"email": "invenio@bundesarchiv.de",
	648	"postalAddress": "Bundesarchiv<br/>Potsdamer Straße 1<br/>56075 Koblenz",
	649	"category": "citizen",
	650	"subjectUrls": ["https://invenio.bundesarchiv.de"]
	651	},
	652	{
	653	"shortName": {"" : "Kreis Borken"},
	654	"longName": {"" : "Kreis Borken - Kfz-Abmeldung Internet"},
	655	"shortDescription": {"": "Authentisierung für internetbasierte Kfz-Dienste."},
	656	"longDescription": {"": "Für die internetbasierten Kfz-Dienste wird die eID-Funktionalität des neuen Personalausweises benötigt."},
	657	"address": "https://formulare-extern.de/metaform/Form-Solutions/sid/assistant/5b83c44dc2dcdb75a7b07fea",
	658	"homepage": "https://www.kreis-borken.de",
	659	"phone": "+49 2861 681 1310",
	660	"email": "zulassungsstelle@kreis-borken.de",
	661	"postalAddress": "Kfz-Zulassungsstelle Borken<br/>Burloer Str. 93<br/>46325 Borken",
	662	"image": "KreisBorken_image.png",
	663	"icon": "KreisBorken_icon.svg",
	664	"category": "citizen",
	665	"subjectUrlInfo": "Using service from Servicekonto Nordrhein-Westfalen (https://servicekonto.nrw)."
	666	},
	667	{
	668	"shortName": {"" : "Kreis Lippe Portal"},
	669	"longName": {"" :"Kreis Lippe Portal"},
	670	"longDescription": {"": "Mit der Online-Ausweisfunktion können Sie sich am Bürgerportal des Kreises Lippe registrieren, anmelden und den Online-Service 'Elternbeiträge' nutzen. Als Eltern können Sie nach der einmaligen Registrierung<br/><br/> - Ihre Selbsteinschätzung für den Elternbeitrag online einreichen,<br/> - den Bearbeitungsstand nachverfolgen,<br/> - Bescheide elektronisch im Dokumentenbereich empfangen."},
	671	"address": "https://portal.kreis-lippe.de",
	672	"homepage": "https://portal.kreis-lippe.de",
	673	"phone": "+49 5231 62 0",
	674	"postalAddress": "Kreis Lippe<br/>Felix-Fechenbach-Str. 5<br/>32756 Detmold",
	675	"category": "citizen",
	676	"subjectUrls": ["https://egov-services.krz.de"]
	677	},
	678	{
	679	"shortName": {"" : "Kfz-Online Berlin"},
	680	"longName": {"": "Landesamt für Bürger- und Ordnungsangelegenheiten"},
	681	"shortDescription": {"": "Das Portal \"Kfz-Online Berlin\" bündelt alle Vorgänge rund um Kfz, die sich im Land Berlin online erledigen lassen."},
	682	"address": "https://kfz-portal.berlin.de",
	683	"homepage": "https://www.berlin.de/labo",
	684	"phone": "+49 30 90269 0",
	685	"email": "kundenservice@berlin.de",
	686	"postalAddress": "BerlinOnline Stadtportal GmbH & Co. KG<br/>Alte Jakobstraße 105<br/>10969 Berlin",
	687	"category": "citizen",
	688	"subjectUrlInfo": "Using service from Service-Portal Berlin (https://eid-prod.connect.verwalt-berlin.de)."
	689	},
	690	{
	691	"shortName": {"" : "Landkreis Harburg"},
	692	"longDescription": {"": "In diesem Portal haben Sie die Möglichkeit, Dienstleistungen Ihrer Zulassungsbehörde online zu beantragen und abzuwickeln. Kernbestandteil des Portals ist die internetbasierte Fahrzeugzulassung (i-Kfz)."},
	693	"address": "https://stva.landkreis-harburg.de",
	694	"homepage": "https://stva.landkreis-harburg.de",
	695	"phone": "+49 4171 693 99 10 0",
	696	"email": "buergerservice@lkharburg.de",
	697	"postalAddress": "Landkreis Harburg<br/>Schloßplatz 6<br/>21423 Winsen (Luhe)",
	698	"category": "citizen",
	699	"subjectUrls": ["https://npa.regioit.de"]
	700	},
	701	{
	702	"exclude": ["ios"],
	703	"shortName": {"" : "Landkreis Hildburghausen"},
	704	"longDescription": {"": "Mit diesem Service können Sie online auf der Grundlage der Fahrzeugzulassungsverordnung (FZV) Ihr Fahrzeug außer Betrieb setzen und wieder in Betrieb nehmen."},
	705	"address": "https://www.landkreis-hildburghausen.de/Schnellnavigation/KFZ-Onlinedienste",
	706	"homepage": "https://www.landkreis-hildburghausen.de/Schnellnavigation/KFZ-Onlinedienste",
	707	"phone": "+49 3685 445 286",
	708	"email": "poststelle@lrahbn.thueringen.de",
	709	"postalAddress": "Landkreis Hildburghausen<br/>SG Zulassungsbehörde<br/>Wiesenstraße 18<br/>98646 Hildburghausen",
	710	"category": "citizen",
	711	"subjectUrls": ["https://thavelp.thueringen.de"]
	712	},
	713	{
	714	"shortName": {"" : "Landkreis Jerichower Land"},
	715	"longDescription": {"": "Nutzen Sie die Online-Angebote des Straßenverkehrsamtes Jerichower Land und sparen Sie Zeit. Wir bieten Ihnen die Möglichkeit der Online-Terminvergabe für die Kfz-Zulassungsstelle, Online-Abmeldung und Wiederzulassung von Kraftfahrzeugen, Wunschkennzeichenreservierung, Bankbriefauskunft und Führerscheinauskunft."},
	716	"address": "https://www.lkjl.de/de/strassenverkehrsamt.html",
	717	"homepage": "https://www.lkjl.de/de/strassenverkehrsamt.html",
	718	"phone": "+49 3921 949 0",
	719	"email": "post@lkjl.de",
	720	"postalAddress": "Landkreis Jerichower Land<br/>Bahnhofstraße 9<br/>39288 Burg",
	721	"category": "citizen",
	722	"subjectUrlInfo": "Using service from Serviceportal Sachsen-Anhalt (https://st.buergerserviceportal.de)."
	723	},
	724	{
	725	"exclude": ["ios"],
	726	"shortName": {"" : "Landkreis Mansfeld-Südharz"},
	727	"longDescription": {"": "Im elektronischen Straßenverkehrsamt haben Sie die Möglichkeit, die Abmeldung und die Wiederzulassung Ihres Fahrzeuges online zu realisieren. Darüber hinaus können Sie im elektronischen Straßenverkehrsamt auch ein Bürgerkonto einrichten, welches zukünftig für weitere Dienstleistungen der Kreisverwaltung nutzbar sein wird."},
	728	"address": "https://st.buergerserviceportal.de/sachsenanhalt/lkrmansfeldsuedharz",
	729	"homepage": "https://st.buergerserviceportal.de/sachsenanhalt/lkrmansfeldsuedharz",
	730	"email": "landkreis@lkmsh.de",
	731	"postalAddress": "Landkreis Mansfeld-Südharz<br/>Rudolf-Breitscheid-Str. 20/22<br/>06526 Sangerhausen",
	732	"category": "citizen",
	733	"subjectUrlInfo": "Using service from Serviceportal Sachsen-Anhalt (https://st.buergerserviceportal.de)."
	734	},
	735	{
	736	"shortName": {"" : "Landkreis Merzig-Wadern"},
	737	"longDescription": {"": "In diesem Portal haben Sie die Möglichkeit, Dienstleistungen Ihrer Zulassungsbehörde online zu beantragen und abzuwickeln. Kernbestandteil des Portals ist die internetbasierte Fahrzeugzulassung (i-Kfz)."},
	738	"address": "https://buergerportal.merzig-wadern.de/kfz",
	739	"homepage": "https://buergerportal.merzig-wadern.de",
	740	"phone": "+49 6861 80 101",
	741	"email": "info@merzig-wadern.de",
	742	"postalAddress": "Landkreis Merzig-Wadern<br/>Bahnhofstraße 44<br/>66663 Merzig",
	743	"category": "citizen",
	744	"subjectUrls": ["https://ident.saarland.de"]
	745	},
	746	{
	747	"exclude": ["ios"],
	748	"shortName": {"" : "Landkreis Rostock"},
	749	"longDescription": {"": "Mit den Online-Services können Sie die Leistungen der Verwaltung zeit- und ortsunabhängig nutzen, z. B. ganz bequem von zu Haus aus. Probieren Sie es einfach mal aus!"},
	750	"address": "https://mv.buergerserviceportal.de/mecklenburgvorpommern/lkrrostock/bsp_ikfz_antragstellung",
	751	"homepage": "https://www.landkreis-rostock.de/landkreis/online-dienste2.html",
	752	"phone": "+49 3843 755 0",
	753	"email": "info@lkros.de",
	754	"postalAddress": "Landkreis Rostock<br/>Der Landrat<br/>Am Wall 3-5<br/>18273 Güstrow",
	755	"category": "citizen",
	756	"subjectUrls": ["https://mv.buergerserviceportal.de"]
	757	},
	758	{
	759	"shortName": {"" : "Login Meine VBL"},
	760	"longDescription": {"": "Bei der VBL können Sie sich mit dem Personalausweis am Kundenportal ,Meine VBL' anmelden. Im Kundenkonto können Sie Ihre Vertragsdaten und Ihre persönlichen Daten einsehen und weitere Online-Dienste nutzen, z. B.<br/>- Rentenantrag stellen,<br/>- Beitragserstattung beantragen,<br/>- Kontaktdaten ändern,<br/>- persönliche Mitteilungen von der VBL erhalten."},
	761	"address": "https://www.vbl.de/de/meine_vbl",
	762	"homepage": "https://www.vbl.de",
	763	"phone": "+49 721 93 98 93 1",
	764	"email": "info@vbl.de",
	765	"postalAddress": "VBL. Kundenservice<br/>76240 Karlsruhe",
	766	"category": "other",
	767	"subjectUrls": ["https://www.vbl.de"]
	768	},
	769	{
	770	"shortName": {"" : "LVM Versicherung - Kundenportal Meine LVM"},
	771	"longDescription": {"": "Mit der Online-Ausweisfunktion im Personalausweis können Sie sich nach der Registrierung durch Ihre LVM-Agentur sicher am Kundenportal ,Meine LVM' anmelden. Ihre Versicherung können Sie nun selbst verwalten und beispielsweise sämtliche Vertragsdaten online einsehen. Darüber hinaus ist es möglich über das Portal Versicherungsbescheinigungen anzufordern sowie schnell und einfach Ihre persönlichen Daten wie Adresse oder Bankverbindung zu ändern."},
	772	"address": "https://www.lvm.de/personalausweis",
	773	"homepage": "https://www.lvm.de",
	774	"phone": "+49 251 702 0",
	775	"email": "info@lvm.de",
	776	"postalAddress": "LVM Versicherung<br/>48126 Münster",
	777	"category": "insurance",
	778	"subjectUrls": ["https://www.lvm.de"]
	779	},
	780	{
	781	"shortName": {"" : "DATEV Arbeitnehmer online"},
	782	"longName": {"": "Meine Abrechnungen"},
	783	"shortDescription": {"": "Arbeitnehmer online ist ein Angebot Ihres Arbeitgebers, um mit Ihnen digital zusammenzuarbeiten. Im Portal stellt er Ihnen persönliche Daten bereit, wie zum Beispiel Ihre Lohn- und Gehaltsdokumente."},
	784	"longDescription": {"": "Arbeitnehmer online ist ein Angebot Ihres Arbeitgebers, um mit Ihnen digital zusammenzuarbeiten. Im Portal stellt er Ihnen persönliche Daten bereit, wie zum Beispiel Ihre Lohn- und Gehaltsdokumente. <br/> Ihr Arbeitgeber schaltet Sie für die Nutzung von Arbeitnehmer online frei. Daraufhin erhalten Sie persönliche Briefe, mit denen Sie sich registrieren können. Im Anschluss können Sie jederzeit Ihre Brutto/Netto-Abrechnungen, Sozialversicherungsnachweise und Lohnsteuerbescheinigungen online abrufen. Sie haben dadurch jederzeit und überall einen schnellen Überblick über Ihre gesamten Lohn- und Gehaltsdokumente."},
	785	"address": "https://www.datev.de/ano",
	786	"homepage": "https://www.datev.de",
	787	"phone": "+49 800 6648383",
	788	"email": "info@datev.de",
	789	"postalAddress": "Datev eG <br/>Paumgartnerstr. 6 - 14 <br/>90429 Nürnberg",
	790	"image": "datev_image.jpg",
	791	"icon": "datev_icon.png",
	792	"category": "other",
	793	"subjectUrls": ["https://secure6.datev.de"]
	794	},
	795	{
	796	"exclude": ["ios"],
	797	"shortName": {"" : "Mentana-Claimsoft AG - Registrierung beim De-Mail Dienst"},
	798	"address": "https://www.fp-demail.de",
	799	"homepage": "https://www.fp-demail.de",
	800	"phone": "+49 800 6368262",
	801	"email": "de-mail.info@mentana.de",
	802	"postalAddress": "Mentana-Claimsoft GmbH<br/>Trebuser-Str. 47 Haus 1<br/>D-15517 Fürstenwalde",
	803	"category": "other",
	804	"subjectUrls": ["https://www.fp-demail.de"]
	805	},
	806	{
	807	"shortName": {"" : "Siegburg Online"},
	808	"longName": {"" : "Online-Bürgerdienste der Kreisstadt Siegburg"},
	809	"shortDescription": {"": "Alle Online-Services der Kreisstadt Siegburg"},
	810	"longDescription": {"": "Die Kreisstadt Siegburg bietet auf ihrer Homepage viele Online-Services an, die Sie mit der Online-Ausweisfunktion nutzen können. Hierzu zählen unter anderem:<br/>- An-, Um- und Abmeldung des Wohnsitzes<br/>- Urkundenservice des Standesamts<br/>- Hundeservice (Online An- & Abmeldung, Hundemarke etc.)<br/>- Bewohnerparkausweis beantragen & verlängern<br/>- Meldebescheinigung & Melderegisterauskunft<br/>- Übermittlungssperre<br/>- Statusabfrage Personalausweis /Reisepass<br/>- Beantragung Siegburg Pass & Siegburg Gutschein"},
	811	"address": "https://eservice.siegburg.de",
	812	"homepage": "https://www.siegburg.de",
	813	"phone": "+49 2241 102 0",
	814	"email": "rathaus@siegburg.de",
	815	"postalAddress": "Kreisstadt Siegburg<br/>Nogenter Platz 10<br/>53721 Siegburg",
	816	"image": "Siegburg_image.png",
	817	"icon": "Siegburg_icon.png",
	818	"category": "citizen",
	819	"subjectUrlInfo": "Using service from Servicekonto Nordrhein-Westfalen (https://servicekonto.nrw)."
424	820	},
425	821	{
426	822	"shortName": {"" : "Service-Portal Kreis Soest"},

429	825	"longDescription": {"": "In unserem Service-Portal können Sie Anträge an die Kreisverwaltung Soest online erfassen und direkt zur weiteren Bearbeitung an die zuständigen Stellen übermitteln."},
430	826	"address": "https://serviceportal.kreis-soest.de",
431	827	"homepage": "https://www.kreis-soest.de/start",
432		"phone": "+49 2921 30-0",
	828	"phone": "+49 2921 30 0",
433	829	"email": "service-portal@kreis-soest.de",
434	830	"postalAddress": "Kreisverwaltung Soest<br/>Hoher Weg 1-3<br/>59494 Soest",
435	831	"image": "KreisSoest_image.png",
436	832	"icon": "KreisSoest_icon.png",
437	833	"category": "citizen",
438		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
439		"subjectUrls": []
440		},
441		{
442		"exclude": ["ios"],
443		"shortName": {"" : "Bürgerservice-Portal Stadt Lage"},
444		"longName": {"" : "Bürgerservice-Portal Stadt Lage"},
445		"shortDescription": {"": "Anträge online erfassen und an die Verwaltung weiterleiten."},
446		"longDescription": {"": "Das Bürgerservice-Portal bietet die Möglichkeit, Anträge an die Verwaltung der Stadt Lage online zu erfassen und elektronisch zur weiteren Bearbeitung weiterzuleiten."},
447		"address": "https://www.buergerserviceportal.nrw/krz/lage",
448		"homepage": "https://www.lage.de/",
449		"phone": "+49 5232/601300",
450		"email": "Buergerbuero@lage.de",
451		"postalAddress": "Bürgerbüro Lage<br/>Bergstraße 21<br/>32791 Lage",
452		"image": "StadtLage_image.jpg",
453		"icon": "StadtLage_icon.png",
454		"category": "citizen",
455		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
456		"subjectUrls": ["https://www.buergerserviceportal.nrw"]
457		},
458		{
459		"exclude": ["ios"],
460		"shortName": {"" : "Bürgerservice-Portal Stadt Norderstedt"},
461		"longDescription": {"": "In Norderstedt können Sie mit der Online-Ausweisfunktion über das Bürgerservice-Portal folgende Bürgerdienste nutzen:<br/>- Meldebestätigung<br/>- Aufenthaltsbescheinigung<br/>- Übermittlungssperren<br/>- Umzug innerhalb der Stadt<br/>- Voranzeige einer Anmeldung<br/>- Briefwahlunterlagen<br/>- Führungszeugnis<br/>Darüber hinaus können Sie Ihr persönliches Bürgerkonto einrichten. Nach Einrichtung des Bürgerkontos werden die bei einer Nutzung des Bürgerservice-Portals notwendigen persönlichen Daten komfortabel aus Ihrem Bürgerkonto übernommen. Damit sparen Sie Zeit und erleichtern den Behörden die Bearbeitung Ihres Antrags."},
462		"address": "https://norderstedt.de/digital",
463		"homepage": "https://www.norderstedt.de/",
464		"phone": "+49 40 - 535 95-0 ",
465		"email": "info@norderstedt.de",
466		"postalAddress": "Stadt Norderstedt<br/>Rathausallee 50<br/>22846 Norderstedt",
467		"category": "citizen",
468		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
469		"subjectUrls": ["https://sh.buergerserviceportal.de"]
470		},
471		{
472		"exclude": ["ios"],
473		"shortName": {"" : "Bürgerservice-Portal Wiesbaden"},
474		"longDescription": {"": "In Wiesbaden können Sie mit der Online-Ausweisfunktion über das Bürgerservice-Portal<br/>- Briefwahlunterlagen,<br/>- Meldebestätigungen,<br/>- Aufenthaltsbescheinigungen,<br/>- Übermittlungssperren,<br/>- Führungszeugnisse und<br/>- Auskünfte aus dem Gewerbezentralregister beantragen."},
475		"address": "https://www.buergerserviceportal.de/hessen/wiesbaden",
476		"homepage": "https://www.wiesbaden.de/",
477		"phone": "+49 611 / 31 - 8300",
478		"email": "buergeramt@wiesbaden.de",
479		"postalAddress": "Postfach 3920<br/>65029 Wiesbaden",
480		"category": "citizen",
481		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
482		"subjectUrls": ["https://www.buergerserviceportal.de"]
483		},
484		{
485		"exclude": ["ios"],
486		"shortName": {"" : "Bürgerservice-Portale der bayerischen Kommunen"},
487		"longDescription": {"": "Das BayernPortal ist das zentrale Verwaltungsportal für den Freistaat Bayern und die bayerischen Kommunen.<br/>Es bietet Ihnen eine einheitliche Anlaufstelle sowie einen einheitlichen Zugang zu den staatlichen und kommunalen Verwaltungsdienstleistungen in Bayern. Sie erreichen darüber mehr als 150 Online-Dienstleistungen, mehr als 2.000 Fachdatenbanken, über 2.500 Formulare und Merkblätter sowie mehr als 20.000 Ansprechpartnerinnen und Ansprechpartner bei Behörden.<br/>Über das BayernPortal können Sie sich zudem ein Servicekonto einrichten, das BayernID genannt wird und mit dem Sie die Verwaltungsdienstleistungen aller angeschlossenen Kommunen und des Freistaats Bayern einfach und sicher nutzen können. Die Einrichtung Ihrer BayernID und die Anmeldung an diesem persönlichen Servicekonto können Sie auch mit der Online-Ausweisfunktion vornehmen.<br/>Ihre in Ihrem Servicekonto gespeicherten Daten werden automatisch in Ihre Anträge übernommen. Dadurch sparen Sie Zeit und erleichtern der Behörde die Bearbeitung Ihres Anliegens.<br/>In Verbindung mit dem Bayerischen E-Government Gesetz bietet Ihnen die BayernID die Möglichkeit, die in vielen Fällen erforderliche Schriftform zu ersetzen und damit Ihre Anträge ohne handschriftliche Unterschrift, d. h. vollständig online abzuwickeln. Sie müssen nicht mehr zur Behörde gehen oder Unterlagen per Post senden."},
488		"address": "https://www.buergerserviceportal.de/bayern/classic/",
489		"homepage": "https://www.freistaat.bayern/",
490		"phone": "+49 (0)89 12 22 20",
491		"email": "direkt@bayern.de",
492		"postalAddress": "Postfach 22 00 03<br/>80535 München",
493		"category": "citizen",
494		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
495		"subjectUrls": ["https://www.buergerserviceportal.de"]
496		},
497		{
498		"exclude": ["ios"],
499		"shortName": {"" : "d.velop – foxdox.de: Dokumente sicher ablegen"},
500		"longDescription": {"": "Dokumente, Verträge, Reiseunterlagen, Bilder und vieles mehr können Sie einfach in Ihren persönlichen foxdox-Account hochladen. <br/>Sie melden sich mit der Online-Ausweisfunktion an und können von überall und jederzeit auf Ihre Dokumentenablage zugreifen, z. B. um sie innerhalb der Familie, Ihren Kollegen oder auch Ihrem Steuerberater zur Verfügung zu stellen. <br/>Quittungen und Belege können Sie einfach fotografieren oder scannen, hochladen und sicher in Ihrem foxdox-Account mit übersichtlichem Ordner-System speichern. Eine separate Ablage oder Kopien sind nicht mehr notwendig. Alle Daten liegen sicher und verschlüsselt in einem Rechenzentrum in Deutschland.<br/>Ein Standard-Account ist kostenfrei erhältlich."},
501		"address": "https://mein.foxdox.de/",
502		"homepage": "https://www.d-velop.de/foxdox/foxdox-home",
503		"phone": "+49 (0) 2542 9307-0",
504		"email": "support@foxdox.de",
505		"postalAddress": "d.velop business services GmbH<br/>Schildarpstraße 6-8<br/>48712 Gescher",
506		"category": "other",
507		"tcTokenUrl" : "https://mein.foxdox.de/npa_login?action=gettctoken&next=/documents",
508		"subjectUrls": ["https://mein.foxdox.de"]
509		},
510		{
511		"shortName": {"" : "Datev - Arbeitnehmer online / Lohn- und Gehaltsabrechnung"},
512		"longDescription": {"": "Nach einmaliger Freischaltung durch den Arbeitgeber erhalten Sie Ihren persönlichen Aktivierungscode per Post. Mit dem Aktivierungscode registrieren Sie sich an dem Portal \"DATEV Arbeitnehmer online\", dazu können Sie u.a. die Online-Ausweisfunktion nutzen. Danach können Sie jederzeit Ihre Brutto/Netto-Abrechnungen, Sozialversicherungsnachweise und Lohnsteuerbescheinigungen online abrufen. Sie haben dadurch jederzeit und überall einen schnellen Überblick über Ihre gesamten Lohn- und Gehaltsdokumente. "},
513		"address": "https://www.datev.de/ano/",
514		"homepage": "https://www.datev.de",
515		"phone": "+49 800 3283825",
516		"email": "info@datev.de",
517		"postalAddress": "DATEV eG<br/>90329 Nürnberg",
518		"category": "other",
519		"tcTokenUrlInfo" : "Address is faulty",
520		"subjectUrls": ["https://secure6.datev.de"]
521		},
522		{
523		"shortName": {"" : "Deutsche Rentenversicherung"},
524		"longDescription": {"": "Mit der Online-Ausweisfunktion im neuen Personalausweis können Sie ...<br/>- auf Informationen Ihres Rentenkontos im Kundenbereich ,eService' sicher zugreifen (z. B. Versicherungsverlauf und Beitragsrechnung),<br/>- Ihre Rentenauskunft online abrufen,<br/>- schnell und einfach Ihre persönlichen Daten ändern (z. B. Ihre Adresse und Bankverbindung)."},
525		"address": "https://www.eservice-drv.de/OnlineDiensteWeb/init.do?npa=true",
526		"homepage": "https://www.deutsche-rentenversicherung.de/",
527		"phone": "+49 800 100 048070",
528		"email": "Online-Dienste@deutsche-rentenversicherung.de",
529		"postalAddress": "Ruhrstraße 2<br/>10709 Berlin",
530		"category": "citizen",
531		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
532		"subjectUrls": ["https://www.eservice-drv.de"]
533		},
534		{
535		"exclude": ["ios"],
536		"shortName": {"" : "eAntrag der Investitionsbank Berlin (IBB)"},
537		"longDescription": {"": "Im Kundenportal der Investitionsbank Berlin können Sie verschiedene Förder-Produkte durchgängig elektronisch beantragen:<br/>- Berlin Kapital<br/>- IBB Familienbaudarlehen<br/>- IBB Wohnraum modernisieren<br/>- KMU-Fonds über 25.000 Euro<br/>- Liquiditätshilfen BERLIN<br/>- Mikrokredit aus dem KMU-Fonds<br/>- Pro FIT (Projektvorschlagsphase)<br/>- Pro FIT (Frühphasenfinanzierung)<br/>Für die rechtsverbindliche, fristwahrende Antragstellung der Produkte<br/>- GRW<br/>- Innovationsassistent<br/>- PFI - Gemeinschaft<br/>- PFI - KMU<br/>- PFI - Netzwerk<br/>- ProFIT (Projektantragsphase)<br/>gilt aus verwaltungsrechtlichen Anforderungen das Schriftformerfordernis: Die elektronische Antragstellung ist zwingend nachträglich schriftlich zu bestätigen.<br/>Mit der Online-Ausweisfunktion können Sie sich bequem und sicher elektronisch legitimieren und müssen dadurch Ihre Identität weder per Postident-Verfahren noch persönlich vor Ort nachweisen.<br/>Nach Ihrer Legitimierung können Sie über eine persönliche Dokumentenablage die rechtsverbindliche Kommunikation mit Ihrem IBB-Ansprechpartner online – und unabhängig von Öffnungszeiten oder Postwegen – über das Kundenportal erledigen."},
538		"address": "https://www.ibb.de/de/service/eantrag/eantrag.html",
539		"homepage": "https://www.ibb.de/",
540		"phone": "+49 30 / 2125 - 0",
541		"email": "info@ibb.de",
542		"postalAddress": "Investitionsbank Berlin (IBB)<br/>Bundesallee 210<br/>10719 Berlin",
543		"category": "finance",
544		"tcTokenUrlInfo" : "Registration required.",
545		"subjectUrls": []
546		},
547		{
548		"exclude": ["ios"],
549		"shortName": {"" : "easy Login - Der Zugang für Finanz- & Versicherungsvermittler"},
550		"address": "https://www.easy-login.de",
551		"homepage": "https://www.easy-login.de",
552		"phone": "+49 921 75758-555",
553		"email": "info@easy-login.de",
554		"postalAddress": "easy Login GmbH<br/>Bindlacher Str. 4<br/>95448 Bayreuth",
555		"category": "insurance",
556		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
557		"subjectUrls": ["https://easy-login.vdg-portal.de"]
558		},
559		{
560		"shortName": {"" : "ELSTER"},
561		"longName": {"" : "ELSTER - Die elektronische Steuererklärung"},
562		"shortDescription": {"": "Abwicklung der Steuererklärungen und -anmeldungen über das Internet."},
563		"longDescription": {"": "ELSTER bietet im Rahmen der Registrierung, welche Voraussetzung für die Abwicklung der Steuererklärungen und Steueranmeldungen über das Internet ist, die Möglichkeit der Nutzung der Online-Ausweisfunktion."},
564		"address": "https://www.elster.de",
565		"homepage": "https://www.elster.de",
566		"phone": "+49 89 9991 - 0",
567		"email": "info@elster.de",
568		"postalAddress": "Bayerisches Landesamt für Steuern - Dienststelle München<br/>80284 München",
569		"image": "elster_image.png",
570		"icon": "elster_icon.png",
571		"category": "citizen",
572		"tcTokenUrlInfo" : "Registration required.",
573		"subjectUrls": []
574		},
575		{
576		"shortName": {"" : "Feinstaubplakette beantragen"},
577		"longDescription": {"": "In Berlin können Sie eine Feinstaubplakette für alle Kraftfahrzeuge mit der Online-Ausweisfunktion beantragen. Der Antrag ist unabhängig davon, ob Ihr Fahrzeug in Berlin, bei einer anderen deutschen Zulassungsbehörde, oder im Ausland zugelassen ist.<br/>Ihre persönlichen Daten werden verschlüsselt übertragen. Sie müssen Ihre Angaben nicht per Hand eingeben und die Behörde erhält zuverlässig korrekte Informationen, die rasch weiterverarbeitet werden können.<br/>Auf der Internet-Seite Umweltzonen und Feinstaubplaketten der Senatsverwaltung für Stadtentwicklung und Umwelt können Sie sich vorab informieren, welche Plakette Ihrem Fahrzeug zugeteilt werden kann."},
578		"address": "https://www.berlin.de/labo/fahrzeuge/kfz-zulassung/feinstaubplakette/shop.85047.php",
579		"homepage": "https://www.berlin.de",
580		"phone": "+49 30 90269 – 0",
581		"email": "",
582		"postalAddress": "Direktorin Landesamt für Bürger- und Ordnungsangelegenheiten<br/>Friedrichstr. 219<br/>10958 Berlin",
583		"category": "citizen",
584		"tcTokenUrlInfo" : "Car lizence number required",
585		"subjectUrls": []
586		},
587		{
588		"exclude": ["ios"],
589		"shortName": {"" : "Führungszeugnis und Auskunft aus dem Gewerbezentralregister"},
590		"longDescription": {"": "Sie benötigen ein Führungszeugnis oder eine Auskunft aus dem Gewerbezentralregister? Mit dem Personalausweis im Scheckkartenformat können Sie einen Behördengang sparen. Weitere Voraussetzungen sind die freigeschaltete Online-Ausweisfunktion und ein passender Kartenleser für Ihren Computer. Auf diese Weise kann eindeutig identifiziert werden, wer den Antrag stellt. Ausländische Mitbürger, die keinen deutschen Personalausweis besitzen, können in gleicher Weise die entsprechende Funktion ihres elektronischen Aufenthaltstitels nutzen.<br/>Neben Führungszeugnissen können auch Auskünfte aus dem Gewerbezentralregister über das neue Online-Portal des BfJ beantragt werden. Solche Auskünfte benötigen Unternehmen, die sich in Ausschreibungsverfahren um öffentliche Aufträge bewerben, recht häufig. Auch hier kann das Online-Verfahren den Aufwand erheblich senken."},
591		"address": "https://www.fuehrungszeugnis.bund.de/",
592		"homepage": "https://www.bundesjustizamt.de",
593		"phone": "+49 228 99 410-40",
594		"email": "poststelle@bfj.bund.de",
595		"postalAddress": "Bundesamt für Justiz<br/>53094 Bonn",
596		"category": "citizen",
597		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
598		"subjectUrls": ["https://www.fuehrungszeugnis.bund.de/ffw"]
599		},
600		{
601		"shortName": {"" : "Halterauskunft zu einem KFZ beantragen"},
602		"longDescription": {"": "In Berlin können Sie für Fahrzeuge, die bei der Zulassungsbehörde Berlin registriert sind, mit der Online-Ausweisfunktion eine Halterauskunft beantragen.<br/>Ihre persönlichen Daten werden verschlüsselt übertragen. Sie müssen Ihre Angaben nicht per Hand eingeben und die Behörde erhält zuverlässig korrekte Informationen, die rasch weiterverarbeitet werden können.<br/>Bitte beachten Sie, dass eine Halterauskunft nur erteilt werden kann, wenn diese der Geltendmachung oder Abwehr von Rechtsansprüchen dient, die sich aus der Teilnahme am Straßenverkehr ergeben, oder wenn sie zur Erhebung einer Privatklage aufgrund im Straßenverkehr begangener Verstöße benötigt wird."},
603		"address": "https://www.berlin.de/labo/mobilitaet/kfz-zulassung/halterauskunft/shop.86598.php",
604		"homepage": "https://www.berlin.de",
605		"phone": "+49 30 90269 – 0",
606		"email": "",
607		"postalAddress": "Direktorin Landesamt für Bürger- und Ordnungsangelegenheiten<br/>Friedrichstr. 219<br/>10958 Berlin",
608		"category": "citizen",
609		"tcTokenUrlInfo" : "Car lizence number required.",
610		"subjectUrls": []
611		},
612		{
613		"shortName": {"" : "Hamburg Service Online-Bürgerdienste"},
614		"longName": {"" : "Hamburg Service Online-Bürgerdienste"},
615		"shortDescription": {"": "Digitales Dienstleistungsangebot der Freien und Hansestadt Hamburg (FHH)"},
616		"longDescription": {"": "Digitales Dienstleistungsangebot der Freien und Hansestadt Hamburg (FHH)"},
617		"address": "https://servicekonto.serviceportal.hamburg.de/Servicekonto/Registration/SelectServicekontotype/ShowMenu/",
618		"homepage": "https://serviceportal.hamburg.de",
619		"phone": "+49 40 42823-2420",
620		"email": "dataporthamburggateway-service@dataport.de",
621		"postalAddress": "Freie und Hansestadt Hamburg<br/>Erster Bürgermeister Dr. Peter Tschentscher Rathausmarkt 1<br/>20095 Hamburg",
622		"category": "citizen",
623		"tcTokenUrl": "https://idp.servicekonto.serviceportal.hamburg.de",
624		"subjectUrls": ["https://idp.servicekonto.serviceportal.hamburg.de"],
625		"icon": "hamburg_serviceportal_icon.png"
626		},
627		{
628		"shortName": {"" : "Identitätsprüfungen nach der eIDAS und dem Geldwäschegesetz"},
629		"longDescription": {"": "Die identity Trust Management AG bietet Unternehmen die Möglichkeit, ihre Kunden schnell und sicher mit der Online-Ausweisfunktion zu identifizieren. <br/>Kunden der Kooperationspartner der identity Trust Management AG können die Identitätsprüfung nach dem Signaturgesetz und dem Geldwäschegesetz auch direkt über die Internetseite der identity Trust Management AG vornehmen."},
630		"address": "https://www.identity.tm",
631		"homepage": "https://www.identity.tm",
632		"phone": "+49 211 68 77 3-0",
633		"email": "kontakt@identity.tm",
634		"postalAddress": "identity Trust Management AG<br/>Lierenfelder Straße 51<br/>40231 Düsseldorf",
635		"category": "other",
636		"tcTokenUrlInfo" : "Registration required",
637		"subjectUrls": []
638		},
639		{
640		"exclude": ["ios"],
641		"shortName": {"" : "ID-Safe des Landkreis Ostallgäu"},
642		"longDescription": {"": "Der Landkreis Ostallgäu bietet Ihnen bei verschiedenen Bürgerdiensten die Nutzung der Online-Ausweisfunktion in Verbindung mit elektronischen Antragsformularen an:<br/>- Bauantrag digital<br/>- Sperrmüll-Abholung<br/>- An-, Um- oder Abmeldung einer Abfalltonne<br/>- Antrag auf Dauergenehmigung und Feriengenehmigung für ein Segelboot oder Motorboot auf dem Forggensee<br/>Der Landkreis Ostallgäu bietet Ihnen außerdem einen ID-Safe an. Hier können Sie die Daten aus Ihrer Online-Ausweisfunktion hinterlegen und um weitere Kontaktdaten ergänzen. Anschließend können Sie die elektronischen Antragsformulare des Landkreises automatisch mit Ihren hinterlegten Daten befüllen. Dadurch vermeiden Sie Tippfehler und können die Bearbeitung Ihres Vorgangs beschleunigen.<br/>Darüber hinaus können Sie im Landkreis Ostallgäu über das bayerische Bürgerservice-Portal folgende Bürgerdienste online beantragen:<br/>- Fahrzeug-Anmeldung<br/>- Fahrzeug-Abmeldung<br/>- Feinstaubplakette<br/>- Wunschkennzeichen"},
643		"address": "https://www.sixform.com/ID-safe",
644		"homepage": "https://www.landkreis-ostallgaeu.de/",
645		"phone": "+49 83 42 · 9 11 - 0",
646		"email": "poststelle@lra-oal.bayern.de",
647		"postalAddress": "Landkreis Ostallgäu<br/>Schwabenstraße 11<br/>87616 Marktoberdorf",
648		"category": "citizen",
649		"tcTokenUrlInfo" : "Registration required",
650		"subjectUrls": ["https://www.sixform.com"]
651		},
652		{
653		"shortName": {"" : "Online-Registerauskunft"},
654		"longName": {"" : "Auskunft aus den Zentralen Registern des Kraftfahrt-Bundesamtes"},
655		"shortDescription": {"": "Mit der Anwendung können Privatpersonen eine Auskunft aus dem Fahreignungsregister (Punkteauskunft), aus dem Zentralen Fahrzeugregister (Fahrzeugzulassungen) sowie aus dem Zentralen Fahrerlaubnisregister (Führerschein) des Kraftfahrt-Bundesamtes erhalten. Diese umfasst ausgewählte Daten, die zu der jeweiligen Person gespeichert sind."},
656		"longDescription": {"": "Die Online-Auskunft aus dem Zentralen Fahrzeugregister umfasst Informationen zur Fahrzeugbeschreibung, den Halterdaten, der Haftpflichtversicherung, der letzten Haupt- bzw. Sicherheitsüberprüfung, der Fahrzeughistorie und den zulassungsrechtlich relevanten Ereignissen. Daten von vormaligen Haltern und interne Verwaltungsdaten sind von der Auskunft ausgenommen.<br/>Die Online-Auskunft aus dem Fahreignungsregister umfasst Informationen zu den eingetragenen Verkehrsverstößen, deren Punktbewertung und Löschungsdatum.<br/>Die Online-Auskunft aus dem Zentralen Fahrerlaubnisregister umfasst Informationen zu Fahrerlaubnissen, die seit dem 01.01.1999 erteilt, erweitert oder umgeschrieben wurden. Über die anderen vor dem 01.01.1999 ausgestellten Führerscheine führt nur die jeweils ausstellende Fahrerlaubnisbehörde eine Kartei/Datei."},
657		"address": "https://www.kba-online.de/registerauskunft/app/registeranfrage.html",
658		"homepage": "https://www.kba.de",
659		"phone": "+49 461 316-1717",
660		"email": "Anwenderbetreuung@kba.de",
661		"postalAddress": "Kraftfahrt-Bundesamt<br/>24932 Flensburg",
662		"image": "KraftfahrtBundesamt_image.png",
663		"icon": "KraftfahrtBundesamt_icon.png",
664		"category": "citizen",
665		"tcTokenUrl" : "https://www.kba-online.de:443/registerauskunft/app/eidstart.html;jsessionid=HZFFDC4E848A794D83A1D3032252F3F905?ref=HZFFDC4E848A794D83A1D3032252F3F905",
666		"tcTokenUrlInfo" : "TcToken URL contains dynamic request id but is accepted anyway.",
667		"subjectUrls": ["https://www.kba-online.de/registerauskunft"]
668		},
669		{
670		"shortName": {"" : "Kreis Borken"},
671		"longName": {"" : "Kreis Borken - Kfz-Abmeldung Internet"},
672		"shortDescription": {"": "Authentisierung für internetbasierte Kfz-Abmeldung."},
673		"longDescription": {"": "Für die internetbasierte Kfz-Abmeldung wird die eID-Funktionalität des neuen Personalausweises benötigt."},
674		"address": "https://formulare-extern.de/administrationCenter/Form-Solutions/05554004-0001/eID/eIDMandatory?directlink=https%3A%2F%2Fformulare-extern.de%2Fmetaform%2FForm-Solutions%2Fsid%2Fassistant%2F55dc839be4b054042fb93dba%3FeIDComplete%3Dtrue",
675		"homepage": "https://www.kreis-borken.de",
676		"phone": "+49 2861 / 82 - 2059",
677		"email": "zulassungsstelle@kreis-borken.de",
678		"postalAddress": "Kfz-Zulassungsstelle Borken<br/>Burloer Str. 93<br/>46325 Borken",
679		"image": "KreisBorken_image.png",
680		"icon": "KreisBorken_icon.svg",
681		"category": "citizen",
682		"tcTokenUrlInfo" : "",
683		"subjectUrls": []
684		},
685		{
686		"shortName": {"" : "Kreis Lippe Portal"},
687		"longName": {"" :"Kreis Lippe Portal"},
688		"longDescription": {"": "Mit der Online-Ausweisfunktion können Sie sich am Bürgerportal des Kreises Lippe registrieren, anmelden und den Online-Service 'Elternbeiträge' nutzen. Als Eltern können Sie nach der einmaligen Registrierung<br/><br/> - Ihre Selbsteinschätzung für den Elternbeitrag online einreichen,<br/> - den Bearbeitungsstand nachverfolgen,<br/> - Bescheide elektronisch im Dokumentenbereich empfangen."},
689		"address": "https://portal.kreis-lippe.de",
690		"homepage": "https://portal.kreis-lippe.de",
691		"phone": "+49 5231 - 62-0",
692		"email": "",
693		"postalAddress": "Kreis Lippe<br/>Felix-Fechenbach-Str. 5<br/>32756 Detmold",
694		"category": "citizen",
695		"tcTokenUrlInfo" : "",
696		"subjectUrls": []
697		},
698		{
699		"shortName": {"" : "Login Meine VBL"},
700		"longDescription": {"": "Bei der VBL können Sie sich mit dem Personalausweis am Kundenportal ,Meine VBL' anmelden. Im Kundenkonto können Sie Ihre Vertragsdaten und Ihre persönlichen Daten einsehen und weitere Online-Dienste nutzen, z. B.<br/>- Rentenantrag stellen,<br/>- Beitragserstattung beantragen,<br/>- Kontaktdaten ändern,<br/>- persönliche Mitteilungen von der VBL erhalten."},
701		"address": "https://www.vbl.de/de/meine_vbl",
702		"homepage": "https://www.vbl.de/",
703		"phone": "+49 721 93 98 93 1",
704		"email": "info@vbl.de",
705		"postalAddress": "VBL. Kundenservice<br/>76240 Karlsruhe",
706		"category": "other",
707		"tcTokenUrlInfo" : "Registration required",
708		"subjectUrls": ["https://www.vbl.de"]
709		},
710		{
711		"shortName": {"" : "LVM Versicherung - Kundenportal Meine LVM"},
712		"longDescription": {"": "Mit der Online-Ausweisfunktion im Personalausweis können Sie sich nach der Registrierung durch Ihre LVM-Agentur sicher am Kundenportal ,Meine LVM' anmelden. Ihre Versicherung können Sie nun selbst verwalten und beispielsweise sämtliche Vertragsdaten online einsehen. Darüber hinaus ist es möglich über das Portal Versicherungsbescheinigungen anzufordern sowie schnell und einfach Ihre persönlichen Daten wie Adresse oder Bankverbindung zu ändern."},
713		"address": "https://www.lvm.de/personalausweis",
714		"homepage": "https://www.lvm.de/",
715		"phone": "+49 251 702-0",
716		"email": "info@lvm.de",
717		"postalAddress": "LVM Versicherung<br/>48126 Münster",
718		"category": "insurance",
719		"tcTokenUrlInfo" : "Registration required",
720		"subjectUrls": ["https://www.lvm.de"]
721		},
722		{
723		"exclude": ["ios"],
724		"shortName": {"" : "Mentana-Claimsoft AG - Registrierung beim De-Mail Dienst"},
725		"address": "https://www.fp-demail.de/",
726		"homepage": "https://www.fp-demail.de/",
727		"phone": "+49 800-6368262",
728		"email": "de-mail.info@mentana.de",
729		"postalAddress": "Mentana-Claimsoft GmbH<br/>Trebuser-Str. 47 Haus 1<br/>D-15517 Fürstenwalde",
730		"category": "other",
731		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
732		"subjectUrls": ["https://www.fp-demail.de"]
	834	"subjectUrlInfo": "Using service from Servicekonto Nordrhein-Westfalen (https://servicekonto.nrw)."
	835	},
	836	{
	837	"shortName": {"" : "Rhein-Neckar-Kreis - Kfz-Online"},
	838	"longName": {"" :"Rhein-Neckar-Kreis - Kfz-Online"},
	839	"longDescription": {"": "Beim Landratsamt Rhein-Neckar-Kreis können Sie sich mit der Online-Ausweisfunktion identifizieren und verschiedene Kfz-Dienstleistungen nutzen:<br/><br/> - ein Neufahrzeug zulassen,<br/> - ein Fahrzeug wiederzulassen oder ummelden,<br/> - ein Fahrzeug abmelden,<br/> - Halterdaten ändern,<br/> - eine Ersatzzulassungsbescheinigung Teil 1 beantragen"},
	840	"address": "https://www.rhein-neckar-kreis.de/,Lde/start/service/neuzulassung.html",
	841	"homepage": "https://www.rhein-neckar-kreis.de/start.html",
	842	"phone": "+49 6221 522 0",
	843	"email": "post@rhein-neckar-kreis.de",
	844	"postalAddress": "Landratsamt Rhein-Neckar-Kreis<br/>Kurfürsten-Anlage 38 - 40<br/>69115 Heidelberg",
	845	"category": "citizen",
	846	"subjectUrlInfo": "Using service from Bürgerportal Baden-Württemberg (https://eid.service-bw.de)."
	847	},
	848	{
	849	"exclude": ["ios"],
	850	"shortName": {"" : "Rheingau-Taunus-Kreis - KFZ online"},
	851	"address": "https://www.rheingau-taunus.de/zulassungsbehoerde/kfz-online-portal.html",
	852	"homepage": "https://www.rheingau-taunus.de",
	853	"email": "zulassung@rheingau-taunus.de",
	854	"postalAddress": "Rheingau-Taunus-Kreis<br/>Zulassung<br/>Heimbacher Straße 7<br/>65307 Bad Schwalbach",
	855	"category": "citizen",
	856	"subjectUrlInfo": "Using service from ekom21-KGRZ Hessen (https://kfzonline.ekom21.de)."
733	857	},
734	858	{
735	859	"shortName": {"" : "OpenPGP-eID"},

737	861	"shortDescription": {"" : "OpenPGP-Schlüssel mit dem Online-Ausweis beglaubigen"},
738	862	"longDescription": {"": "Die Beglaubigung Ihres PGP-Schlüssels stellt gegenüber dem Empfänger sicher, dass Sie und kein Dritter der Absender einer Nachricht sind. Ein Dienst i.A. des Bundesamtes für Sicherheit in der Informationstechnik (BSI)."},
739	863	"address": "https://pgp.governikus.de",
740		"homepage": "https://www.governikus.de/",
741		"phone": "+49 421 204 95-0",
	864	"homepage": "https://www.governikus.de",
	865	"phone": "+49 421 204 95 0",
742	866	"email": "kontakt@governikus.com",
743	867	"postalAddress": "Governikus GmbH & Co. KG<br/>Hochschulring 4<br/>28359 Bremen",
744	868	"image": "openpgp_image.jpg",
745	869	"icon": "openpgp_icon.svg",
746	870	"category": "other",
747		"tcTokenUrl" : "https://pgp.governikus.de/pgp/ausweis-app-2",
748	871	"subjectUrls": ["https://pgp.governikus-eid.de"]
749		},
750		{
751		"shortName": {"" : "Rhein-Neckar-Kreis - Kfz-Online"},
752		"longName": {"" :"Rhein-Neckar-Kreis - Kfz-Online"},
753		"longDescription": {"": "Beim Landratsamt Rhein-Neckar-Kreis können Sie sich mit der Online-Ausweisfunktion identifizieren und verschiedene Kfz-Dienstleistungen nutzen:<br/><br/> - ein Neufahrzeug zulassen,<br/> - ein Fahrzeug wiederzulassen oder ummelden,<br/> - ein Fahrzeug abmelden,<br/> - Halterdaten ändern,<br/> - eine Ersatzzulassungsbescheinigung Teil 1 beantragen"},
754		"address": "https://www.rhein-neckar-kreis.de/,Lde/start/service/neuzulassung.html",
755		"homepage": "https://www.rhein-neckar-kreis.de/start.html",
756		"phone": "+49 6221 522-0",
757		"email": "post@rhein-neckar-kreis.de",
758		"postalAddress": "Landratsamt Rhein-Neckar-Kreis<br/>Kurfürsten-Anlage 38 - 40<br/>69115 Heidelberg",
759		"category": "citizen",
760		"tcTokenUrlInfo" : "",
761		"subjectUrls": []
762	872	},
763	873	{
764	874	"shortName": {"" : "Selbstauskunft - \"Meine Daten einsehen\""},
765	875	"longDescription": {"": "Die AusweisApp2 verfügt über die Funktion \"Meine Daten einsehen\". Mit dieser Funktion können die auf dem Personalausweis bzw. dem elektronischen Aufenthaltstitel gespeicherten Daten ausgelesen und angezeigt werden. Hierbei sprechen wir auch von einer sogenannten Selbstauskunft.<br/><br/>Sobald Sie die AusweisApp2 gestartet und ein geeigneter Kartenleser installiert bzw. ein Android-Smartphone verbunden haben, können Sie diese Funktion unter dem Menüpunkt \"Ausweisen\" aufrufen. (Auf Mobilgeräten finden Sie die Ausweis-Auskunft übrigens auch direkt auf der Startseite sowie im Menüeintrag \"Ausweisen\".)<br/><br/>Nach Ihrer PIN-Eingabe und erfolgreicher Datenübertragung werden die Daten in der AusweisApp2 dargestellt.<br/><br/>Bei der Selbstauskunft handelt es sich um einen reinen Demonstrationsdienst. Die ausgelesenen Daten werden lediglich zur Anzeige gebracht und nicht weitergegeben.<br/><br/>Bitte beachten Sie, dass Sie auch für diesen Vorgang eine Internetverbindung benötigen. Dies hat folgenden Hintergrund: Der Zugriff auf die Daten des Personalausweises bzw. des elektronischen Aufenthaltstitels ist nur möglich, wenn derjenige, der auf die Daten zugreifen möchte sich selbst zunächst eindeutig identifiziert. Dies geschieht über das sog. Berechtigungszertifikat. Es wird Ihnen immer angezeigt, wer auf Ihre Daten zugreifen möchte. Die Erlaubnis, ein Berechtigungszertifikat zu erhalten, wird einen Anbieter auf Antrag und nach Prüfung bei der Vergabestelle für Berechtigungszertifikate beim Bundesverwaltungsamt erteilt. Um das technische Berechtigungszertifikat anzuzeigen und darüber hinaus eine Gültigkeitsprüfung des Ausweisdokuments durchführen zu können, ist eine Internetverbindung zwingend erforderlich. Aus diesem Grund spricht man auch von der Online-Ausweisfunktion."},
766		"address": "https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen/",
767		"homepage": "https://www.ausweisapp.bund.de/",
768		"phone": "+49 421 - 204 95 995",
	876	"address": "https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen",
	877	"homepage": "https://www.ausweisapp.bund.de",
	878	"phone": "+49 421 204 95 995",
769	879	"email": "support@ausweisapp.de",
770	880	"postalAddress": "Governikus GmbH & Co. KG<br/>- im Auftrag des Bundesamtes für Sicherheit in der Informationstechnik -<br/>Hochschulring 4<br/>D-28359 Bremen",
771	881	"image": "selbstauskunft_image.jpg",
772	882	"icon": "selbstauskunft_icon.svg",
773	883	"category": "citizen",
774		"tcTokenUrlInfo" : "https://www.autentapp.de/AusweisAuskunft/WebServiceRequesterServlet?mode=xml",
775	884	"subjectUrls": ["https://www.autentapp.de"]
776		},
777		{
778		"shortName": {"" : "Servicekonto Nordrhein-Westfalen"},
779		"longName": {"" :"Servicekonto Nordrhein-Westfalen"},
780		"longDescription": {"": "Einmal online registrieren und dann die gespeicherten Daten vielfach nutzen: Dies ist die Idee des Servicekonto.NRW.<br/>Als Bürgerinnen und Bürger können Sie Ihre einmal erfassten Daten in allen angeschlossenen Portalen und Online-Angeboten in Nordrhein-Westfalen nutzen: Dazu gehören Online-Angebote von Städten, Gemeinden und Kreisen genauso wie die von Ministerien und Behörden der Landesverwaltung NRW.<br/>Um das Servicekonto.NRW zu nutzen, müssen Sie sich einmal registrieren und Ihre Daten erfassen.<br/>Mit der Online-Ausweisfunktion können Sie Ihre Daten einfach elektronisch in das Servicekonto.NRW übertragen und sofort alle Funktionen nutzen. Bei manueller Eingabe der Daten stehen Ihnen unter Umständen nicht alle Funktionen zur Verfügung."},
781		"address": "https://servicekonto.nrw/serviceaccount/",
782		"homepage": "https://servicekonto.nrw/serviceaccount/",
783		"phone": "",
784		"email": "servicekonto@kdn.de",
785		"postalAddress": "KDN – Dachverband kommunaler IT-Dienstleister<br/>Enggasse 2<br/>D-50668 Köln",
786		"category": "citizen",
787		"tcTokenUrlInfo" : "",
788		"subjectUrls": []
789	885	},
790	886	{
791	887	"exclude": ["ios"],

794	890	"shortDescription": {"": "Das Service-Portal bietet Online-Dienste rund um die KFZ-Zulassung."},
795	891	"longDescription": {"": "Im Service-Portal \"Auto\" können Sie Ihr Auto online abmelden. Weitere Angebote wie die komplette online KFZ-Wiederzulassung und -Zulassung sind im Aufbau."},
796	892	"address": "https://www.buergerserviceportal.nrw/krz/lkrlippe",
797		"homepage": "https://www.kreis-lippe.de/",
798		"phone": "+49 5231/62-0",
	893	"homepage": "https://www.kreis-lippe.de",
	894	"phone": "+49 5231 62 0",
799	895	"email": "stva@kreis-lippe.de",
800	896	"postalAddress": "Kreis Lippe<br/>Felix-Fechenbach-Straße 5<br/>32756 Detmold",
801	897	"image": "KreisLippe_image.jpg",
802	898	"icon": "KreisLippe_icon.png",
803	899	"category": "citizen",
804		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
805		"subjectUrls": ["https://www.buergerserviceportal.nrw"]
	900	"subjectUrlInfo": "Using service from Bürgerservice-Portal Krz (https://www.buergerserviceportal.nrw)."
	901	},
	902	{
	903	"shortName": {"" : "Service-Portal Berlin"},
	904	"address": "https://service.berlin.de/onlineverfahren-onlinedienstleistungen",
	905	"homepage": "https://www.berlin.de/labo",
	906	"phone": "+49 30 90269 0",
	907	"email": "kundenservice@berlin.de",
	908	"postalAddress": "BerlinOnline Stadtportal GmbH & Co. KG<br/>Alte Jakobstraße 105<br/>10969 Berlin",
	909	"category": "citizen",
	910	"subjectUrls": ["https://eid-prod.connect.verwalt-berlin.de"]
	911	},
	912	{
	913	"shortName": {"" : "Servicekonto Nordrhein-Westfalen"},
	914	"longName": {"" :"Servicekonto Nordrhein-Westfalen"},
	915	"longDescription": {"": "Einmal online registrieren und dann die gespeicherten Daten vielfach nutzen: Dies ist die Idee des Servicekonto.NRW.<br/>Als Bürgerinnen und Bürger können Sie Ihre einmal erfassten Daten in allen angeschlossenen Portalen und Online-Angeboten in Nordrhein-Westfalen nutzen: Dazu gehören Online-Angebote von Städten, Gemeinden und Kreisen genauso wie die von Ministerien und Behörden der Landesverwaltung NRW.<br/>Um das Servicekonto.NRW zu nutzen, müssen Sie sich einmal registrieren und Ihre Daten erfassen.<br/>Mit der Online-Ausweisfunktion können Sie Ihre Daten einfach elektronisch in das Servicekonto.NRW übertragen und sofort alle Funktionen nutzen. Bei manueller Eingabe der Daten stehen Ihnen unter Umständen nicht alle Funktionen zur Verfügung."},
	916	"address": "https://www.servicekonto.nrw",
	917	"homepage": "https://www.land.nrw",
	918	"email": "servicekonto@kdn.de",
	919	"postalAddress": "KDN – Dachverband kommunaler IT-Dienstleister<br/>Enggasse 2<br/>D-50668 Köln",
	920	"category": "citizen",
	921	"subjectUrls": ["https://servicekonto.nrw"]
806	922	},
807	923	{
808	924	"shortName": {"" : "Serviceportal des Ennepe-Ruhr-Kreises"},
809	925	"longName": {"" : "Serviceportal des Ennepe-Ruhr-Kreises"},
810	926	"longDescription": {"": "Herzlich willkommen auf der Startseite des Service-Portals des Ennepe-Ruhr-Kreises.<br/>Über dieses Serviceportal haben Sie rund um die Uhr online Zugriff auf Dienstleistungen des Kreises, des Landes und der Bundesbehörden. Ihr Vorteil: Das Angebot ist immer und überall abrufbar."},
811		"address": "https://portal.enkreis.de/",
	927	"address": "https://portal.enkreis.de",
812	928	"homepage": "https://www.en-kreis.de",
813	929	"phone": "+49 2336 930",
814	930	"email": "serviceportal@en-kreis.de",
815	931	"postalAddress": "Ennepe-Ruhr-Kreis<br/>Hauptstr. 92<br/>58332 Schwelm",
816	932	"category": "citizen",
817	933	"icon": "ennepe_icon.png",
818		"subjectUrls": []
	934	"subjectUrlInfo": "Using service from Servicekonto Nordrhein-Westfalen (https://servicekonto.nrw)."
	935	},
	936	{
	937	"shortName": {"" : "Serviceportal Kreis Gütersloh"},
	938	"longDescription": {"": "Bei der Kreisverwaltung Gütersloh können Sie viele Dienste mit Hilfe des Servicekonto NRW online erledigen. Einmal angemeldet, ist es Ihr Schlüssel zu unseren Online-Dienstleistungen. Erledigen Sie Ihre Verwaltungsangelegenheiten ganz bequem von Zuhause aus."},
	939	"address": "https://service.kreis-guetersloh.de",
	940	"homepage": "https://www.kreis-guetersloh.de",
	941	"phone": "+49 5241 85 0",
	942	"email": "kreisverwaltung@kreis-guetersloh.de",
	943	"postalAddress": "Kreisverwaltung Gütersloh<br/>Herzebrocker Str. 140<br/>33334 Gütersloh",
	944	"category": "citizen",
	945	"subjectUrlInfo": "Using service from Servicekonto Nordrhein-Westfalen (https://servicekonto.nrw)."
	946	},
	947	{
	948	"exclude": ["ios"],
	949	"shortName": {"" : "Serviceportal Sachsen-Anhalt"},
	950	"address": "https://serviceportal.sachsen-anhalt.de",
	951	"homepage": "https://serviceportal.sachsen-anhalt.de",
	952	"category": "citizen",
	953	"subjectUrls": ["https://st.buergerserviceportal.de", "https://bk.sachsen-anhalt-connect.de"]
	954	},
	955	{
	956	"shortName": {"" : "sign-me"},
	957	"longName": {"" : "sign-me - Dokumente online unterschreiben"},
	958	"shortDescription": {"": "sign-me ermöglicht die Nutzung aller Signaturniveaus der eIDAS-Verordnung – von der einfachen über die fortgeschrittene bis hin zur qualifizierten Online-Unterschrift. Letztere erfüllt das Schriftformerfordernis und ist in der Rechtswirkung der handschriftlichen Unterschrift gleichgestellt."},
	959	"longDescription": {"": "Mit sign-me, dem digitalen Service für Ihre sichere Online-Unterschrift, wickeln Sie Ihre papierbasierten Unterschriftsprozesse durchgängig elektronisch ab. Ob Sie europaweit Dokumente austauschen, Transaktionen absichern oder Verträge unterschreiben wollen – mit dem digitalen Signaturservice ist dies möglich: online, komfortabel und rechtsverbindlich. Mit sign-me senken Sie Kosten, optimieren Workflows, verringern Abbruchraten bei Vertragsabschlüssen und verbessern die Kundenzufriedenheit. sign-me ermöglicht die Nutzung aller Signaturniveaus der eIDAS-Verordnung – von der einfachen über die fortgeschrittene bis hin zur qualifizierten Online-Unterschrift. Letztere erfüllt das Schriftformerfordernis und ist in der Rechtswirkung der handschriftlichen Unterschrift gleichgestellt."},
	960	"address": "https://cloud.sign-me.de/signature/start",
	961	"homepage": "https://www.bundesdruckerei.de/de/loesungen/sign-me",
	962	"image": "SignMe_image.jpg",
	963	"icon": "SignMe_icon.png",
	964	"phone": "+49 30 25980",
	965	"email": "vertrieb@d-trust.net",
	966	"postalAddress": "Bundesdruckerei GmbH<br/>Kommandantenstraße 18<br/>10969 Berlin",
	967	"category": "other",
	968	"subjectUrlInfo": "Using service from AusweisIDent (https://ausweisident.eid-service.de)."
819	969	},
820	970	{
821	971	"shortName": {"" : "SkIDentity Service"},

827	977	"email": "detlef.huehnlein@ecsec.de",
828	978	"postalAddress": "ecsec GmbH<br/>Sudetenstraße 16<br/>96247 Michelau",
829	979	"category": "other",
830		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
831		"subjectUrls": []
	980	"subjectUrls": ["https://service.skidentity.de"]
	981	},
	982	{
	983	"shortName": {"" : "Stadt Kassel"},
	984	"longName": {"": "Stadt Kassel Online-Services"},
	985	"shortDescription": {"": "Mit Hilfe unserer Online-Services lassen sich einige Behördengänge erleichtern, vorbereiten und oftmals vermeiden."},
	986	"address": "https://www.kassel.de/service/media/online-services.php",
	987	"homepage": "https://www.kassel.de",
	988	"phone": "+49 0561 115",
	989	"email": "servicecenter@kassel.de",
	990	"postalAddress": "Stadt Kassel<br/>Obere Königsstraße 8<br/>34117 Kassel",
	991	"image": "kassel_image.png",
	992	"icon": "kassel_icon.png",
	993	"category": "citizen",
	994	"subjectUrlInfo": "Using service from ekom21-KGRZ Hessen (https://kfzonline.ekom21.de)."
832	995	},
833	996	{
834	997	"shortName": {"" : "Stadt Nürnberg: Online-Bürgerdienste Service"},
835	998	"longDescription": {"": "Die Stadt Nürnberg bietet Ihnen mit ihrem Bürgerserviceportal ,Mein.Nürnberg' erstmals die Möglichkeit, Ihre Verwaltungsangelegenheiten komplett elektronisch abzuwickeln – von der Antragstellung bis zur Rückmeldung der Bescheide oder Schriftstücke in Ihren persönlichen Bereich auf dem Portal. Alle Online-Dienste der Stadt Nürnberg wurden zudem für die Nutzung mit mobilen Endgeräten optimiert.<br/>Bei immer mehr Verfahren akzeptiert die Stadtverwaltung einen Unterschriftersatz durch die Online-Ausweisfunktion.<br/>Jeder Online-Dienst der Stadt Nürnberg, der die Online-Ausweisfunktion nutzt, ist an dem Hinweis \"mit eID\" erkennbar. Derzeit sind dies z. B.:<br/>- Aufenthaltstitel beantragen<br/>- Gaststättenrechtliche Erlaubnis für den Ausschank von Alkohol beantragen<br/>- Hunde – Negativzeugnis für Kampfhunde beantragen<br/>- Kfz-Halterauskunft beantragen<br/>- Melderegister – Widerspruch gegen Datenübermittlung<br/>- Veranstaltung, Messe, Markt beantragen"},
836	999	"address": "https://www.nuernberg.de/internet/onlinedienste",
837		"homepage": "https://www.nuernberg.de/",
838		"phone": "+49 9 11 / 2 31-8613",
	1000	"homepage": "https://www.nuernberg.de",
	1001	"phone": "+49 9 11 2 31 8613",
839	1002	"email": "poststelle@stadt.nuernberg.de",
840	1003	"postalAddress": "Amt für Organisation, Informationsverarbeitung und Zentrale Dienste<br/>E-Government-Büro<br/>Rathausplatz 2<br/>III. OG<br/>90403 Nürnberg",
841	1004	"category": "citizen",
842		"tcTokenUrlInfo" : "Registration required",
843	1005	"subjectUrls": ["https://meinkonto.nuernberg.de"]
	1006	},
	1007	{
	1008	"exclude": ["ios"],
	1009	"shortName": {"" : "Straßenverkehrsamt Saalekreis"},
	1010	"longDescription": {"": "Die Reservierung eines Wunschkennzeichens, Terminangelegenheiten oder alles rund um den Führerschein - das Straßenverkehrsamt bietet Ihnen verschiedene Möglichkeiten der Online-Nutzung."},
	1011	"address": "https://www.saalekreis.de/de/online-angebote-stva.html",
	1012	"homepage": "https://www.saalekreis.de",
	1013	"phone": "+49 3461 40 1022",
	1014	"email": "internetredaktion@saalekreis.de",
	1015	"postalAddress": "Landkreis Saalekreis<br/>Domplatz 9<br/>06217 Merseburg",
	1016	"category": "citizen",
	1017	"subjectUrlInfo": "Using service from Serviceportal Sachsen-Anhalt (https://st.buergerserviceportal.de)."
	1018	},
	1019	{
	1020	"exclude": ["ios"],
	1021	"shortName": {"" : "T-Systems DeMail für Großkunden"},
	1022	"address": "https://www.t-systems.de/de-mail",
	1023	"homepage": "https://www.t-systems.de",
	1024	"phone": "+49 69 20060 0",
	1025	"email": "de-mail@t-systems.com",
	1026	"postalAddress": "T-Systems International GmbH<br/>Hahnstraße 43d<br/>60528 Frankfurt am Main",
	1027	"category": "other",
	1028	"subjectUrls": ["https://www.de-mail.t-systems.de"]
844	1029	},
845	1030	{
846	1031	"exclude": ["ios"],
847	1032	"shortName": {"" : "Telekom DeMail"},
848	1033	"longName": {"" : "Telekom DeMail für Privat- und Geschäftskunden"},
849	1034	"address": "https://www.telekom.de/de-mail",
850		"homepage": "https://www.telekom.de/",
	1035	"homepage": "https://www.telekom.de",
851	1036	"phone": "+49 800 33 01000",
852		"email": "",
853	1037	"postalAddress": "Telekom Deutschland GmbH<br/>Landgrabenweg 151<br/>53227 Bonn",
854	1038	"category": "other",
855		"tcTokenUrlInfo" : "Registration required",
856	1039	"subjectUrls": ["https://www.de-mail.t-online.de"]
857		},
858		{
859		"exclude": ["ios"],
860		"shortName": {"" : "T-Systems DeMail für Großkunden"},
861		"address": "https://www.t-systems.de/de-mail",
862		"homepage": "https://www.t-systems.de/",
863		"phone": "+49 69 20060 - 0",
864		"email": "de-mail@t-systems.com",
865		"postalAddress": "T-Systems International GmbH<br/>Hahnstraße 43d<br/>60528 Frankfurt am Main",
866		"category": "other",
867		"tcTokenUrlInfo" : "Registration required",
868		"subjectUrls": ["https://www.de-mail.t-systems.de"]
869	1040	},
870	1041	{
871	1042	"exclude": ["ios"],
872	1043	"shortName": {"" : "Urkundenservice Köln"},
873	1044	"longDescription": {"": "Bei der Stadt Köln können Sie mit der Online-Ausweisfunktion folgende Urkunden beantragen:<br/>- Geburtsurkunden<br/>- Eheurkunden<br/>- Lebenspartnerschaftsurkunden<br/>- Sterbeurkunden<br/>Dabei werden die Adressatenangaben in den Online-Formularen automatisch befüllt."},
874	1045	"address": "https://www.stadt-koeln.de/service/produkt/urkundenservice-des-standesamtes",
875		"homepage": "https://www.stadt-koeln.de/",
876		"phone": "+49 221 / 221-26530",
	1046	"homepage": "https://www.stadt-koeln.de",
	1047	"phone": "+49 221 221 26530",
877	1048	"email": "standesamt@stadt-koeln.de",
878	1049	"postalAddress": "Gülichplatz 1-3<br/>50667 Köln",
879	1050	"category": "citizen",
880		"tcTokenUrl" : "https://ea.stadt-koeln.de/Gastzugang/EIDServiceProvider/Request.ashx?appID=7",
881	1051	"subjectUrls": ["https://ea.stadt-koeln.de"]
882	1052	},
883	1053	{
884	1054	"exclude": ["ios"],
885	1055	"shortName": {"" : "Virtuelles Rathaus Stadt Dortmund"},
886	1056	"longDescription": {"": "Sie wollen städtische Dienstleistungen in Anspruch nehmen, sich zunächst nur informieren oder Sie suchen bereits ein bestimmtes Formular?<br/>Wir haben für Sie ein umfassendes Informationsangebot über Produkte und Leistungen (Services) der Stadt Dortmund gegliedert nach Themen und der Behördenstruktur bereitgestellt."},
887		"address": "https://rathaus.dortmund.de/",
888		"homepage": "https://rathaus.dortmund.de/",
889		"phone": "+49 231 / 50-25650",
	1057	"address": "https://rathaus.dortmund.de",
	1058	"homepage": "https://rathaus.dortmund.de",
	1059	"phone": "+49 231 50 25650",
890	1060	"email": "domap-feedback@stadtdo.de",
891	1061	"postalAddress": "Stadt Dortmund<br/>Dortmunder Systemhaus<br/>Deggingstraße 42<br/>44122 Dortmund",
892	1062	"category": "citizen",
893		"tcTokenUrlInfo" : "TcToken URL requires valid dynamic request id.",
894		"subjectUrls": ["https://rathaus.dortmund.de"]
	1063	"subjectUrlInfo": "Using service from Servicekonto Nordrhein-Westfalen (https://servicekonto.nrw)."
895	1064	},
896	1065	{
897	1066	"exclude": ["ios"],
898	1067	"shortName": {"" : "Vollstreckungsportal"},
899	1068	"longDescription": {"": "Herzlich willkommen auf dem Gemeinsamen Vollstreckungsportal der Länder."},
900	1069	"address": "https://www.vollstreckungsportal.de/auskunft/priv/anmelden.jsf?type=npa",
901		"homepage": "https://www.vollstreckungsportal.de/",
902		"phone": "",
	1070	"homepage": "https://www.vollstreckungsportal.de",
903	1071	"email": "bundesportal@ag-hagen.nrw.de",
904	1072	"postalAddress": "Land Nordrhein-Westfalen<br/>vertreten durch das Justizministerium<br/>Martin-Luther-Platz 40<br/>40212 Düsseldorf",
905	1073	"category": "citizen",
906		"tcTokenUrlInfo" : "Registration required.",
907	1074	"subjectUrls": ["https://www.vollstreckungsportal.de"]
908		},
909		{
910		"shortName": {"" : "Service-Portal Hochsauerlandkreis"},
911		"longName": {"": "Antragstellung an die Kreisverwaltung im Hochsauerlandkreis"},
912		"shortDescription": {"": "Übersicht über die verschiedenen Online-Anträge"},
913		"longDescription": {"": "Stellen Sie hier Ihre Anträge an die Kreisverwaltung. Das Angebot wird laufend erweitert."},
914		"address": "https://portal.citkomm.de/hsk/services",
915		"homepage": "https://portal.citkomm.de/hsk/services",
916		"phone": "+49 291 / 94-0",
917		"email": "post@hochsauerlandkreis.de",
918		"postalAddress": "Steinstraße 27<br/>59872 Meschede",
919		"image": "HSK_image.jpg",
920		"icon": "HSK_icon.png",
921		"category": "citizen",
922		"subjectUrls": []
923	1075	}
924	1076	]
925	1077	}

+99

-72

resources/updatable-files/supported-readers.json less more

118	118	"URL": "https://www.reiner-sct.com/support/support-anfrage/?os=Windows&productGroup=77304735&product=77304856&q=driver#choice5"
119	119	},
120	120	{
121		"Platforms": [{"os": "mac", "max": "10.14"}],
	121	"Platforms": [{"os": "mac"}],
122	122	"URL": "https://www.reiner-sct.com/support/support-anfrage/?os=MacOS&productGroup=77304735&product=77304856&q=driver#choice5"
123	123	},
124	124	{

140	140	"VendorId": "0x0C4B",
141	141	"ProductId": "0x0505",
142	142	"Name": "REINER SCT cyberJack wave",
143		"Pattern": "REINER SCT cyberJack wave",
	143	"Pattern": "REINER SCT cyberJack wave( USB 1)?$",
144	144	"Icon": "img_cyberjack_wave.png",
145	145	"IconWithNPA": "img_cyberjack_wave_mit_ausweis.png",
146	146	"Drivers":

161	161	"Information":
162	162	[
163	163	{
164		"Platforms":[{"os": "mac"}],
	164	"Platforms":[{"os": "win"}, {"os": "mac"}],
165	165	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite.",
166	166	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system."
167	167	}

178	178	"Drivers":
179	179	[
180	180	{
181		"Platforms": [{"os": "win"}],
	181	"Platforms": [{"os": "win"}, {"os": "mac", "max": "10.14"}],
182	182	"URL": "https://security.kobil.de/idtoken/"
	183	}
	184	],
	185	"Information":
	186	[
	187	{
	188	"Platforms":[{"os": "win"}],
	189	"DE": "Der Kartenleser funktioniert mit dem systemseitig installierten Treiber. Falls Sie jedoch den Treiber von der Webseite des Herstellers installieren möchten, ist anschließend ein Neustart erforderlich.",
	190	"EN": "The card reader operates with the driver automatically installed by the system. In case you prefer to install the driver from the manufacturer's webseite, a reboot is required."
	191	},
	192	{
	193	"Platforms":[{"os": "mac", "max": "10.14"}],
	194	"DE": "Der Kartenleser funktioniert mit dem systemseitig installierten Treiber.",
	195	"EN": "The card reader is compatible with the installed system driver."
183	196	}
184	197	]
185	198	},

188	201	"VendorId": "0x04E6",
189	202	"ProductId": "0x512B",
190	203	"Name": "SDI011 Contactless Reader",
191		"Pattern": "SDI011 Contactless Reader\|SDI011 USB Smart Card Reader(\$1\$\|\$2\$)",
	204	"Pattern": "(SCM Microsystems Inc. SDI011G (Contactless\| Smart Card) Reader 0)\|(SDI011 (USB Smart Card\|Contactless) Reader(\$1\$\|\$2\$)?)",
192	205	"Icon": "img_Identive_SDI011.png",
193	206	"IconWithNPA": "img_Identive_SDI011_mit_ausweis.png",
194	207	"Drivers":
195	208	[
196	209	{
197		"Platforms": [{"os": "win"}],
198		"URL": "http://www.scm-pc-card.de/index.php?page=download&function=show_downloads&lang=de&product_id=738"
199		},
200		{
201		"Platforms": [{"os": "mac", "min":"10.13", "max":"10.14"}, {"os": "unknown"}],
	210	"Platforms": [{"os": "win"}, {"os": "mac"}, {"os": "unknown"}],
202	211	"URL": "https://support.identiv.com/sdi010-011/"
203	212	}
204	213	],
205	214	"Information":
206	215	[
207	216	{
208		"Platforms": [{"os": "win", "max": "6.1"}],
209		"DE": "Bitte beachten Sie, dass der Kartenleser nur mit der SDI011-generic-version funktioniert. Nach der Installation ist ein Neustart erforderlich.",
210		"EN": "Please note that the card reader only works with the SDI011-generic-version. A reboot is required after the installation of the driver."
211		},
212		{
213		"Platforms":[{"os": "win", "min": "6.2"}],
214		"DE": "Bitte beachten Sie, dass der Kartenleser nur mit der SDI011-nPA-version funktioniert. Nach der Installation ist ein Neustart erforderlich.",
215		"EN": "Please note that the card reader only works with the SDI011-nPA-version. A reboot is required after the installation of the driver."
216		},
217		{
218		"Platforms": [{"os": "mac"}],
219		"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite.",
220		"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system."
	217	"Platforms": [{"os": "win", "max": "6.3"}, {"os": "mac"}],
	218	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite. Nach der Installation ist ein Neustart erforderlich.",
	219	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system. A reboot is required after the installation of the driver."
	220	},
	221	{
	222	"Platforms":[{"os": "win", "min": "10.0"}],
	223	"DE": "Der Kartenleser funktioniert mit dem systemseitig installierten Treiber. Falls Sie jedoch den Treiber von der Webseite des Herstellers installieren möchten, ist anschließend ein Neustart erforderlich.",
	224	"EN": "The card reader operates with the driver automatically installed by the system. In case you prefer to install the driver from the manufacturer's webseite, a reboot is required."
221	225	}
222	226	]
223	227	},

232	236	"Drivers":
233	237	[
234	238	{
235		"Platforms": [{"os": "win"}, {"os": "mac"}],
236		"URL": "https://www.scm-pc-card.de/index.php?lang=de&page=download&function=show_downloads&product_id=630"
237		},
238		{
239		"Platforms": [{"os": "unknown"}],
240		"URL": "https://support.identiv.com/scl010-scl011/"
241		}
242		],
243		"Information":
244		[
245		{
246		"Platforms": [{"os": "win"}],
247		"DE": "Der Kartenleser funktioniert nur mit der SCL011-nPA-version. Nach der Installation ist ein Neustart erforderlich.",
248		"EN": "The card reader works only with the SCL011-nPA-version. A reboot is required after the installation of the driver."
249		},
250		{
251		"Platforms": [{"os": "mac"}],
252		"DE": "Der Kartenleser funktioniert mit dem systemseitig installierten Treiber. Falls Sie jedoch den Treiber von der Webseite des Herstellers installieren möchten, ist anschließend ein Neustart erforderlich.",
253		"EN": "The card reader operates with the driver automatically installed by the system. In case you prefer to install the driver from the manufacturer's webseite, a reboot is required."
254		}
255		],
256		"Internal information": "Unter macOS funktioniert nur NFC A. Reader wird als unterstützt markiert, da zertifiziert."
	239	"Platforms": [{"os": "win"}, {"os": "unknown"}],
	240	"URL": "https://www.scm-pc-card.de/kartenleser/npa/65/scm-scl010-usb-multiprotokoll-smartcard-reader-rfid/nfc-leser/905155?c=7"
	241	}
	242	],
	243	"Information":
	244	[
	245	{
	246	"Platforms": [{"os": "win"}],
	247	"DE": "Der Kartenleser funktioniert mit dem systemseitig installierten Treiber",
	248	"EN": "The card reader operates with the driver automatically installed by the system."
	249	}
	250	],
	251	"Internal information": "Unter macOS funktioniert der Kartenleser nicht mehr. Leider ist kein Treiber vom Hersteller verfügbar."
257	252	},
258	253
259	254	{

269	264	"Platforms": [{"os": "win"}, {"os": "mac"}, {"os": "unknown"}],
270	265	"URL": "https://support.identiv.com/3700f/"
271	266	}
	267	],
	268	"Information":
	269	[
	270	{
	271	"Platforms": [{"os": "win"}, {"os": "mac"}],
	272	"DE": "Der Kartenleser funktioniert mit dem systemseitig installierten Treiber.",
	273	"EN": "The card reader operates with the driver automatically installed by the system."
	274	}
272	275	]
273	276	},
274	277

276	279	"VendorId": "0x04E6",
277	280	"ProductId": "0x5591",
278	281	"Name": "Identiv SCL3711",
279		"Pattern": "(SCM Microsystems SCL3711 reader & NFC device 0\|SCL3711 reader and NFC device)",
	282	"Pattern": "(SCM Microsystems SCL3711 reader & NFC device 0\|SCL3711 Reader and NFC device)",
280	283	"Icon": "img_Identive_SCL3711.png",
281	284	"IconWithNPA": "img_Identive_SCL3711_mit_ausweis.png",
282	285	"Drivers":

292	295	"Platforms": [{"os": "win"}],
293	296	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite.",
294	297	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system."
	298	},
	299	{
	300	"Platforms": [{"os": "mac", "max": "10.12"}, {"os": "mac", "min": "10.14"}],
	301	"DE":"Der Kartenleser funktioniert mit dem systemseitig installierten Treiber. Falls Sie jedoch den Treiber von der Webseite des Herstellers installieren möchten, ist anschließend ein Neustart erforderlich.",
	302	"EN":"The card reader operates with the driver automatically installed by the system. In case you prefer to install the driver from the manufacturer's webseite, a reboot is required."
295	303	}
296	304	]
297	305	},

313	321	"Information":
314	322	[
315	323	{
316		"Platforms": [{"os": "win"}, {"os": "mac"}],
	324	"Platforms": [{"os": "win"}],
317	325	"DE":"Der Kartenleser funktioniert mit dem systemseitig installierten Treiber. Falls Sie jedoch den Treiber von der Webseite des Herstellers installieren möchten, ist anschließend ein Neustart erforderlich.",
318	326	"EN":"The card reader operates with the driver automatically installed by the system. In case you prefer to install the driver from the manufacturer's webseite, a reboot is required."
	327	},
	328	{
	329	"Platforms": [{"os": "mac"}],
	330	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite.",
	331	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system."
319	332	}
320	333	]
321	334	},

337	350	"Information":
338	351	[
339	352	{
340		"Platforms": [{"os": "win"}, {"os": "mac"}],
	353	"Platforms": [{"os": "win"}],
341	354	"DE":"Der Kartenleser funktioniert mit dem systemseitig installierten Treiber. Falls Sie jedoch den Treiber von der Webseite des Herstellers installieren möchten, ist anschließend ein Neustart erforderlich.",
342	355	"EN":"The card reader operates with the driver automatically installed by the system. In case you prefer to install the driver from the manufacturer's webseite, a reboot is required."
	356	},
	357	{
	358	"Platforms": [{"os": "mac"}],
	359	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite.",
	360	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system."
343	361	}
344	362	]
345	363	},

377	395	"VendorId": "0x072F",
378	396	"ProductId": "0x223B",
379	397	"Name": "ACS ACR1252U",
380		"Pattern": "ACS ACR1252 1S CL Reader PICC 0\|ACS ACR1252 Dual Reader\$2\$",
	398	"Pattern": "ACS ACR1252 (1S CL\|Dual)? Reader PICC 0\|ACS ACR1252 Dual Reader\$2\$",
381	399	"Icon": "img_ACS_ACR1252U.png",
382	400	"IconWithNPA": "img_ACS_ACR1252U_mit_ausweis.png",
383	401	"Drivers":

390	408	"Information":
391	409	[
392	410	{
393		"Platforms": [{"os": "win"}],
	411	"Platforms": [{"os": "win"}, {"os": "mac"}],
394	412	"DE":"Der Kartenleser funktioniert mit dem systemseitig installierten Treiber. Falls Sie jedoch den Treiber von der Webseite des Herstellers installieren möchten, ist anschließend ein Neustart erforderlich.",
395	413	"EN":"The card reader operates with the driver automatically installed by the system. In case you prefer to install the driver from the manufacturer's webseite, a reboot is required."
396		},
397		{
398		"Platforms": [{"os": "mac"}],
399		"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite.",
400		"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system."
401		}
402
403		]
	414	}
	415	],
	416	"Internal information": "Unter macOS funktioniert nur NFC A. Reader wird als unterstützt markiert, da zertifiziert."
404	417	},
405	418
406	419	{

413	426	"Drivers":
414	427	[
415	428	{
416		"Platforms": [{"os": "win"}, {"os": "unknown"}],
	429	"Platforms": [{"os": "win"}, {"os": "mac"}, {"os": "unknown"}],
417	430	"URL": "https://www.hidglobal.de/drivers"
418	431	}
419	432	],

423	436	"Platforms":[{"os": "win"}],
424	437	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Beachten Sie bei der Auswahl, dass nur der \"X-CHIP WINDOWS BU & RU driver\" funktioniert.",
425	438	"EN": "It is necessary to install the drivers from the manufacturer. Please note that only the driver named \"X-CHIP WINDOWS BU & RU driver\" works with this card reader."
	439	},
	440	{ "Platforms":[{"os": "mac"}],
	441	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite.",
	442	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system."
426	443	}
427	444	]
428	445	},

431	448	"VendorId": "0x076B",
432	449	"ProductId": "0x5022",
433	450	"Name": "OMNIKEY 5022-CL",
434		"Pattern": "HID Global OMNIKEY 5022 Smart Card Reader 0\|HID Global OMNIKEY 5022 Smart Card Reader",
	451	"Pattern": "HID Global OMNIKEY 5022 Smart Card Reader( 0)?$",
435	452	"Icon": "img_HID_Omnikey_Mobile_Reader_502X_CL.png",
436	453	"IconWithNPA": "img_HID_Omnikey_Mobile_Reader_502X_CL_mit_ausweis.png",
437	454	"Drivers":
438	455	[
439	456	{
440		"Platforms": [{"os": "win"}, {"os": "mac", "min": "10.12"}],
	457	"Platforms": [{"os": "win"}, {"os": "mac"}],
441	458	"URL": "https://www.hidglobal.de/drivers"
442	459	}
443	460	],

449	466	"EN": "The card reader operates with the driver automatically installed by the system. In case you prefer to install the driver from the manufacturer's webseite, a reboot is required."
450	467	},
451	468	{
452		"Platforms":[{"os": "mac", "min": "10.12"}],
	469	"Platforms":[{"os": "mac"}],
453	470	"DE": "Der Kartenleser funktioniert mit dem systemseitig installierten Treiber.",
454	471	"EN": "The card reader is compatible with the installed system driver."
455	472	}

466	483	"Drivers":
467	484	[
468	485	{
469		"Platforms": [{"os": "win"}],
	486	"Platforms": [{"os": "win"}, {"os": "mac"}],
470	487	"URL": "https://www.hidglobal.de/drivers"
471	488	}
472	489	],
473	490	"Information":
474	491	[
475	492	{
476		"Platforms":[{"os": "win"}],
	493	"Platforms":[{"os": "win"}, {"os": "mac"}],
477	494	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite.",
478	495	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system."
479	496	}

490	507	"Drivers":
491	508	[
492	509	{
493		"Platforms": [{"os": "win"}, {"os": "unknown"}],
	510	"Platforms": [{"os": "win"}, {"os": "mac"}, {"os": "unknown"}],
494	511	"URL": "https://www.hidglobal.com/drivers"
495	512	}
496	513	],

500	517	"Platforms":[{"os": "win"}],
501	518	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite. Beachten Sie bei der Auswahl, dass nur der \"X-CHIP WINDOWS BU & RU driver\" funktioniert.",
502	519	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system. Please note that only the driver named \"X-CHIP WINDOWS BU & RU driver\" works with this card reader."
	520	},
	521	{
	522	"Platforms":[{"os": "mac"}],
	523	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite.",
	524	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system."
503	525	}
504	526	]
505	527	},

514	536	"Drivers":
515	537	[
516	538	{
517		"Platforms": [{"os": "win"}],
	539	"Platforms": [{"os": "win"}, {"os": "mac"}],
518	540	"URL": "https://www.hidglobal.com/drivers"
519	541	}
520	542	],

524	546	"Platforms": [{"os": "win"}],
525	547	"DE": "Der Kartenleser funktioniert mit dem systemseitig installierten Treiber. Falls Sie jedoch den Treiber von der Webseite des Herstellers installieren möchten, ist anschließend ein Neustart erforderlich.",
526	548	"EN": "The card reader operates with the driver automatically installed by the system. In case you prefer to install the driver from the manufacturer's webseite, a reboot is required."
	549	},
	550	{
	551	"Platforms":[{"os": "mac", "min": "10.13"}],
	552	"DE": "Der Kartenleser funktioniert mit dem systemseitig installierten Treiber. Es ist kein Treiber vom Hersteller vorhanden.",
	553	"EN": "The card reader is compatible with the installed system driver. There is no driver from the manufacturer."
527	554	}
528	555	]
529	556	},

635	662	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system."
636	663	},
637	664	{
638		"Platforms": [{"os": "mac", "max":"10.13"}],
639		"DE": "Der Kartenleser funktioniert mit dem systemseitig installierten Treiber. Falls Sie jedoch den Treiber von der Webseite des Herstellers installieren möchten, ist anschließend ein Neustart erforderlich.",
640		"EN": "The card reader operates with the driver automatically installed by the system. In case you prefer to install the driver from the manufacturer's webseite, a reboot is required."
	665	"Platforms": [{"os": "mac"}],
	666	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite. Der Treiber für macOS 10.13 funktioniert für macOS 10.14 und macOS 10.15.",
	667	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system. The driver for macOS 10.13 works for macOS 10.14 and macOS 10.15."
641	668	}
642	669	]
643	670	},

664	691	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system."
665	692	},
666	693	{
667		"Platforms": [{"os": "mac", "max": "10.14"}],
668		"DE": "Der Kartenleser funktioniert mit dem systemseitig installierten Treiber. Falls Sie jedoch den Treiber von der Webseite des Herstellers installieren möchten, ist anschließend ein Neustart erforderlich.",
669		"EN": "The card reader operates with the driver automatically installed by the system. In case you prefer to install the driver from the manufacturer's webseite, a reboot is required."
	694	"Platforms": [{"os": "mac"}],
	695	"DE": "Es ist notwendig, die Treiber vom Hersteller zu installieren. Dazu folgen Sie bitte dem jeweiligen Link für Ihr Betriebssystem zur Herstellerseite. Der Treiber für macOS 10.13 funktioniert für macOS 10.14 und macOS 10.15.",
	696	"EN": "It is necessary to install the drivers from the manufacturer. Please follow the relevant link for your operating system. The driver for macOS 10.13 works for macOS 10.14 and macOS 10.15."
670	697	}
671	698	]
672	699	},

+1

-1

src/CMakeLists.txt less more

113	113	TARGET_LINK_LIBRARIES(AusweisApp -lqtpcre2 -lqtlibpng -lQt5GraphicsSupport -lQt5FontDatabaseSupport -lQt5ClipboardSupport -lqios -lqsvg -lqjpeg -lqtfreetype)
114	114
115	115	TARGET_LINK_LIBRARIES(AusweisApp "-lc++ -lz -lm")
116		TARGET_LINK_LIBRARIES(AusweisApp ${IOS_ASSETSLIBRARY} ${IOS_UIKIT} ${IOS_COREBLUETOOTH} ${IOS_COREFOUNDATION} ${IOS_OPENGLES} ${IOS_FOUNDATION} ${IOS_QUARTZCORE} ${IOS_CORETEXT} ${IOS_COREGRAPHICS} ${IOS_SECURITY} ${IOS_MOBILECORESERVICES} ${IOS_AUDIOTOOLBOX} ${IOS_IMAGEIO} ${IOS_CORENFC} ${IOS_MESSAGEUI} ${IOS_STOREKIT})
	116	TARGET_LINK_LIBRARIES(AusweisApp ${IOS_ASSETSLIBRARY} ${IOS_UIKIT} ${IOS_COREBLUETOOTH} ${IOS_COREFOUNDATION} ${IOS_OPENGLES} ${IOS_FOUNDATION} ${IOS_QUARTZCORE} ${IOS_CORETEXT} ${IOS_COREGRAPHICS} ${IOS_SECURITY} ${IOS_NETWORK} ${IOS_MOBILECORESERVICES} ${IOS_AUDIOTOOLBOX} ${IOS_IMAGEIO} ${IOS_CORENFC} ${IOS_MESSAGEUI} ${IOS_STOREKIT})
117	117
118	118	TARGET_LINK_LIBRARIES(AusweisApp -Wl,-e,_qt_main_wrapper)
119	119

+11

-0

src/activation/intent/IntentActivationContext.cpp less more

8	8
9	9	#include <QDesktopServices>
10	10
	11	#ifdef Q_OS_ANDROID
	12	#include <QtAndroidExtras/QAndroidJniObject>
	13	#include <QtAndroidExtras/QtAndroid>
	14	#endif
11	15
12	16	using namespace governikus;
13	17

33	37	* has finished and the AuthMdel is deleted.
34	38	*/
35	39	qDebug() << "Perform redirect to URL" << mRedirectAddress;
	40	#ifdef Q_OS_ANDROID
	41	if (QtAndroid::androidActivity().callMethod<jboolean>("openUrl", "(Ljava/lang/String;Ljava/lang/String;)Z", QAndroidJniObject::fromString(mRedirectAddress.url()).object<jstring>(), QAndroidJniObject::fromString(mReferrer).object<jstring>()))
	42	{
	43	return;
	44	}
	45	#endif
	46
36	47	QDesktopServices::openUrl(mRedirectAddress);
37	48	}
38	49	}

+33

-8

src/activation/intent/MainActivity.java less more

3	3
4	4	package com.governikus.ausweisapp2;
5	5
	6	import java.util.List;
	7
6	8	import android.accessibilityservice.AccessibilityServiceInfo;
7	9	import android.app.Activity;
8	10	import android.app.PendingIntent;
	11	import android.content.ActivityNotFoundException;
9	12	import android.content.Context;
10	13	import android.content.Intent;
11	14	import android.content.IntentFilter;
12		import android.content.pm.ActivityInfo;
13	15	import android.content.pm.PackageManager;
14	16	import android.graphics.Color;
15	17	import android.net.Uri;

23	25	import android.view.ViewGroup.MarginLayoutParams;
24	26	import android.view.Window;
25	27	import android.view.WindowManager;
	28
	29	import org.qtproject.qt5.android.bindings.QtActivity;
	30
26	31	import androidx.core.view.OnApplyWindowInsetsListener;
27	32	import androidx.core.view.ViewCompat;
28	33	import androidx.core.view.WindowInsetsCompat;
29		import java.util.List;
30
31		import org.qtproject.qt5.android.bindings.QtActivity;
	34
32	35
33	36	public class MainActivity extends QtActivity
34	37	{

41	44	private final MarginLayoutParams windowInsets = new MarginLayoutParams(0, 0);
42	45
43	46	private NfcForegroundDispatcher mNfcForegroundDispatcher;
	47
44	48	private static class NfcForegroundDispatcher
45	49	{
46	50	private final Activity mActivity;

153	157
154	158	mNfcForegroundDispatcher = new NfcForegroundDispatcher(this);
155	159
156		setRequestedOrientation(isTablet() ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
157
158	160	// Set statusBar/navigationBar color and handle systemWindowInsets
159	161	Window window = getWindow();
160	162	View rootView = window.getDecorView().findViewById(android.R.id.content);

168	170	rootView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE \| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
169	171	}
170	172	window.setStatusBarColor(Color.TRANSPARENT);
171		ViewCompat.setOnApplyWindowInsetsListener(rootView, new OnApplyWindowInsetsListener() {
172		public WindowInsetsCompat onApplyWindowInsets(View v, WindowInsetsCompat insets){
	173	ViewCompat.setOnApplyWindowInsetsListener(rootView, new OnApplyWindowInsetsListener()
	174	{
	175	public WindowInsetsCompat onApplyWindowInsets(View v, WindowInsetsCompat insets)
	176	{
173	177	windowInsets.topMargin = insets.getSystemWindowInsetTop();
174	178	windowInsets.leftMargin = insets.getSystemWindowInsetLeft();
175	179	windowInsets.rightMargin = insets.getSystemWindowInsetRight();

259	263	}
260	264
261	265
	266	public boolean openUrl(String pUrl, String pReferrer)
	267	{
	268	String packageName = pReferrer == null ? null : pReferrer.replace("android-app://", "");
	269	Intent intent = new Intent(Intent.ACTION_VIEW)
	270	.setData(Uri.parse(pUrl))
	271	.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
	272	.setPackage(packageName);
	273	try
	274	{
	275	startActivity(intent);
	276	Log.d(LOG_TAG, "Started Intent in browser with id " + packageName);
	277	}
	278	catch (ActivityNotFoundException e)
	279	{
	280	Log.e(LOG_TAG, "Couldn't open URL in browser with id " + packageName);
	281	return false;
	282	}
	283	return true;
	284	}
	285
	286
262	287	}

+1

-1

src/activation/internal/CMakeLists.txt less more

2	2	#
3	3	# If another module needs to start an authentication it can be
4	4	# invoked by the plugin.
5		# This will be used by interal usage of the SDK.
	5	# This will be used by internal usage of the SDK.
6	6	#####################################################################
7	7
8	8	ADD_PLATFORM_LIBRARY(AusweisAppActivationInternal)

+0

-2

src/card/base/CardConnection.h less more

86	86	return resultConnection;
87	87	}
88	88
89
90	89	private Q_SLOTS:
91	90	void onReaderInfoChanged(const ReaderInfo& pReaderInfo);
92	91

205	204	return call(command, pReceiver, pFunc);
206	205	}
207	206
208
209	207	Q_SIGNALS:
210	208	void fireReaderInfoChanged(const ReaderInfo& pReaderInfo);
211	209	};

+0

-1

src/card/base/InputAPDUInfo.h less more

47	47	mAcceptableStatusCodes += pStatusCodeAsHex;
48	48	}
49	49
50
51	50	private:
52	51	QByteArray mInputApdu;
53	52	QByteArrayList mAcceptableStatusCodes;

+0

-1

src/card/base/ReaderManagerPlugIn.h less more

58	58	mInfo.setValue(pKey, pValue);
59	59	}
60	60
61
62	61	public:
63	62	ReaderManagerPlugIn(ReaderManagerPlugInType pPlugInType,
64	63	bool pAvailable = false,

+0

-1

src/card/base/ReaderManagerPlugInInfo.h less more

95	95	mResponding = pResponding;
96	96	}
97	97
98
99	98	private:
100	99	ReaderManagerPlugInType mType;
101	100	QMap<Key, QVariant> mValues;

+9

-0

src/card/base/asn1/ASN1TemplateUtil.h less more

11	11	#include <QByteArray>
12	12	#include <QLoggingCategory>
13	13	#include <QSharedPointer>
	14
	15	#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
	16	#include <QScopeGuard>
	17	#else
	18	#include "ScopeGuard.h"
	19	#endif
14	20
15	21	Q_DECLARE_LOGGING_CATEGORY(card)
16	22

64	70	ERR_clear_error();
65	71	unsigned char* encoded = nullptr;
66	72	const int length = encodeAsn1Object(pObject, &encoded);
	73	const auto guard = qScopeGuard([encoded] {
	74	OPENSSL_free(encoded);
	75	});
67	76	if (length < 0)
68	77	{
69	78	qCWarning(card) << "Cannot encode ASN.1 object:" << getOpenSslError();

+13

-5

src/card/base/asn1/CVCertificate.cpp less more

55	55	{
56	56	if (auto cvc = reinterpret_cast<cvcertificate_st>(pVal))
57	57	{
58		cvc->mEcdsaSignature = EcUtil::create(ECDSA_SIG_new());
	58	cvc->mEcdsaSignature = ECDSA_SIG_new();
59	59	QByteArray sigValue = Asn1OctetStringUtil::getValue(cvc->mSignature);
60	60
61	61	const auto* const sig = reinterpret_cast<const unsigned char*>(sigValue.data());

65	65	BIGNUM* s = BN_bin2bn(sig + (siglen / 2), siglen / 2, nullptr);
66	66
67	67	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
68		cvc->mEcdsaSignature.data()->r = r;
69		cvc->mEcdsaSignature.data()->s = s;
	68	cvc->mEcdsaSignature->r = r;
	69	cvc->mEcdsaSignature->s = s;
70	70	#else
71		ECDSA_SIG_set0(cvc->mEcdsaSignature.data(), r, s);
	71	ECDSA_SIG_set0(cvc->mEcdsaSignature, r, s);
72	72	#endif
73	73	}
74	74	}
	75	else if (pOperation == ASN1_OP_FREE_POST)
	76	{
	77	if (auto cvc = reinterpret_cast<cvcertificate_st>(pVal))
	78	{
	79	ECDSA_SIG_free(cvc->mEcdsaSignature);
	80	}
	81	}
	82
75	83	return CB_SUCCESS;
76	84	}
77	85

116	124	}
117	125
118	126
119		QSharedPointer<const ECDSA_SIG> CVCertificate::getEcdsaSignature() const
	127	const ECDSA_SIG* CVCertificate::getEcdsaSignature() const
120	128	{
121	129	return mEcdsaSignature;
122	130	}

+4

-4

src/card/base/asn1/CVCertificate.h less more

46	46	{
47	47	CVCertificateBody* mBody;
48	48	SIGNATURE* mSignature;
49		QSharedPointer<ECDSA_SIG> mEcdsaSignature;
	49	ECDSA_SIG* mEcdsaSignature;
50	50
51		static QVector<QSharedPointer<const cvcertificate_st> > fromHex(const QByteArrayList& pHexByteList);
	51	static QVector<QSharedPointer<const cvcertificate_st>> fromHex(const QByteArrayList& pHexByteList);
52	52	static QSharedPointer<const cvcertificate_st> fromHex(const QByteArray& pHexBytes);
53	53	QByteArray encode() const;
54	54
55	55	const CVCertificateBody& getBody() const;
56	56	QByteArray getRawBody() const;
57		QSharedPointer<const ECDSA_SIG> getEcdsaSignature() const;
	57	const ECDSA_SIG* getEcdsaSignature() const;
58	58	QByteArray getRawSignature() const;
59	59
60	60	bool isValidOn(const QDateTime& pValidationDate) const;

85	85	QDebug operator<<(QDebug pDbg, const governikus::CVCertificate& pCvc);
86	86	QDebug operator<<(QDebug pDbg, const QSharedPointer<const governikus::CVCertificate>& pCvc);
87	87	QDebug operator<<(QDebug pDbg, QSharedPointer<governikus::CVCertificate>& pCvc);
88		QDebug operator<<(QDebug pDbg, const QVector<QSharedPointer<governikus::CVCertificate> >& pCvcs);
	88	QDebug operator<<(QDebug pDbg, const QVector<QSharedPointer<governikus::CVCertificate>>& pCvcs);

+2

-2

src/card/base/asn1/CVCertificateChain.h less more

17	17	{
18	18
19	19	class CVCertificateChain
20		: public QVector<QSharedPointer<const CVCertificate> >
	20	: public QVector<QSharedPointer<const CVCertificate>>
21	21	{
22	22	private:
23	23	bool mProductive;
24	24
25	25	public:
26	26	explicit CVCertificateChain(bool pProductive = true);
27		explicit CVCertificateChain(const QVector<QSharedPointer<const CVCertificate> >& pCvcs, bool pProductive);
	27	explicit CVCertificateChain(const QVector<QSharedPointer<const CVCertificate>>& pCvcs, bool pProductive);
28	28
29	29	/*!
30	30	* Return the document verifier certificate.

+2

-2

src/card/base/asn1/CVCertificateChainBuilder.h less more

15	15	{
16	16
17	17	class CVCertificateChainBuilder
18		: private ChainBuilder<QSharedPointer<const CVCertificate> >
	18	: private ChainBuilder<QSharedPointer<const CVCertificate>>
19	19	{
20	20	private:
21	21	bool mProductive;

32	32	/*!
33	33	* Creates a new instance. All chains are build using the CVCs passed in as parameter.
34	34	*/
35		explicit CVCertificateChainBuilder(const QVector<QSharedPointer<const CVCertificate> >& pCvcPool, bool pProductive);
	35	explicit CVCertificateChainBuilder(const QVector<QSharedPointer<const CVCertificate>>& pCvcPool, bool pProductive);
36	36
37	37
38	38	/*!

+2

-3

src/card/base/asn1/ChainBuilder.h less more

22	22	class ChainBuilder
23	23	{
24	24	protected:
25		QVector<QVector<T> > mChains;
	25	QVector<QVector<T>> mChains;
26	26
27	27	private:
28	28	std::function<bool(const T& pChild, const T& pParent)> mIsChildFunc;

73	73	return false;
74	74	}
75	75
76
77	76	public:
78	77	ChainBuilder(const QVector<T>& pAllElements, const std::function<bool(const T& pChild, const T& pParent)>& pIsChildFunc)
79	78	: mChains()

90	89	}
91	90
92	91
93		const QVector<QVector<T> >& getChains() const
	92	const QVector<QVector<T>>& getChains() const
94	93	{
95	94	return mChains;
96	95	}

+24

-4

src/card/base/asn1/EcdsaPublicKey.cpp less more

8	8
9	9	#include <openssl/evp.h>
10	10	#include <QLoggingCategory>
	11
	12	#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
	13	#include <QScopeGuard>
	14	#else
	15	#include "ScopeGuard.h"
	16	#endif
11	17
12	18
13	19	using namespace governikus;

44	50	}
45	51	}
46	52	}
	53	else if (pOperation == ASN1_OP_FREE_POST)
	54	{
	55	if (auto ecdsaPublicKey = reinterpret_cast<EcdsaPublicKey>(pVal))
	56	{
	57	EC_KEY_free(ecdsaPublicKey->mEcKey);
	58	}
	59	}
	60
47	61	return CB_SUCCESS;
48	62	}
49	63

112	126	}
113	127
114	128
115		QSharedPointer<const EC_KEY> EcdsaPublicKey::getEcKey() const
	129	const EC_KEY* EcdsaPublicKey::getEcKey() const
116	130	{
117	131	return mEcKey;
118	132	}

184	198	return;
185	199	}
186	200
187		QSharedPointer<EC_KEY> ecKey = EcUtil::create(EC_KEY_new());
188		if (!EC_KEY_set_group(ecKey.data(), group.data()))
	201	EC_KEY* ecKey = EC_KEY_new();
	202	auto guard = qScopeGuard([ecKey] {
	203	EC_KEY_free(ecKey);
	204	});
	205
	206	if (!EC_KEY_set_group(ecKey, group.data()))
189	207	{
190	208	qCCritical(card) << "Cannot set group";
191	209	return;

197	215	qCCritical(card) << "Cannot convert public point";
198	216	return;
199	217	}
200		if (!EC_KEY_set_public_key(ecKey.data(), publicPoint.data()))
	218	if (!EC_KEY_set_public_key(ecKey, publicPoint.data()))
201	219	{
202	220	qCCritical(card) << "Cannot set public key";
203	221	return;
204	222	}
	223
	224	guard.dismiss();
205	225	mEcKey = ecKey;
206	226	}

+2

-2

src/card/base/asn1/EcdsaPublicKey.h less more

45	45	ASN1_OCTET_STRING* mOrderOfTheBasePoint;
46	46	ASN1_OCTET_STRING* mPublicPoint;
47	47	ASN1_OCTET_STRING* mCofactor;
48		QSharedPointer<EC_KEY> mEcKey;
	48	EC_KEY* mEcKey;
49	49
50	50	static QSharedPointer<ecdsapublickey_st> fromHex(const QByteArray& pHexValue);
51	51	static QSharedPointer<ecdsapublickey_st> decode(const QByteArray& pBytes);

58	58	*/
59	59	QByteArray getPublicKeyOidValueBytes() const;
60	60	QByteArray getUncompressedPublicPoint() const;
61		QSharedPointer<const EC_KEY> getEcKey() const;
	61	const EC_KEY* getEcKey() const;
62	62
63	63	private:
64	64	void initEcKey();

+9

-9

src/card/base/asn1/SecurityInfos.h less more

32	32	friend class QSharedPointer<SecurityInfos>;
33	33
34	34	const QByteArray mContentBytes;
35		const QVector<QSharedPointer<const SecurityInfo> > mSecurityInfos;
36		const QVector<QSharedPointer<const PaceInfo> > mPaceInfos;
37		const QVector<QSharedPointer<const ChipAuthenticationInfo> > mChipAuthenticationInfos;
	35	const QVector<QSharedPointer<const SecurityInfo>> mSecurityInfos;
	36	const QVector<QSharedPointer<const PaceInfo>> mPaceInfos;
	37	const QVector<QSharedPointer<const ChipAuthenticationInfo>> mChipAuthenticationInfos;
38	38
39	39	SecurityInfos(const QByteArray& pBytes,
40		const QVector<QSharedPointer<const SecurityInfo> >& pSecurityInfos,
41		const QVector<QSharedPointer<const PaceInfo> >& pPaceInfos,
42		const QVector<QSharedPointer<const ChipAuthenticationInfo> >& pChipAuthenticationInfos);
	40	const QVector<QSharedPointer<const SecurityInfo>>& pSecurityInfos,
	41	const QVector<QSharedPointer<const PaceInfo>>& pPaceInfos,
	42	const QVector<QSharedPointer<const ChipAuthenticationInfo>>& pChipAuthenticationInfos);
43	43
44	44	public:
45	45	static QSharedPointer<SecurityInfos> fromHex(const QByteArray& pHexString);
46	46	static QSharedPointer<SecurityInfos> decode(const QByteArray& pBytes);
47	47
48	48	const QByteArray& getContentBytes() const;
49		const QVector<QSharedPointer<const SecurityInfo> >& getSecurityInfos() const;
50		const QVector<QSharedPointer<const PaceInfo> >& getPaceInfos() const;
51		const QVector<QSharedPointer<const ChipAuthenticationInfo> >& getChipAuthenticationInfos() const;
	49	const QVector<QSharedPointer<const SecurityInfo>>& getSecurityInfos() const;
	50	const QVector<QSharedPointer<const PaceInfo>>& getPaceInfos() const;
	51	const QVector<QSharedPointer<const ChipAuthenticationInfo>>& getChipAuthenticationInfos() const;
52	52	};
53	53
54	54

+13

-3

src/card/base/asn1/SignatureChecker.cpp less more

9	9	#include <openssl/ecdsa.h>
10	10	#include <openssl/err.h>
11	11	#include <QLoggingCategory>
	12
	13	#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
	14	#include <QScopeGuard>
	15	#else
	16	#include "ScopeGuard.h"
	17	#endif
12	18
13	19	using namespace governikus;
14	20

31	37	}
32	38
33	39	auto signingCert = mCertificateChain.at(0);
34		QSharedPointer<const EC_KEY> key = signingCert->getBody().getPublicKey().getEcKey();
	40	const EC_KEY* key = signingCert->getBody().getPublicKey().getEcKey();
35	41	if (!key)
36	42	{
37	43	qCCritical(card) << "No elliptic curve parameters";

40	46
41	47	for (const auto& cert : mCertificateChain)
42	48	{
43		if (!checkSignature(cert, signingCert, key.data()))
	49	if (!checkSignature(cert, signingCert, key))
44	50	{
45	51	qCCritical(card) << "Certificate verification failed:" << cert->getBody().getCertificateHolderReference();
46	52	return false;

69	75	const auto uncompPublicPointLen = static_cast<size_t>(uncompPublicPoint.size());
70	76
71	77	EC_POINT* publicPoint = EC_POINT_new(EC_KEY_get0_group(signingKey.data()));
	78	const auto guard = qScopeGuard([publicPoint] {
	79	EC_POINT_free(publicPoint);
	80	});
	81
72	82	const EC_GROUP* ecGroup = EC_KEY_get0_group(signingKey.data());
73	83	if (!EC_POINT_oct2point(ecGroup, publicPoint, uncompPublicPointData, uncompPublicPointLen, nullptr))
74	84	{

80	90	const QByteArray bodyHash = QCryptographicHash::hash(pCert->getRawBody(), pSigningCert->getBody().getHashAlgorithm());
81	91	const auto* const dgst = reinterpret_cast<const unsigned char*>(bodyHash.constData());
82	92	const int dgstlen = bodyHash.size();
83		const int result = ECDSA_do_verify(dgst, dgstlen, pCert->getEcdsaSignature().data(), signingKey.data());
	93	const int result = ECDSA_do_verify(dgst, dgstlen, pCert->getEcdsaSignature(), signingKey.data());
84	94
85	95	if (result == -1)
86	96	{

+2

-2

src/card/base/asn1/SignatureChecker.h less more

14	14	class SignatureChecker
15	15	{
16	16	private:
17		const QVector<QSharedPointer<const CVCertificate> > mCertificateChain;
	17	const QVector<QSharedPointer<const CVCertificate>> mCertificateChain;
18	18
19	19	bool checkSignature(const QSharedPointer<const CVCertificate>& pCert, const QSharedPointer<const CVCertificate>& pSigningCert, const EC_KEY* pKey);
20	20
21	21	public:
22		explicit SignatureChecker(const QVector<QSharedPointer<const CVCertificate> >& pCertificateChain);
	22	explicit SignatureChecker(const QVector<QSharedPointer<const CVCertificate>>& pCertificateChain);
23	23	~SignatureChecker() = default;
24	24
25	25	bool check();

+0

-1

src/card/base/command/BaseCardCommand.h less more

41	41	return mReturnCode;
42	42	}
43	43
44
45	44	Q_SIGNALS:
46	45	void commandDone(QSharedPointer<BaseCardCommand> pCommand);
47	46	};

+3

-3

src/card/base/pace/ec/EcdhKeyAgreement.h less more

23	23	private:
24	24	friend class ::test_EcdhKeyAgreement;
25	25
26		QSharedPointer<DomainParameterMapping<EC_GROUP> > mMapping;
	26	QSharedPointer<DomainParameterMapping<EC_GROUP>> mMapping;
27	27	QSharedPointer<EC_GROUP> mEphemeralCurve;
28	28	QSharedPointer<EC_POINT> mTerminalPublicKey;
29	29	QSharedPointer<const EC_POINT> mCardPublicKey;
30	30
31		QPair<CardReturnCode, QSharedPointer<EC_GROUP> > determineEphemeralDomainParameters(const QByteArray& pNonce);
32		QPair<CardReturnCode, QSharedPointer<EC_POINT> > performKeyExchange(const QSharedPointer<const EC_GROUP>& pCurve);
	31	QPair<CardReturnCode, QSharedPointer<EC_GROUP>> determineEphemeralDomainParameters(const QByteArray& pNonce);
	32	QPair<CardReturnCode, QSharedPointer<EC_POINT>> performKeyExchange(const QSharedPointer<const EC_GROUP>& pCurve);
33	33
34	34	static QByteArray encodeUncompressedPublicKey(const QSharedPointer<const PaceInfo>& pPaceInfo, const QSharedPointer<const EC_GROUP>& pCurve, const QSharedPointer<const EC_POINT>& pPoint);
35	35	static QByteArray encodeCompressedPublicKey(const QSharedPointer<const EC_GROUP>& pCurve, const QSharedPointer<const EC_POINT>& pPoint);

+1

-1

src/card/bluetooth/BluetoothReaderManagerPlugIn.h less more

31	31	BluetoothReaderManagerPlugInPrivate* const d_ptr;
32	32
33	33	QBluetoothDeviceDiscoveryAgent mDeviceDiscoveryAgent;
34		QMap<QString, QSharedPointer<CyberJackWaveDevice> > mInitializingDevices;
	34	QMap<QString, QSharedPointer<CyberJackWaveDevice>> mInitializingDevices;
35	35	QMap<QString, BluetoothReader*> mReaders;
36	36	QMap<QString, int> mPendingConnections;
37	37	QStringList mReadersDiscoveredInCurrentScan;

+1

-1

src/card/bluetooth/messages/BluetoothMessage.cpp less more

50	50	qCWarning(bluetooth) << "Parameter ID is already added:" << pMessageParameter->getParameterId();
51	51	}
52	52
53		mMessageParameter.insertMulti(pMessageParameter->getParameterId(), pMessageParameter);
	53	mMessageParameter.insert(pMessageParameter->getParameterId(), pMessageParameter);
54	54	}
55	55
56	56

+2

-2

src/card/bluetooth/messages/BluetoothMessage.h less more

7	7
8	8	#include "parameter/BluetoothMessageParameter.h"
9	9
	10	#include <QMultiMap>
10	11	#include <QSharedPointer>
11		#include <QVector>
12	12
13	13	class test_BluetoothMessageParser;
14	14

20	20	private:
21	21	friend class ::test_BluetoothMessageParser;
22	22	BluetoothMsgId mMsgId;
23		QMap<BluetoothParamId, QSharedPointer<const BluetoothMessageParameter> > mMessageParameter;
	23	QMultiMap<BluetoothParamId, QSharedPointer<const BluetoothMessageParameter>> mMessageParameter;
24	24
25	25	protected:
26	26	QSharedPointer<const BluetoothMessageParameter> getParameter(BluetoothParamId pId) const;

+2

-2

src/card/bluetooth/messages/BluetoothMessageParser.h less more

13	13	class BluetoothMessageParser
14	14	{
15	15	private:
16		QVector<QSharedPointer<const BluetoothMessage> > mMessages;
	16	QVector<QSharedPointer<const BluetoothMessage>> mMessages;
17	17	QByteArray mRemainingBytes;
18	18
19	19	inline ushort getParamLength(uchar pHigh, uchar pLow) const;

27	27	BluetoothMessageParser(const QByteArray& pData);
28	28	virtual ~BluetoothMessageParser();
29	29
30		const QVector<QSharedPointer<const BluetoothMessage> >& getMessages() const;
	30	const QVector<QSharedPointer<const BluetoothMessage>>& getMessages() const;
31	31	const QByteArray& getRemainingBytes() const;
32	32	};
33	33

+0

-1

src/card/bluetooth/messages/parameter/BluetoothMessageParameter.h less more

49	49	return false;
50	50	}
51	51
52
53	52	public:
54	53	BluetoothMessageParameter(BluetoothParamId pParamId, const QByteArray& pValue);
55	54	virtual ~BluetoothMessageParameter();

+1

-1

src/card/drivers/ReaderDetector_linux.cpp less more

80	80	}
81	81	}
82	82
83
84	83	public:
85	84	DeviceListener()
86	85	{

106	105	#endif
107	106
108	107	public:
	108
109	109	Q_SIGNALS:
110	110	void fireDeviceChangeDetected();
111	111	};

+1

-1

src/card/ios/IosCard.mm less more

143	143	const QWeakPointer<QByteArray> weakBuffer = resultBuffer;
144	144
145	145	Q_ASSERT([mCard->mNfcTag conformsToProtocol:@protocol(NFCISO7816Tag)]);
146		const auto tag = static_cast<id<NFCISO7816Tag> >(mCard->mNfcTag);
	146	const auto tag = static_cast<id<NFCISO7816Tag>>(mCard->mNfcTag);
147	147	auto* apdu = [[NFCISO7816APDU alloc] initWithData: pCmd.getBuffer().toNSData()];
148	148	[tag sendCommandAPDU: apdu completionHandler: ^(NSData* responseData, uint8_t sw1, uint8_t sw2, NSError* error){
149	149	// By referencing weakBuffer here, it will be copied into the Block. If the handler outlives the caller, resultBuffer won't exist anymore.

+2

-2

src/card/ios/IosReaderDelegateImpl.mm less more

94	94	}
95	95
96	96
97		- (void) tagReaderSession: (NFCTagReaderSession)session didDetectTags:(NSArray<__kindof id<NFCTag> >)tags {
	97	- (void) tagReaderSession: (NFCTagReaderSession)session didDetectTags:(NSArray<__kindof id<NFCTag>>)tags {
98	98	qCDebug(card_nfc) << "New tag detected";
99	99
100	100	if (session != self.mSession)

117	117	return;
118	118	}
119	119
120		self.mDelegate->onTagDiscovered(new governikus::IosCard(new governikus::IosCardPointer {tags[0]}));
	120	self.mDelegate->onTagDiscovered(new governikus::IosCard(new governikus::IosCardPointer{tags[0]}));
121	121	}
122	122
123	123

+0

-6

src/card/nfc/NfcCard.cpp less more

121	121	return {CardReturnCode::COMMAND_FAILED};
122	122	}
123	123
124		if (!mNearFieldTarget->waitForRequestCompleted(id, 1500))
125		{
126		qCWarning(card_nfc) << "Transmit timeout reached";
127		return {CardReturnCode::COMMAND_FAILED};
128		}
129
130	124	QVariant response = mNearFieldTarget->requestResponse(id);
131	125	if (!response.isValid())
132	126	{

+4

-0

src/configuration/ProviderConfiguration.cpp less more

10	10	#include <QFile>
11	11	#include <QLoggingCategory>
12	12	#include <QRegularExpression>
	13
	14	#include <algorithm>
13	15
14	16
15	17	using namespace governikus;

54	56
55	57	mCallCosts = callCosts;
56	58	mProviderConfigurationInfos = providerConfigurationInfos;
	59	std::sort(mProviderConfigurationInfos.begin(), mProviderConfigurationInfos.end());
57	60	return true;
58	61	}
59	62

79	82	, mCallCosts()
80	83	{
81	84	connect(mUpdatableFile.data(), &UpdatableFile::fireUpdated, this, &ProviderConfiguration::onFileUpdated);
	85	connect(mUpdatableFile.data(), &UpdatableFile::fireNoUpdateAvailable, this, &ProviderConfiguration::fireNoUpdateAvailable);
82	86	parseProviderConfiguration();
83	87	}
84	88

+1

-0

src/configuration/ProviderConfiguration.h less more

49	49
50	50	Q_SIGNALS:
51	51	void fireUpdated();
	52	void fireNoUpdateAvailable();
52	53	};
53	54
54	55

+18

-3

src/configuration/ProviderConfigurationInfo.cpp less more

37	37	const QString& pImage,
38	38	const QString& pTcTokenUrl,
39	39	const QString& pClientUrl,
40		const QStringList& pSubjectUrls)
	40	const QStringList& pSubjectUrls,
	41	const QString& pSubjectUrlInfo)
41	42	: d(new InternalInfo(pShortName, pLongName, pShortDescription, pLongDescription, pAddress, pHomepage,
42		pCategory, pPhone, pEmail, pPostalAddress, pIcon, pImage, pTcTokenUrl, pClientUrl, pSubjectUrls))
	43	pCategory, pPhone, pEmail, pPostalAddress, pIcon, pImage, pTcTokenUrl, pClientUrl, pSubjectUrls, pSubjectUrlInfo))
43	44	{
44	45	}
45	46

52	53	void ProviderConfigurationInfo::setTcTokenUrl(const QString& pTcTokenUrl)
53	54	{
54	55	d = new InternalInfo(d->mShortName, d->mLongName, d->mShortDescription, d->mLongDescription, d->mAddress, d->mHomepage,
55		d->mCategory, d->mPhone, d->mEmail, d->mPostalAddress, d->mIcon, d->mImage, pTcTokenUrl, d->mClientUrl, d->mSubjectUrls);
	56	d->mCategory, d->mPhone, d->mEmail, d->mPostalAddress, d->mIcon, d->mImage, pTcTokenUrl, d->mClientUrl, d->mSubjectUrls, d->mSubjectUrlInfo);
56	57	}
57	58
58	59
59	60	bool ProviderConfigurationInfo::operator ==(const ProviderConfigurationInfo& pOther) const
60	61	{
61	62	return d == pOther.d;
	63	}
	64
	65
	66	bool ProviderConfigurationInfo::operator <(const ProviderConfigurationInfo& pOther) const
	67	{
	68	const QString myName = getLongName().isEmpty() ? getShortName() : getLongName();
	69	const QString otherName = pOther.getLongName().isEmpty() ? pOther.getShortName() : pOther.getLongName();
	70	return myName.compare(otherName, Qt::CaseInsensitive) < 0;
62	71	}
63	72
64	73

191	200	{
192	201	return d->mSubjectUrls;
193	202	}
	203
	204
	205	const QString& ProviderConfigurationInfo::getSubjectUrlInfo() const
	206	{
	207	return d->mSubjectUrlInfo;
	208	}

+11

-3

src/configuration/ProviderConfigurationInfo.h less more

40	40	const QString mTcTokenUrl;
41	41	const QString mClientUrl;
42	42	const QStringList mSubjectUrls;
	43	const QString mSubjectUrlInfo;
43	44
44	45	InternalInfo(const LanguageString& pShortName,
45	46	const LanguageString& pLongName,

55	56	const QString& pImage,
56	57	const QString& pTcTokenUrl,
57	58	const QString& pClientUrl,
58		const QStringList& pSubjectUrls = QStringList())
	59	const QStringList& pSubjectUrls,
	60	const QString& pSubjectUrlInfo)
59	61	: mShortName(pShortName)
60	62	, mLongName(pLongName)
61	63	, mShortDescription(pShortDescription)

71	73	, mTcTokenUrl(pTcTokenUrl)
72	74	, mClientUrl(pClientUrl)
73	75	, mSubjectUrls(pSubjectUrls)
	76	, mSubjectUrlInfo(pSubjectUrlInfo)
74	77	{
75	78	}
76	79

90	93	mIcon == pOther.mIcon &&
91	94	mImage == pOther.mImage &&
92	95	mTcTokenUrl == pOther.mTcTokenUrl &&
93		mClientUrl == pOther.mClientUrl;
	96	mClientUrl == pOther.mClientUrl &&
	97	mSubjectUrls == pOther.mSubjectUrls &&
	98	mSubjectUrlInfo == pOther.mSubjectUrlInfo;
94	99	}
95	100
96	101

115	120	const QString& pImage = QString(),
116	121	const QString& pTcTokenUrl = QString(),
117	122	const QString& pClientUrl = QString(),
118		const QStringList& pSubjectUrls = QStringList());
	123	const QStringList& pSubjectUrls = QStringList(),
	124	const QString& pSubjectUrlInfo = QString());
119	125	virtual ~ProviderConfigurationInfo();
120	126
121	127	void setTcTokenUrl(const QString& pTcTokenUrl);
122	128
123	129	bool operator ==(const ProviderConfigurationInfo& pOther) const;
	130	bool operator <(const ProviderConfigurationInfo& pOther) const;
124	131	bool matchWithSubjectUrl(const QString& pSubjectUrl) const;
125	132
126	133	const LanguageString& getShortName() const;

140	147	QUrl getTcTokenUrl() const;
141	148	QUrl getClientUrl() const;
142	149	const QStringList& getSubjectUrls() const;
	150	const QString& getSubjectUrlInfo() const;
143	151	};
144	152
145	153

+2

-1

src/configuration/ProviderConfigurationParser.cpp less more

104	104	prov[QLatin1String("image")].toString(),
105	105	prov[QLatin1String("tcTokenUrl")].toString(),
106	106	prov[QLatin1String("clientUrl")].toString(),
107		prov[QLatin1String("subjectUrls")].toVariant().toStringList());
	107	prov[QLatin1String("subjectUrls")].toVariant().toStringList(),
	108	prov[QLatin1String("subjectUrlInfo")].toString());
108	109	}
109	110
110	111	return providers;

+2

-2

src/core/DiagnosisAntivirusDetection.h less more

59	59	#if defined(Q_OS_WIN)
60	60	QSharedPointer<QProcess> mProcess;
61	61	#endif
62		QVector<QSharedPointer<AntivirInfo> > mAntivirInfos;
	62	QVector<QSharedPointer<AntivirInfo>> mAntivirInfos;
63	63	void parseAntivirInfos(const QString& pAntivirInfos);
64	64
65	65	private Q_SLOTS:

75	75	public:
76	76	DiagnosisAntivirusDetection();
77	77	void startInformationProcess();
78		const QVector<QSharedPointer<AntivirInfo> >& getAntivirusInformations() const;
	78	const QVector<QSharedPointer<AntivirInfo>>& getAntivirusInformations() const;
79	79	};
80	80
81	81	} // namespace governikus

+12

-0

src/core/DiagnosisConnectionTest.cpp less more

181	181	mPingSocketToProxy.reset();
182	182	mPingSocketToProxy.setProxy(QNetworkProxy::NoProxy);
183	183	connect(&mPingSocketToProxy, &QTcpSocket::connected, this, &DiagnosisConnectionTest::onProxyPingTestDone);
	184	#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
	185	connect(&mPingSocketToProxy, &QTcpSocket::errorOccurred, this, &DiagnosisConnectionTest::onProxyPingTestError);
	186	#else
184	187	connect(&mPingSocketToProxy, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &DiagnosisConnectionTest::onProxyPingTestError);
	188	#endif
185	189	mPingSocketToProxy.connectToHost(proxy.hostName(), proxy.port());
186	190
187	191	mTcpSocketWithProxy.reset();
188	192	mTcpSocketWithProxy.setProxy(proxy);
189	193	connect(&mTcpSocketWithProxy, &QTcpSocket::connected, this, &DiagnosisConnectionTest::onSocketConnectionTestWithProxyDone);
	194	#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
	195	connect(&mTcpSocketWithProxy, &QTcpSocket::errorOccurred, this, &DiagnosisConnectionTest::onSocketConnectionTestWithProxyError);
	196	#else
190	197	connect(&mTcpSocketWithProxy, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &DiagnosisConnectionTest::onSocketConnectionTestWithProxyError);
	198	#endif
191	199	mTcpSocketWithProxy.connectToHost(testUrl.host(), 443);
192	200	}
193	201
194	202	mTcpSocketWithoutProxy.reset();
195	203	mTcpSocketWithoutProxy.setProxy(QNetworkProxy::NoProxy);
196	204	connect(&mTcpSocketWithoutProxy, &QTcpSocket::connected, this, &DiagnosisConnectionTest::onSocketConnectionTestWithoutProxyDone);
	205	#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
	206	connect(&mTcpSocketWithoutProxy, &QTcpSocket::errorOccurred, this, &DiagnosisConnectionTest::onSocketConnectionTestWithoutProxyError);
	207	#else
197	208	connect(&mTcpSocketWithoutProxy, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &DiagnosisConnectionTest::onSocketConnectionTestWithoutProxyError);
	209	#endif
198	210	mTcpSocketWithoutProxy.connectToHost(testUrl.host(), 443);
199	211	}

+0

-1

src/core/DiagnosisConnectionTest.h less more

109	109	return mPingTestOnProxySuccessful;
110	110	}
111	111
112
113	112	Q_SIGNALS:
114	113	void fireConnectionTestDone();
115	114	};

+4

-8

src/core/DiagnosisFirewallDetection.cpp less more

95	95	{
96	96	continue;
97	97	}
98		if (lineparts[0].startsWith(QLatin1String("Name")))
99		{
100		if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows8 && lineparts[1].startsWith(QLatin1String("AusweisApp2-Firewall-Rule-SaC-In")))
101		{
102		mSecondFirewallRuleExists = true;
103		}
104		else if (lineparts[1].startsWith(QLatin1String("AusweisApp2-Firewall-Rule-In")))
	98	if (lineparts[0].startsWith(QLatin1String("Name")) \|\| lineparts[0].startsWith(QLatin1String("DisplayName")))
	99	{
	100	if (lineparts[1].startsWith(QLatin1String("AusweisApp2-Firewall-Rule-SaC-In")))
105	101	{
106	102	mSecondFirewallRuleExists = true;
107	103	}

328	324	}
329	325	else
330	326	{
331		secondRuleParameters << QStringLiteral("Get-NetFirewallRule -Name \"AusweisApp2-Firewall-Rule-In\"");
	327	secondRuleParameters << QStringLiteral("Get-NetFirewallRule -DisplayName \"AusweisApp2-Firewall-Rule-SaC-In\"");
332	328	}
333	329
334	330	connect(&mFirewallSecondRuleProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &DiagnosisFirewallDetection::onSecondRuleDone);

+4

-5

src/core/DiagnosisFirewallDetection.h less more

78	78	bool mFirstFirewallRuleEnabled;
79	79	bool mSecondFirewallRuleExists;
80	80	bool mSecondFirewallRuleEnabled;
81		QVector<QSharedPointer<FirewallSoftware> > mDetectedFirewalls;
82		QVector<QSharedPointer<FirewallProfile> > mFirewallProfiles;
	81	QVector<QSharedPointer<FirewallSoftware>> mDetectedFirewalls;
	82	QVector<QSharedPointer<FirewallProfile>> mFirewallProfiles;
83	83
84	84	bool mFirstRuleDone;
85	85	bool mSecondRuleDone;

133	133	}
134	134
135	135
136		const QVector<QSharedPointer<FirewallProfile> >& getFirewallProfiles() const
	136	const QVector<QSharedPointer<FirewallProfile>>& getFirewallProfiles() const
137	137	{
138	138	return mFirewallProfiles;
139	139	}
140	140
141	141
142		const QVector<QSharedPointer<FirewallSoftware> >& getDetectedFirewalls() const
	142	const QVector<QSharedPointer<FirewallSoftware>>& getDetectedFirewalls() const
143	143	{
144	144	return mDetectedFirewalls;
145	145	}
146
147	146
148	147	Q_SIGNALS:
149	148	void fireFirewallInformationReady();

+1

-1

src/core/DiagnosisItem.h less more

20	20
21	21	private:
22	22	QString mText;
23		QVector<QSharedPointer<DiagnosisItem> > mChildren;
	23	QVector<QSharedPointer<DiagnosisItem>> mChildren;
24	24	QSharedPointer<DiagnosisItem> mParent;
25	25
26	26	int getIndexOf(const DiagnosisItem* const pChild) const;

+29

-2

src/core/DiagnosisModel.cpp less more

18	18
19	19	DiagnosisModel::DiagnosisModel(const QSharedPointer<DiagnosisContext>& pContext)
20	20	: mContext(pContext)
	21	, mAntivirusSectionRunning(false)
	22	, mFirewallSectionRunning(false)
	23	, mCardReaderSectionRunning(false)
	24	, mPcscSectionRunning(false)
	25	, mRemoteDeviceSectionRunning(false)
21	26	{
22	27	reloadContent();
23	28	}

58	63	mPcscSection = QSharedPointer<SectionModel>::create();
59	64	mPcscSection->addTitleWithoutContent(tr("PC/SC driver information"));
60	65	mPcscSection->addItemWithoutTitle(tr("Diagnosis is running..."));
	66	mPcscSectionRunning = true;
61	67	mCardReaderSection = QSharedPointer<SectionModel>::create();
62	68	mCardReaderSection->addTitleWithoutContent(tr("Card reader"));
63	69	mCardReaderSection->addItemWithoutTitle(tr("Diagnosis is running..."));
	70	mCardReaderSectionRunning = true;
64	71	mRemoteDeviceSection = QSharedPointer<SectionModel>::create();
65	72	mRemoteDeviceSection->addTitleWithoutContent(tr("Paired smartphones"));
66	73	mRemoteDeviceSection->addItemWithoutTitle(tr("Diagnosis is running..."));
	74	mRemoteDeviceSectionRunning = true;
	75	Q_EMIT fireRunningChanged();
67	76	}
68	77
69	78

76	85	#ifdef Q_OS_WIN
77	86	mAntivirusSection->addTitleWithoutContent(tr("Antivirus information"));
78	87	mAntivirusSection->addItemWithoutTitle(tr("Diagnosis is running..."));
	88	mAntivirusSectionRunning = true;
79	89
80	90	mFirewallSection->addTitleWithoutContent(tr("Firewall information"));
81	91	mFirewallSection->addItemWithoutTitle(tr("Diagnosis is running..."));
	92	mFirewallSectionRunning = true;
	93	Q_EMIT fireRunningChanged();
82	94	#else
83	95	mAntivirusSection->addItemWithoutTitle(tr("No Antivirus information available on this platform."));
84	96	mFirewallSection->addItemWithoutTitle(tr("No Firewall information available on this platform."));

217	229	QString DiagnosisModel::boolToString(bool pBoolean)
218	230	{
219	231	return pBoolean ? tr("Yes") : tr("No");
	232	}
	233
	234
	235	bool DiagnosisModel::isRunning() const
	236	{
	237	return mAntivirusSectionRunning \|\| mFirewallSectionRunning \|\| mCardReaderSectionRunning \|\| mPcscSectionRunning \|\| mRemoteDeviceSectionRunning;
220	238	}
221	239
222	240

332	350	void DiagnosisModel::onAntivirusInformationChanged()
333	351	{
334	352	mAntivirusSection->removeAllItems();
	353	mAntivirusSectionRunning = false;
335	354
336	355	const auto& antivirusInfos = mAntivirusDetection.getAntivirusInformations();
337	356	if (antivirusInfos.isEmpty())

356	375	}
357	376
358	377	mCombinedAntivirusFirewallSection->replaceWithSections({mAntivirusSection, mFirewallSection});
	378	Q_EMIT fireRunningChanged();
359	379	}
360	380
361	381

370	390	void DiagnosisModel::onFirewallInformationReady()
371	391	{
372	392	mFirewallSection->removeAllItems();
	393	mFirewallSectionRunning = false;
373	394
374	395	mFirewallSection->addTitleWithoutContent(tr("Firewall information"));
375	396	auto installedFirewalls = mFirewallDetection.getDetectedFirewalls();

428	449	}
429	450
430	451	mFirewallSection->addItem(tr("Windows firewall profiles"), windowsFirewallProfiles.join(QStringLiteral("\n")));
431		mFirewallSection->addItemWithoutTitle(tr("Warning: The current firewall status can be obscured by additional Group Policies on your system, often set by system administrators."));
432	452
433	453	mCombinedAntivirusFirewallSection->replaceWithSections({mAntivirusSection, mFirewallSection});
	454	Q_EMIT fireRunningChanged();
434	455	}
435	456
436	457

445	466	void DiagnosisModel::onPcscInfoChanged()
446	467	{
447	468	mPcscSection->removeAllItems();
	469	mPcscSectionRunning = false;
448	470
449	471	mPcscSection->addTitleWithoutContent(tr("PC/SC information"));
450	472	mPcscSection->addItem(tr("Version"), mContext->getPcscVersion());

476	498	}
477	499
478	500	mCombinedReaderSection->replaceWithSections({mRemoteDeviceSection, mCardReaderSection, mPcscSection});
	501	Q_EMIT fireRunningChanged();
479	502	}
480	503
481	504
482	505	void DiagnosisModel::onRemoteInfosChanged()
483	506	{
484	507	mRemoteDeviceSection->removeAllItems();
	508	mRemoteDeviceSectionRunning = false;
485	509
486	510	const RemoteServiceSettings& settings = Env::getSingleton<AppSettings>()->getRemoteServiceSettings();
487	511	const auto& trustedCertificates = settings.getTrustedCertificates();

501	525	if (!info.getFingerprint().isEmpty())
502	526	{
503	527	const QString& timestamp = LanguageLoader::getInstance().getUsedLocale().toString(info.getLastConnected(), tr("dd.MM.yyyy, hh:mm:ss"));
504		mRemoteDeviceSection->addItem(info.getName(), tr("Last connection: %1").arg(timestamp));
	528	mRemoteDeviceSection->addItem(info.getNameEscaped(), tr("Last connection: %1").arg(timestamp));
505	529	}
506	530	else
507	531	{

510	534	}
511	535
512	536	mCombinedReaderSection->replaceWithSections({mRemoteDeviceSection, mCardReaderSection, mPcscSection});
	537	Q_EMIT fireRunningChanged();
513	538	}
514	539
515	540
516	541	void DiagnosisModel::onReaderInfosChanged()
517	542	{
518	543	mCardReaderSection->removeAllItems();
	544	mCardReaderSectionRunning = false;
519	545
520	546	mCardReaderSection->addTitleWithoutContent(tr("Connected Card reader"));
521	547

542	568	}
543	569
544	570	mCombinedReaderSection->replaceWithSections({mRemoteDeviceSection, mCardReaderSection, mPcscSection});
	571	Q_EMIT fireRunningChanged();
545	572	}
546	573
547	574

+12

-3

src/core/DiagnosisModel.h less more

49	49
50	50	private:
51	51	friend class ::test_DiagnosisModel;
52		QVector<QSharedPointer<ContentItem> > mContentItems;
	52	QVector<QSharedPointer<ContentItem>> mContentItems;
53	53
54	54	public:
55	55	explicit SectionModel(QObject* pParent = nullptr);

64	64	void addTitleWithoutContent(const QString& pTitle);
65	65	void removeAllItems();
66	66	void emitDataChangedForItem(const QSharedPointer<ContentItem>& pItem);
67		void replaceWithSections(QVector<QSharedPointer<SectionModel> > pSections);
	67	void replaceWithSections(QVector<QSharedPointer<SectionModel>> pSections);
68	68	QStringList getAsPlaintext(const QString& pPrependString = QString()) const;
69	69	};
70	70

76	76
77	77	private:
78	78	friend class ::test_DiagnosisModel;
79		QVector<QPair<QString, QSharedPointer<SectionModel> > > mSections;
	79	QVector<QPair<QString, QSharedPointer<SectionModel>>> mSections;
80	80	QSharedPointer<DiagnosisContext> mContext;
81	81	DiagnosisAntivirusDetection mAntivirusDetection;
82	82	DiagnosisFirewallDetection mFirewallDetection;

87	87	QSharedPointer<SectionModel> mCombinedNetworkSection;
88	88	QSharedPointer<SectionModel> mCombinedAntivirusFirewallSection;
89	89	QSharedPointer<SectionModel> mAntivirusSection;
	90	bool mAntivirusSectionRunning;
90	91	QSharedPointer<SectionModel> mFirewallSection;
	92	bool mFirewallSectionRunning;
91	93	QSharedPointer<SectionModel> mCombinedReaderSection;
92	94	QSharedPointer<SectionModel> mCardReaderSection;
	95	bool mCardReaderSectionRunning;
93	96	QSharedPointer<SectionModel> mPcscSection;
	97	bool mPcscSectionRunning;
94	98	QSharedPointer<SectionModel> mRemoteDeviceSection;
	99	bool mRemoteDeviceSectionRunning;
95	100
96	101	QSharedPointer<SectionModel> createAusweisApp2Section();
97	102	void createNetworkSection();

114	119	Q_INVOKABLE QString getCreationTimeString() const;
115	120	QString getAsPlaintext() const;
116	121	QString boolToString(bool pBoolean);
	122	bool isRunning() const;
	123
	124	Q_SIGNALS:
	125	void fireRunningChanged();
117	126
118	127	private Q_SLOTS:
119	128	void onTimestampChanged();

+1

-1

src/core/DiagnosisTreeModel.cpp less more

215	215
216	216	if (!info.getFingerprint().isEmpty())
217	217	{
218		const auto& deviceName = QSharedPointer<DiagnosisItem>::create(info.getName());
	218	const auto& deviceName = QSharedPointer<DiagnosisItem>::create(info.getNameEscaped());
219	219	mPairedDevices->addChild(deviceName);
220	220
221	221	const auto& deviceFingerprint = QSharedPointer<DiagnosisItem>::create((tr("Certificate fingerprint: %1").arg(info.getFingerprint())));

+1

-1

src/core/SelfAuthenticationData.h less more

57	57	class SelfAuthenticationData
58	58	{
59	59	public:
60		using OrderedSelfData = QVector<QPair<QString, QString> >;
	60	using OrderedSelfData = QVector<QPair<QString, QString>>;
61	61
62	62	private:
63	63	class SelfData

+2

-1

src/core/context/AuthContext.cpp less more

244	244	mTerminalCvc = pTerminalCvc;
245	245
246	246	const CHAT& terminalChat = mTerminalCvc->getBody().getCHAT();
247		bool canAllowed = terminalChat.getAccessRights().contains(AccessRight::CAN_ALLOWED);
	247	bool canAllowed = terminalChat.getAccessRights().contains(AccessRight::CAN_ALLOWED) &&
	248	(Env::getSingleton<AppSettings>()->isUsedAsSDK() \|\| Env::getSingleton<AppSettings>()->getGeneralSettings().isEnableCanAllowed());
248	249	setCanAllowedMode(canAllowed);
249	250	qDebug() << "CAN allowed mode:" << canAllowed;
250	251

+6

-6

src/core/context/AuthContext.h less more

76	76	QSharedPointer<DIDAuthenticateResponseEAC2> mDIDAuthenticateResponseEACAdditionalInputType;
77	77	QSharedPointer<DIDAuthenticateEACAdditional> mDIDAuthenticateEACAdditionalInputType;
78	78	QSharedPointer<DIDAuthenticateResponseEAC2> mDIDAuthenticateResponseEAC2;
79		QVector<QSharedPointer<Transmit> > mTransmits;
80		QVector<QSharedPointer<TransmitResponse> > mTransmitResponses;
	79	QVector<QSharedPointer<Transmit>> mTransmits;
	80	QVector<QSharedPointer<TransmitResponse>> mTransmitResponses;
81	81	QSharedPointer<Disconnect> mDisconnect;
82	82	QSharedPointer<DisconnectResponse> mDisconnectResponse;
83	83	QSharedPointer<StartPaosResponse> mStartPaosResponse;

168	168	{
169	169	QUrl originUrl = UrlUtil::getUrlOrigin(pUrl);
170	170	qDebug() << "Adding certificate CN=" << pCert.subjectInfo(QSslCertificate::CommonName) << "SN=" << pCert.serialNumber() << "for URL origin" << originUrl;
171		mCertificates.insertMulti(originUrl, pCert);
	171	mCertificates.insert(originUrl, pCert);
172	172	}
173	173
174	174

383	383	}
384	384
385	385
386		const QVector<QSharedPointer<TransmitResponse> >& getTransmitResponses()
	386	const QVector<QSharedPointer<TransmitResponse>>& getTransmitResponses()
387	387	{
388	388	return mTransmitResponses;
389	389	}

396	396	}
397	397
398	398
399		const QVector<QSharedPointer<Transmit> >& getTransmits()
	399	const QVector<QSharedPointer<Transmit>>& getTransmits()
400	400	{
401	401	return mTransmits;
402	402	}

472	472	CVCertificateChain getChainForCertificationAuthority(const EstablishPaceChannelOutput& pPaceOutput) const;
473	473
474	474
475		void initCvcChainBuilder(const QVector<QSharedPointer<const CVCertificate> >& pAdditionalCertificates = QVector<QSharedPointer<const CVCertificate> >());
	475	void initCvcChainBuilder(const QVector<QSharedPointer<const CVCertificate>>& pAdditionalCertificates = QVector<QSharedPointer<const CVCertificate>>());
476	476
477	477
478	478	const QSharedPointer<const CVCertificate>& getDvCvc() const

+0

-5

src/core/controller/AppController.cpp less more

107	107
108	108	ResourceLoader::getInstance().init();
109	109
110		#ifndef QT_NO_NETWORKPROXY
111	110	NetworkManager::setApplicationProxyFactory();
112	111	connect(Env::getSingleton<NetworkManager>(), &NetworkManager::fireProxyAuthenticationRequired, this, &AppController::fireProxyAuthenticationRequired);
113		#endif
114	112
115	113	connect(this, &AppController::fireShutdown, Env::getSingleton<NetworkManager>(), &NetworkManager::onShutdown, Qt::QueuedConnection);
116	114	}

505	503	connect(this, &AppController::fireApplicationActivated, pPlugin, &UIPlugIn::fireApplicationActivated);
506	504	connect(this, &AppController::fireUiDomination, pPlugin, &UIPlugIn::onUiDomination);
507	505	connect(this, &AppController::fireUiDominationReleased, pPlugin, &UIPlugIn::onUiDominationReleased);
508
509		#ifndef QT_NO_NETWORKPROXY
510	506	connect(this, &AppController::fireProxyAuthenticationRequired, pPlugin, &UIPlugIn::onProxyAuthenticationRequired);
511		#endif
512	507
513	508	connect(pPlugin, &UIPlugIn::fireChangePinRequest, this, &AppController::onChangePinRequested, Qt::QueuedConnection);
514	509	connect(pPlugin, &UIPlugIn::fireSelfAuthenticationRequested, this, &AppController::onSelfAuthenticationRequested, Qt::QueuedConnection);

+0

-2

src/core/controller/AppController.h less more

73	73	void fireHideUi();
74	74	void fireShowUserInformation(const QString& pInformationMessage);
75	75	void fireShowReaderSettings();
76		#ifndef QT_NO_NETWORKPROXY
77	76	void fireProxyAuthenticationRequired(const QNetworkProxy& pProxy, QAuthenticator* pAuthenticator);
78		#endif
79	77	void fireApplicationActivated();
80	78	void fireUiDomination(const UIPlugIn* pUi, const QString& pInformation, bool pAccepted);
81	79	void fireUiDominationReleased();

+0

-1

src/core/controller/AuthController.cpp less more

11	11	#include "states/StateParseTcTokenUrl.h"
12	12	#include "states/StateProcessing.h"
13	13	#include "states/StateRedirectBrowser.h"
14		#include "states/StateSelectPasswordId.h"
15	14	#include "states/StateSendWhitelistSurvey.h"
16	15	#include "states/StateWriteHistory.h"
17	16

+0

-2

src/core/controller/DiagnosisController_osx.mm less more

35	35	mLocation = getField(pData, QStringLiteral("location"));
36	36	mInstallTime = getField(pData, QStringLiteral("install-time"));
37	37	}
38
39	38
40	39	private:
41	40	QString getField(const QString& pData, const QString& pFieldName)

90	89	return !mIfdManufacturer.isEmpty();
91	90	}
92	91
93
94	92	private:
95	93	QString getField(const QSettings& pSettings, const QString& pFieldName)
96	94	{

+0

-1

src/core/controller/WorkflowController.h less more

43	43	return state;
44	44	}
45	45
46
47	46	Q_SIGNALS:
48	47	void fireComplete();
49	48

+2

-3

src/core/paos/element/Eac1InputType.h less more

26	26	friend class TestAuthContext;
27	27
28	28	private:
29		QVector<QSharedPointer<const CVCertificate> > mCvCertificates;
	29	QVector<QSharedPointer<const CVCertificate>> mCvCertificates;
30	30	QByteArray mCertificateDescriptionAsBinary;
31	31	QSharedPointer<const CertificateDescription> mCertificateDescription;
32	32	QSharedPointer<const CHAT> mRequiredChat, mOptionalChat;

81	81	mTransactionInfo = pTransactionInfo;
82	82	}
83	83
84
85	84	public:
86	85	Eac1InputType();
87	86	~Eac1InputType();

110	109	}
111	110
112	111
113		const QVector<QSharedPointer<const CVCertificate> >& getCvCertificates() const
	112	const QVector<QSharedPointer<const CVCertificate>>& getCvCertificates() const
114	113	{
115	114	return mCvCertificates;
116	115	}

+2

-2

src/core/paos/element/Eac2InputType.h less more

22	22
23	23	private:
24	24	QByteArrayList mCvCertificatesAsBinary;
25		QVector<QSharedPointer<const CVCertificate> > mCvCertificates;
	25	QVector<QSharedPointer<const CVCertificate>> mCvCertificates;
26	26	QString mSignature;
27	27	QString mEphemeralPublicKey;
28	28	void appendCvcert(const QSharedPointer<const CVCertificate>& pCert);

36	36
37	37	const QString& getSignature() const;
38	38	const QString& getEphemeralPublicKey() const;
39		const QVector<QSharedPointer<const CVCertificate> >& getCvCertificates() const;
	39	const QVector<QSharedPointer<const CVCertificate>>& getCvCertificates() const;
40	40	const QByteArrayList& getCvCertificatesAsBinary() const;
41	41	};
42	42

+4

-12

src/core/paos/invoke/DidAuthenticateResponseEac1.cpp less more

113	113	{
114	114	writeTextElement(QStringLiteral("CertificationAuthorityReference"), reference);
115	115	}
116		if (!mEfCardAccess.isNull())
117		{
118		writeTextElement(QStringLiteral("EFCardAccess"), mEfCardAccess);
119		}
120		if (!mIdPICC.isNull())
121		{
122		writeTextElement(QStringLiteral("IDPICC"), mIdPICC);
123		}
124		if (!mChallenge.isNull())
125		{
126		writeTextElement(QStringLiteral("Challenge"), mChallenge);
127		}
	116
	117	writeTextElement(QStringLiteral("EFCardAccess"), mEfCardAccess);
	118	writeTextElement(QStringLiteral("IDPICC"), mIdPICC);
	119	writeTextElement(QStringLiteral("Challenge"), mChallenge);
128	120
129	121	mWriter.writeEndElement(); // AuthenticationProtocolData
130	122	}

+1

-1

src/core/paos/retrieve/DidAuthenticateEac1.h less more

44	44	const QSharedPointer<const CertificateDescription>& getCertificateDescription() const;
45	45	const QByteArray& getCertificateDescriptionAsBinary() const;
46	46	const ConnectionHandle& getConnectionHandle() const;
47		const QVector<QSharedPointer<const CVCertificate> >& getCvCertificates() const;
	47	const QVector<QSharedPointer<const CVCertificate>>& getCvCertificates() const;
48	48	const QString& getDidName() const;
49	49	const QSharedPointer<const CHAT>& getOptionalChat() const;
50	50	const QSharedPointer<const CHAT>& getRequiredChat() const;

+1

-1

src/core/paos/retrieve/DidAuthenticateEac2.h less more

36	36	const QString& getDidName() const;
37	37	const QString& getSignature() const;
38	38	const QString& getEphemeralPublicKey() const;
39		const QVector<QSharedPointer<const CVCertificate> >& getCvCertificates() const;
	39	const QVector<QSharedPointer<const CVCertificate>>& getCvCertificates() const;
40	40	const QByteArrayList& getCvCertificatesAsBinary() const;
41	41	};
42	42

+0

-1

src/core/states/FinalState.h less more

27	27	getContext()->setWorkflowFinished(true);
28	28	}
29	29
30
31	30	public:
32	31	explicit FinalState(const QSharedPointer<WorkflowContext>& pContext)
33	32	: AbstractState(pContext, false)

+2

-1

src/core/states/StateCheckCertificates.cpp less more

38	38	{
39	39	qCritical() << certificateDescError;
40	40	const auto& issuerName = TlsChecker::getCertificateIssuerName(certificate);
41		updateStatus(GlobalStatus(GlobalStatus::Code::Workflow_TrustedChannel_Hash_Not_In_Description, issuerName));
	41	updateStatus({GlobalStatus::Code::Workflow_TrustedChannel_Hash_Not_In_Description, {GlobalStatus::ExternalInformation::CERTIFICATE_ISSUER_NAME, issuerName}
	42	});
42	43	Q_EMIT fireAbort();
43	44	return;
44	45	}

+43

-16

src/core/states/StateCheckRefreshAddress.cpp less more

185	185	{
186	186	if (TlsChecker::containsFatalError(mReply, pErrors))
187	187	{
188		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Network_Ssl_Establishment_Error));
	188	reportCommunicationError({GlobalStatus::Code::Network_Ssl_Establishment_Error, {GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString()}
	189	});
189	190	}
190	191	}
191	192

223	224	context->addCertificateData(pUrl, pCertificate);
224	225	};
225	226
226		const auto& issuerName = TlsChecker::getCertificateIssuerName(pSslConfiguration.peerCertificate());
	227	const GlobalStatus::ExternalInfoMap infoMap {
	228	{GlobalStatus::ExternalInformation::CERTIFICATE_ISSUER_NAME, TlsChecker::getCertificateIssuerName(pSslConfiguration.peerCertificate())},
	229	{GlobalStatus::ExternalInformation::LAST_URL, mUrl.toString()}
	230	};
227	231	switch (CertificateChecker::checkAndSaveCertificate(pSslConfiguration.peerCertificate(), mUrl, context->getDidAuthenticateEac1(), context->getDvCvc(), saveCertificateFunc))
228	232	{
229	233	case CertificateChecker::CertificateStatus::Good:
230	234	break;
231	235
232	236	case CertificateChecker::CertificateStatus::Unsupported_Algorithm_Or_Length:
233		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Workflow_Network_Ssl_Certificate_Unsupported_Algorithm_Or_Length, issuerName));
	237	reportCommunicationError({GlobalStatus::Code::Workflow_Network_Ssl_Certificate_Unsupported_Algorithm_Or_Length, infoMap});
234	238	return false;
235	239
236	240	case CertificateChecker::CertificateStatus::Hash_Not_In_Description:
237		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Workflow_Network_Ssl_Hash_Not_In_Certificate_Description, issuerName));
	241	reportCommunicationError({GlobalStatus::Code::Workflow_Network_Ssl_Hash_Not_In_Certificate_Description, infoMap});
238	242	return false;
239	243	}
240	244
241	245	if (!TlsChecker::hasValidEphemeralKeyLength(pSslConfiguration.ephemeralServerKey()))
242	246	{
243		reportCommunicationError(GlobalStatus::Code::Workflow_Network_Ssl_Connection_Unsupported_Algorithm_Or_Length);
	247	reportCommunicationError({GlobalStatus::Code::Workflow_Network_Ssl_Connection_Unsupported_Algorithm_Or_Length, {GlobalStatus::ExternalInformation::LAST_URL, mUrl.toString()}
	248	});
244	249	return false;
245	250	}
246	251

251	256	void StateCheckRefreshAddress::onNetworkReply()
252	257	{
253	258	const auto statusCode = NetworkManager::getLoggedStatusCode(mReply, spawnMessageLogger(network));
254
255	259	if (mReply->error() != QNetworkReply::NoError)
256	260	{
257	261	qCritical() << "An error occured:" << mReply->errorString();
258	262	switch (NetworkManager::toNetworkError(mReply.data()))
259	263	{
260	264	case NetworkManager::NetworkError::ServiceUnavailable:
261		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Network_ServiceUnavailable));
	265	reportCommunicationError({GlobalStatus::Code::Network_ServiceUnavailable, {GlobalStatus::ExternalInformation::LAST_URL, mUrl.toString()}
	266	});
262	267	break;
263	268
264	269	case NetworkManager::NetworkError::TimeOut:
265		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Network_TimeOut));
	270	reportCommunicationError({GlobalStatus::Code::Network_TimeOut, {GlobalStatus::ExternalInformation::LAST_URL, mUrl.toString()}
	271	});
266	272	break;
267	273
268	274	case NetworkManager::NetworkError::ProxyError:
269		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Network_Proxy_Error));
	275	reportCommunicationError({GlobalStatus::Code::Network_Proxy_Error, {GlobalStatus::ExternalInformation::LAST_URL, mUrl.toString()}
	276	});
270	277	break;
271	278
272	279	case NetworkManager::NetworkError::SecurityError:
273		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Network_Ssl_Establishment_Error));
	280	reportCommunicationError({GlobalStatus::Code::Network_Ssl_Establishment_Error, {GlobalStatus::ExternalInformation::LAST_URL, mUrl.toString()}
	281	});
274	282	break;
275	283
276	284	case NetworkManager::NetworkError::OtherError:
277		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Network_Other_Error));
	285	reportCommunicationError({GlobalStatus::Code::Network_Other_Error, {GlobalStatus::ExternalInformation::LAST_URL, mUrl.toString()}
	286	});
278	287	break;
279	288	}
280	289	return;

283	292	if (statusCode != HTTP_STATUS_FOUND && statusCode != HTTP_STATUS_SEE_OTHER && statusCode != HTTP_STATUS_TEMPORARY_REDIRECT)
284	293	{
285	294	qCritical() << "Got unexpected status code:" << statusCode;
286		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Workflow_Network_Expected_Redirect, QString::number(statusCode)));
	295	const GlobalStatus::ExternalInfoMap infoMap {
	296	{GlobalStatus::ExternalInformation::HTTP_STATUS_CODE, QString::number(statusCode)},
	297	{GlobalStatus::ExternalInformation::LAST_URL, mUrl.toString()}
	298	};
	299	reportCommunicationError({GlobalStatus::Code::Workflow_Network_Expected_Redirect, infoMap});
287	300	return;
288	301	}
289	302

291	304	if (redirectUrl.isEmpty())
292	305	{
293	306	qCritical() << "Got empty redirect URL";
294		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Workflow_Network_Empty_Redirect_Url));
	307	reportCommunicationError({GlobalStatus::Code::Workflow_Network_Empty_Redirect_Url, {GlobalStatus::ExternalInformation::LAST_URL, mUrl.toString()}
	308	});
295	309	return;
296	310	}
297	311
298	312	if (!redirectUrl.isValid())
299	313	{
300	314	qCritical() << "Got malformed redirect URL:" << redirectUrl;
301		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Workflow_Network_Malformed_Redirect_Url, QString::fromLatin1(redirectUrl.toEncoded())));
	315	const GlobalStatus::ExternalInfoMap infoMap {
	316	{GlobalStatus::ExternalInformation::REDIRECT_URL, redirectUrl.toString()},
	317	{GlobalStatus::ExternalInformation::LAST_URL, mUrl.toString()}
	318	};
	319	reportCommunicationError({GlobalStatus::Code::Workflow_Network_Malformed_Redirect_Url, infoMap});
302	320	return;
303	321	}
304	322

313	331	else
314	332	{
315	333	qCritical() << httpsError;
316		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Workflow_Network_Invalid_Scheme, redirectUrl.scheme()));
	334	const QMap<GlobalStatus::ExternalInformation, QString> infoMap {
	335	{GlobalStatus::ExternalInformation::URL_SCHEME, redirectUrl.scheme()},
	336	{GlobalStatus::ExternalInformation::LAST_URL, redirectUrl.toString()}
	337	};
	338	reportCommunicationError({GlobalStatus::Code::Workflow_Network_Invalid_Scheme, infoMap});
317	339	return;
318	340	}
319	341	}

368	390
369	391	mConnections += connect(mReply.data(), &QNetworkReply::encrypted, this, &StateCheckRefreshAddress::onSslHandshakeDoneFetchingServerCertificate);
370	392	mConnections += connect(mReply.data(), &QNetworkReply::sslErrors, this, &StateCheckRefreshAddress::onSslErrors);
	393	#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
	394	mConnections += connect(mReply.data(), &QNetworkReply::errorOccurred, this, &StateCheckRefreshAddress::onNetworkErrorFetchingServerCertificate);
	395	#else
371	396	mConnections += connect(mReply.data(), QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &StateCheckRefreshAddress::onNetworkErrorFetchingServerCertificate);
	397	#endif
372	398	}
373	399
374	400

406	432	return;
407	433	}
408	434	qCritical() << "An error occured fetching the server certificate:" << mReply->errorString();
409		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Workflow_Network_Empty_Redirect_Url));
	435	reportCommunicationError({GlobalStatus::Code::Workflow_Network_Empty_Redirect_Url, {GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString()}
	436	});
410	437	}
411	438
412	439

+19

-9

src/core/states/StateGenericSendReceive.cpp less more

97	97	if (TlsChecker::containsFatalError(mReply, pErrors))
98	98	{
99	99	qCCritical(network) << GlobalStatus(GlobalStatus::Code::Workflow_TrustedChannel_Establishment_Error);
100		updateStatus(GlobalStatus::Code::Workflow_TrustedChannel_Establishment_Error);
	100	updateStatus({GlobalStatus::Code::Workflow_TrustedChannel_Establishment_Error, {GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString()}
	101	});
101	102	Q_EMIT fireAbort();
102	103	}
103	104	}

121	122	case GlobalStatus::Code::Workflow_TrustedChannel_Ssl_Certificate_Unsupported_Algorithm_Or_Length:
122	123	case GlobalStatus::Code::Workflow_Network_Ssl_Certificate_Unsupported_Algorithm_Or_Length:
123	124	{
124		const auto& issuerName = TlsChecker::getCertificateIssuerName(cfg.peerCertificate());
125		updateStatus(GlobalStatus(statusCode, issuerName));
	125	const GlobalStatus::ExternalInfoMap infoMap {
	126	{GlobalStatus::ExternalInformation::CERTIFICATE_ISSUER_NAME, TlsChecker::getCertificateIssuerName(cfg.peerCertificate())},
	127	{GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString()}
	128	};
	129	updateStatus({statusCode, infoMap});
126	130	break;
127	131	}
128	132
129	133	default:
130		updateStatus(statusCode);
	134	updateStatus({statusCode, {GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString()}
	135	});
131	136	break;
132	137	}
133	138	abort = true;

148	153	else
149	154	{
150	155	qCCritical(network) << sessionFailedError;
151		updateStatus(GlobalStatus::Code::Workflow_TrustedChannel_Establishment_Error);
	156	updateStatus({GlobalStatus::Code::Workflow_TrustedChannel_Establishment_Error, {GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString()}
	157	});
152	158	abort = true;
153	159	}
154	160	}

288	294	if (statusCode >= 500)
289	295	{
290	296	qCCritical(network) << GlobalStatus(GlobalStatus::Code::Workflow_TrustedChannel_Error_From_Server);
291		updateStatus(GlobalStatus::Code::Workflow_TrustedChannel_Error_From_Server);
	297	updateStatus({GlobalStatus::Code::Workflow_TrustedChannel_Error_From_Server, {GlobalStatus::ExternalInformation::LAST_URL, reply->url().toString()}
	298	});
292	299	Q_EMIT fireAbort();
293	300	return;
294	301	}

296	303	if (statusCode >= 400)
297	304	{
298	305	qCCritical(network) << GlobalStatus(GlobalStatus::Code::Workflow_Unexpected_Message_From_EidServer);
299		updateStatus(GlobalStatus::Code::Workflow_Unexpected_Message_From_EidServer);
	306	updateStatus({GlobalStatus::Code::Workflow_Unexpected_Message_From_EidServer, {GlobalStatus::ExternalInformation::LAST_URL, reply->url().toString()}
	307	});
300	308	Q_EMIT fireAbort();
301	309	return;
302	310	}

319	327	if (paosHandler.getDetectedPaosType() == PaosType::UNKNOWN)
320	328	{
321	329	qCCritical(network) << "The program received an unknown message from the server.";
322		updateStatus(GlobalStatus::Code::Workflow_Unknown_Paos_From_EidServer);
	330	updateStatus({GlobalStatus::Code::Workflow_Unknown_Paos_From_EidServer, {GlobalStatus::ExternalInformation::LAST_URL, reply->url().toString()}
	331	});
323	332	Q_EMIT fireAbort();
324	333	}
325	334	else
326	335	{
327	336	qCCritical(network) << "The program received an unexpected message from the server.";
328		updateStatus(GlobalStatus::Code::Workflow_Unexpected_Message_From_EidServer);
	337	updateStatus({GlobalStatus::Code::Workflow_Unexpected_Message_From_EidServer, {GlobalStatus::ExternalInformation::LAST_URL, reply->url().toString()}
	338	});
329	339	Q_EMIT fireAbort();
330	340	}
331	341	return;

+0

-15

src/core/states/StateGenericSendReceive.h less more

65	65	{
66	66	}
67	67
68
69	68	protected:
70	69	virtual QSharedPointer<PaosMessage> getAsMessage() override
71	70	{

100	99	Q_EMIT fireReceivedStartPaosResponse();
101	100	}
102	101	}
103
104	102
105	103	Q_SIGNALS:
106	104	void fireReceivedDidList();

124	122	{
125	123	}
126	124
127
128	125	protected:
129	126	virtual QSharedPointer<PaosMessage> getAsMessage() override
130	127	{

155	152	Q_EMIT fireReceivedStartPaosResponse();
156	153	}
157	154	}
158
159	155
160	156	Q_SIGNALS:
161	157	void fireReceivedExtractCvcsFromEac1InputType();

178	174	{
179	175	}
180	176
181
182	177	protected:
183	178	virtual QSharedPointer<PaosMessage> getAsMessage() override
184	179	{

209	204	Q_EMIT fireReceivedStartPaosResponse();
210	205	}
211	206	}
212
213	207
214	208	Q_SIGNALS:
215	209	void fireReceivedDisconnect();

231	225	{
232	226	}
233	227
234
235	228	protected:
236	229	virtual QSharedPointer<PaosMessage> getAsMessage() override
237	230	{

262	255	Q_EMIT fireReceivedStartPaosResponse();
263	256	}
264	257	}
265
266	258
267	259	Q_SIGNALS:
268	260	void fireReceivedDisconnect();

284	276	{
285	277	}
286	278
287
288	279	protected:
289	280	virtual QSharedPointer<PaosMessage> getAsMessage() override
290	281	{

311	302	Q_EMIT fireReceivedStartPaosResponse();
312	303	}
313	304	}
314
315	305
316	306	Q_SIGNALS:
317	307	void fireReceivedStartPaosResponse();

332	322	{
333	323	}
334	324
335
336	325	protected:
337	326	virtual QSharedPointer<PaosMessage> getAsMessage() override
338	327	{

363	352	Q_EMIT fireReceivedStartPaosResponse();
364	353	}
365	354	}
366
367	355
368	356	Q_SIGNALS:
369	357	void fireReceivedDisconnect();

385	373	{
386	374	}
387	375
388
389	376	protected:
390	377	virtual QSharedPointer<PaosMessage> getAsMessage() override
391	378	{

416	403	Q_EMIT fireReceivedStartPaosResponse();
417	404	}
418	405	}
419
420	406
421	407	Q_SIGNALS:
422	408	void fireReceivedDisconnect();

436	422	{
437	423	}
438	424
439
440	425	protected:
441	426	virtual QSharedPointer<PaosMessage> getAsMessage() override
442	427	{

+18

-5

src/core/states/StateGetSelfAuthenticationData.cpp less more

79	79	context->addCertificateData(pUrl, pCertificate);
80	80	};
81	81
82		const auto& issuerName = TlsChecker::getCertificateIssuerName(pSslConfiguration.peerCertificate());
	82	GlobalStatus::ExternalInfoMap infoMap {
	83	{GlobalStatus::ExternalInformation::CERTIFICATE_ISSUER_NAME, TlsChecker::getCertificateIssuerName(pSslConfiguration.peerCertificate())}
	84	};
	85	if (!mReply.isNull())
	86	{
	87	infoMap.insert(GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString());
	88	}
	89
83	90	switch (CertificateChecker::checkAndSaveCertificate(pSslConfiguration.peerCertificate(), getContext()->getRefreshUrl(), context->getDidAuthenticateEac1(), context->getDvCvc(), saveCertificateFunc))
84	91	{
85	92	case CertificateChecker::CertificateStatus::Good:
86	93	break;
87	94
88	95	case CertificateChecker::CertificateStatus::Unsupported_Algorithm_Or_Length:
89		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Workflow_Network_Ssl_Certificate_Unsupported_Algorithm_Or_Length, issuerName));
	96	reportCommunicationError(GlobalStatus(GlobalStatus::Code::Workflow_Network_Ssl_Certificate_Unsupported_Algorithm_Or_Length, infoMap));
90	97	return false;
91	98
92	99	case CertificateChecker::CertificateStatus::Hash_Not_In_Description:
93		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Workflow_Network_Ssl_Hash_Not_In_Certificate_Description, issuerName));
	100	reportCommunicationError(GlobalStatus(GlobalStatus::Code::Workflow_Network_Ssl_Hash_Not_In_Certificate_Description, infoMap));
94	101	return false;
95	102	}
96	103
97	104	if (!TlsChecker::hasValidEphemeralKeyLength(pSslConfiguration.ephemeralServerKey()))
98	105	{
99		reportCommunicationError(GlobalStatus::Code::Workflow_Network_Ssl_Connection_Unsupported_Algorithm_Or_Length);
	106	reportCommunicationError({GlobalStatus::Code::Workflow_Network_Ssl_Connection_Unsupported_Algorithm_Or_Length, infoMap});
100	107	return false;
101	108	}
102	109

108	115	{
109	116	if (TlsChecker::containsFatalError(mReply, pErrors))
110	117	{
111		reportCommunicationError(GlobalStatus(GlobalStatus::Code::Network_Ssl_Establishment_Error));
	118	GlobalStatus::ExternalInfoMap infoMap;
	119	if (!mReply.isNull())
	120	{
	121	infoMap.insert(GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString());
	122	}
	123
	124	reportCommunicationError({GlobalStatus::Code::Network_Ssl_Establishment_Error, infoMap});
112	125	}
113	126	}
114	127

+18

-6

src/core/states/StateGetTcToken.cpp less more

79	79	qCritical() << httpsError1;
80	80	qCritical() << httpsError2;
81	81	getContext()->setTcTokenNotFound(false);
82		updateStatus(GlobalStatus::Code::Workflow_TrustedChannel_Server_Format_Error);
	82	const GlobalStatus::ExternalInfoMap& infoMap {
	83	{GlobalStatus::ExternalInformation::LAST_URL, pUrl.toString()},
	84	{GlobalStatus::ExternalInformation::URL_SCHEME, pUrl.scheme()}
	85	};
	86	updateStatus({GlobalStatus::Code::Workflow_TrustedChannel_Server_Format_Error, infoMap});
83	87	return false;
84	88	}
85	89	}

113	117	const auto& cfg = mReply->sslConfiguration();
114	118	TlsChecker::logSslConfig(cfg, spawnMessageLogger(network));
115	119
	120	const GlobalStatus status {GlobalStatus::Code::Workflow_TrustedChannel_Establishment_Error, {GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString()}
	121	};
116	122	// At this point we can only check the certificate key's length.
117	123	if (!TlsChecker::hasValidCertificateKeyLength(cfg.peerCertificate()))
118	124	{
119	125	mReply->abort();
120	126	qCritical() << "Error while connecting to the provider. The server's SSL certificate uses an unsupported key algorithm or length.";
121		updateStatus(GlobalStatus::Code::Workflow_TrustedChannel_Establishment_Error);
	127	updateStatus(status);
122	128	Q_EMIT fireAbort();
123	129	return;
124	130	}

127	133	{
128	134	mReply->abort();
129	135	qCritical() << "Error while connecting to the provider. The SSL connection uses an unsupported key algorithm or length.";
130		updateStatus(GlobalStatus::Code::Workflow_TrustedChannel_Establishment_Error);
	136	updateStatus(status);
131	137	Q_EMIT fireAbort();
132	138	return;
133	139	}

166	172	if (statusCode != HTTP_STATUS_SEE_OTHER && statusCode != HTTP_STATUS_FOUND && statusCode != HTTP_STATUS_TEMPORARY_REDIRECT)
167	173	{
168	174	qCritical() << "Error while connecting to the provider. The server returns an unexpected status code:" << statusCode;
169		updateStatus(GlobalStatus::Code::Workflow_TrustedChannel_Server_Format_Error);
	175	const GlobalStatus::ExternalInfoMap infoMap {
	176	{GlobalStatus::ExternalInformation::HTTP_STATUS_CODE, QString::number(statusCode)},
	177	{GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString()}
	178	};
	179	updateStatus({GlobalStatus::Code::Workflow_TrustedChannel_Server_Format_Error, infoMap});
170	180	Q_EMIT fireAbort();
171	181	return;
172	182	}

183	193	if (data.isEmpty())
184	194	{
185	195	qDebug() << "Received no data.";
186		updateStatus(GlobalStatus::Code::Workflow_TrustedChannel_No_Data_Received);
	196	updateStatus({GlobalStatus::Code::Workflow_TrustedChannel_No_Data_Received, {GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString()}
	197	});
187	198	Q_EMIT fireAbort();
188	199	return;
189	200	}

204	215	}
205	216
206	217	qCritical() << "TCToken invalid";
207		updateStatus(GlobalStatus::Code::Workflow_TrustedChannel_Server_Format_Error);
	218	updateStatus({GlobalStatus::Code::Workflow_TrustedChannel_Server_Format_Error, {GlobalStatus::ExternalInformation::LAST_URL, mReply->url().toString()}
	219	});
208	220	Q_EMIT fireAbort();
209	221	}

+3

-3

src/core/states/StatePreVerification.h less more

23	23	friend class StateBuilder;
24	24	friend class ::test_StatePreVerification;
25	25
26		const QVector<QSharedPointer<const CVCertificate> > mTrustedCvcas;
	26	const QVector<QSharedPointer<const CVCertificate>> mTrustedCvcas;
27	27	const QDateTime mValidationDateTime;
28	28
29	29	explicit StatePreVerification(const QSharedPointer<WorkflowContext>& pContext);
30	30	virtual void run() override;
31	31
32		bool isValid(const QVector<QSharedPointer<const CVCertificate> >& pCertificates);
33		void saveCvcaLinkCertificates(const QVector<QSharedPointer<const CVCertificate> >& pCertificates);
	32	bool isValid(const QVector<QSharedPointer<const CVCertificate>>& pCertificates);
	33	void saveCvcaLinkCertificates(const QVector<QSharedPointer<const CVCertificate>>& pCertificates);
34	34	};
35	35
36	36	} // namespace governikus

+2

-1

src/core/states/StateProcessing.cpp less more

22	22	else
23	23	{
24	24	qCritical() << "Cannot send \"Processing\" to caller:" << activationContext->getSendError();
25		updateStatus(GlobalStatus(GlobalStatus::Code::Workflow_Processing_Error, activationContext->getSendError()));
	25	updateStatus({GlobalStatus::Code::Workflow_Processing_Error, {GlobalStatus::ExternalInformation::ACTIVATION_ERROR, activationContext->getSendError()}
	26	});
26	27	Q_EMIT fireAbort();
27	28	}
28	29	}

+4

-2

src/core/states/StateRedirectBrowser.cpp less more

69	69	else
70	70	{
71	71	qCritical() << "Cannot send error page to caller:" << activationContext->getSendError();
72		updateStatus(GlobalStatus(GlobalStatus::Code::Workflow_Error_Page_Transmission_Error, activationContext->getSendError()));
	72	updateStatus({GlobalStatus::Code::Workflow_Error_Page_Transmission_Error, {GlobalStatus::ExternalInformation::ACTIVATION_ERROR, activationContext->getSendError()}
	73	});
73	74	Q_EMIT fireAbort();
74	75	}
75	76	}

98	99	if (!activationContext->sendRedirect(pRedirectAddress, GlobalStatus(pResult)))
99	100	{
100	101	qCritical() << "Cannot send redirect to caller:" << activationContext->getSendError();
101		updateStatus(GlobalStatus(GlobalStatus::Code::Workflow_Redirect_Transmission_Error, activationContext->getSendError()));
	102	updateStatus({GlobalStatus::Code::Workflow_Redirect_Transmission_Error, {GlobalStatus::ExternalInformation::ACTIVATION_ERROR, activationContext->getSendError()}
	103	});
102	104	Q_EMIT fireAbort();
103	105	return false;
104	106	}

+0

-29

~~src/core/states/StateSelectPasswordId.cpp~~ less more

0		/*!
1		* \copyright Copyright (c) 2018-2020 Governikus GmbH & Co. KG, Germany
2		*/
3
4		#include "StateSelectPasswordId.h"
5
6
7		using namespace governikus;
8
9
10		StateSelectPasswordId::StateSelectPasswordId(const QSharedPointer<WorkflowContext>& pContext)
11		: AbstractState(pContext, false)
12		, GenericContextContainer(pContext)
13		{
14		}
15
16
17		void StateSelectPasswordId::run()
18		{
19		const bool canAllowed = getContext()->isCanAllowedMode();
20		qDebug() << "CAN allowed:" << canAllowed;
21		if (canAllowed)
22		{
23		Q_EMIT firePasswordIdCAN();
24		return;
25		}
26
27		Q_EMIT fireContinue();
28		}

+0

-28

~~src/core/states/StateSelectPasswordId.h~~ less more

0		/*!
1		* \copyright Copyright (c) 2018-2020 Governikus GmbH & Co. KG, Germany
2		*/
3
4		#pragma once
5
6		#include "AbstractState.h"
7		#include "context/WorkflowContext.h"
8		#include "GenericContextContainer.h"
9
10		namespace governikus
11		{
12
13		class StateSelectPasswordId
14		: public AbstractState
15		, public GenericContextContainer<WorkflowContext>
16		{
17		Q_OBJECT
18		friend class StateBuilder;
19
20		explicit StateSelectPasswordId(const QSharedPointer<WorkflowContext>& pContext);
21		virtual void run() override;
22
23		Q_SIGNALS:
24		void firePasswordIdCAN();
25		};
26
27		} // namespace governikus

+4

-2

src/core/states/StateWriteHistory.cpp less more

6	6	#include "asn1/AccessRoleAndRight.h"
7	7
8	8	#include "AppSettings.h"
	9	#include "LanguageLoader.h"
9	10
10	11	using namespace governikus;
11	12

42	43	auto subjectUrl = certDesc->getSubjectUrl();
43	44
44	45	CVCertificateBody body = getContext()->getDidAuthenticateEac1()->getCvCertificates().at(0)->getBody();
45		QString effectiveDate = body.getCertificateEffectiveDate().toString(Qt::DefaultLocaleShortDate);
46		QString expirationDate = body.getCertificateExpirationDate().toString(Qt::DefaultLocaleShortDate);
	46	const auto locale = LanguageLoader::getInstance().getUsedLocale();
	47	const auto effectiveDate = locale.toString(body.getCertificateEffectiveDate(), QLocale::ShortFormat);
	48	const auto expirationDate = locale.toString(body.getCertificateExpirationDate(), QLocale::ShortFormat);
47	49	//: LABEL ALL_PLATFORMS
48	50	QString validity = tr("Validity:\n%1 - %2").arg(effectiveDate, expirationDate);
49	51

+1

-1

src/export/PdfExporter.h less more

36	36	public:
37	37	PdfExporter(const QString& pFilename, bool pOpenFile = true, bool pFixFilename = true);
38	38	bool exportHistory();
39		bool exportSelfInfo(const QDateTime& pDate, const QVector<QPair<QString, QString> >& pInfoData);
	39	bool exportSelfInfo(const QDateTime& pDate, const QVector<QPair<QString, QString>>& pInfoData);
40	40	};
41	41
42	42	} // namespace governikus

+12

-2

src/file_provider/Downloader.cpp less more

131	131	return;
132	132	}
133	133
	134	const auto hasError = mCurrentReply->error() != QNetworkReply::NoError;
134	135	const auto statusCode = NetworkManager::getLoggedStatusCode(mCurrentReply, spawnMessageLogger(network));
135	136	switch (statusCode)
136	137	{

143	144	lastModified = QDateTime::currentDateTime();
144	145	}
145	146
146		Q_EMIT fireDownloadSuccess(mCurrentRequest->url(), lastModified, mCurrentReply->readAll());
	147	const auto readData = mCurrentReply->readAll();
	148	if (!hasError && readData.size() > 0)
	149	{
	150	Q_EMIT fireDownloadSuccess(mCurrentRequest->url(), lastModified, readData);
	151	}
	152	else
	153	{
	154	qCCritical(fileprovider).nospace() << "Received no data." << mCurrentReply->errorString() << " [" << textForLog << "]";
	155	Q_EMIT fireDownloadFailed(url, NetworkManager::toStatus(mCurrentReply).getStatusCode());
	156	}
147	157	break;
148	158	}
149	159

156	166	break;
157	167
158	168	default:
159		if (mCurrentReply->error() != QNetworkReply::NoError)
	169	if (hasError)
160	170	{
161	171	qCCritical(fileprovider).nospace() << mCurrentReply->errorString() << " [" << textForLog << "]";
162	172	Q_EMIT fireDownloadFailed(url, NetworkManager::toStatus(mCurrentReply).getStatusCode());

+1

-1

src/file_provider/Downloader.h less more

28	28	private:
29	29	QSharedPointer<QNetworkRequest> mCurrentRequest;
30	30	QNetworkReply* mCurrentReply;
31		QQueue<QSharedPointer<QNetworkRequest> > mPendingRequests;
	31	QQueue<QSharedPointer<QNetworkRequest>> mPendingRequests;
32	32
33	33	void scheduleDownload(QSharedPointer<QNetworkRequest> pDownloadRequest);
34	34	void startDownloadIfPending();

+1

-1

src/file_provider/FileProvider.h less more

21	21	friend class Env;
22	22
23	23	private:
24		QHash<QString, QSharedPointer<UpdatableFile> > mUpdatableFiles;
	24	QHash<QString, QSharedPointer<UpdatableFile>> mUpdatableFiles;
25	25	QMutex mGetFileMutex;
26	26
27	27	protected:

+3

-0

src/file_provider/UpdatableFile.cpp less more

196	196	{
197	197	if (pUpdateUrl == mUpdateUrl)
198	198	{
	199	Q_EMIT fireNoUpdateAvailable();
	200
199	201	cleanupAfterUpdate([&](){
200	202	clearDirty();
201	203	});

220	222	{
221	223	qCCritical(fileprovider) << "Not all data could not be written to file:" << pFilePath;
222	224	file.close();
	225	file.remove();
223	226	return false;
224	227	}
225	228

+1

-0

src/file_provider/UpdatableFile.h less more

71	71
72	72	Q_SIGNALS:
73	73	void fireUpdated();
	74	void fireNoUpdateAvailable();
74	75
75	76	};
76	77

+1

-1

src/global/BuildHelper.h less more

28	28	~BuildHelper() = delete;
29	29
30	30	public:
31		static QVector<QPair<QLatin1String, QString> > getInformationHeader();
	31	static QVector<QPair<QLatin1String, QString>> getInformationHeader();
32	32	static void processInformationHeader(const std::function<void(const QString&, const QString&)>& pFunc, bool pTranslate = true);
33	33
34	34

+0

-1

src/global/CardReturnCode.h less more

42	42	{
43	43	}
44	44
45
46	45	public:
47	46	static GlobalStatus toGlobalStatus(CardReturnCode pCode);
48	47	static bool equalsWrongPacePassword(CardReturnCode pCode);

+5

-3

src/global/ECardApiResult.cpp less more

593	593	switch (getMajor())
594	594	{
595	595	case Major::Unknown:
596		return GlobalStatus(GlobalStatus::Code::Unknown_Error, message);
	596	return {GlobalStatus::Code::Unknown_Error, {GlobalStatus::ExternalInformation::ECARDAPI_ERROR, message}
	597	};
597	598
598	599	case Major::Ok:
599	600	if (isOk())

603	604	Q_FALLTHROUGH();
604	605
605	606	case Major::Error:
606		return GlobalStatus(toStatus(getMinor()), message, toStatus(d->mOrigin));
	607	return {toStatus(getMinor()), {GlobalStatus::ExternalInformation::ECARDAPI_ERROR, message}, toStatus(d->mOrigin)};
607	608
608	609	case Major::Warning:
609		return GlobalStatus(GlobalStatus::Code::Paos_Unexpected_Warning, message);
	610	return {GlobalStatus::Code::Paos_Unexpected_Warning, {GlobalStatus::ExternalInformation::ECARDAPI_ERROR, message}
	611	};
610	612	}
611	613
612	614	Q_UNREACHABLE();

+5

-6

src/global/Env.h less more

95	95	mutable QReadWriteLock mLock;
96	96	#endif
97	97
98		QMap<Identifier, QWeakPointer<QObject> > mSharedInstances;
	98	QMap<Identifier, QWeakPointer<QObject>> mSharedInstances;
99	99	mutable QReadWriteLock mSharedInstancesLock;
100	100
101	101	static Env& getInstance();

203	203	// unlock would allow to delete the wrapper.
204	204	for (auto mock : qAsConst(mInstancesCreator)) // clazy:exclude=range-loop
205	205	{
206		auto creator = mock.dynamicCast<FuncWrapper<T, Args ...> >();
	206	auto creator = mock.dynamicCast<FuncWrapper<T, Args ...>>();
207	207	if (creator)
208	208	{
209	209	locker.unlock();

215	215
216	216	return newObject<T>(std::forward<Args>(pArgs) ...);
217	217	}
218
219	218
220	219	protected:
221	220	Env();

283	282
284	283	for (const auto& mock : qAsConst(holder.mInstancesCreator))
285	284	{
286		if (mock.dynamicCast<FuncWrapper<T, Args ...> >())
	285	if (mock.dynamicCast<FuncWrapper<T, Args ...>>())
287	286	{
288	287	return mock->getCounter();
289	288	}

298	297	{
299	298	Q_ASSERT(pFunc);
300	299
301		const auto& value = QSharedPointer<FuncWrapper<T, Args ...> >::create(std::move(pFunc));
	300	const auto& value = QSharedPointer<FuncWrapper<T, Args ...>>::create(std::move(pFunc));
302	301
303	302	auto& holder = getInstance();
304	303	const QWriteLocker locker(&holder.mLock);

307	306	while (iter.hasNext())
308	307	{
309	308	iter.next();
310		if (iter.value().dynamicCast<FuncWrapper<T, Args ...> >())
	309	if (iter.value().dynamicCast<FuncWrapper<T, Args ...>>())
311	310	{
312	311	iter.setValue(value);
313	312	return;

+1

-2

src/global/FileDestination.h less more

34	34	#endif
35	35	}
36	36
37
38	37	public:
39	38	static QString getPath(const QString& pFilename,
40	39	QStandardPaths::LocateOption pOption = QStandardPaths::LocateFile,
41	40	QStandardPaths::StandardLocation pStandard = QStandardPaths::AppDataLocation)
42	41	{
43		#if defined(Q_OS_LINUX) \|\| (defined(Q_OS_BSD4) && !defined(Q_OS_MACOS) && !defined(Q_OS_IOS))
	42	#if (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) \|\| (defined(Q_OS_BSD4) && !defined(Q_OS_MACOS) && !defined(Q_OS_IOS))
44	43	const auto match = QStandardPaths::locate(pStandard, pFilename, pOption);
45	44	if (!match.isNull())
46	45	{

+3

-3

src/global/FuncUtils.h less more

19	19	* where readers has type QVector<Reader>
20	20	*/
21	21	template<typename S, typename T>
22		typename std::enable_if<!std::is_void<T>::value, QVector<T> >::type map(const std::function<T(const S&)>& pFunc, const QVector<S>& pItems)
	22	typename std::enable_if<!std::is_void<T>::value, QVector<T>>::type map(const std::function<T(const S&)>& pFunc, const QVector<S>& pItems)
23	23	{
24	24	const int sz = pItems.size();
25	25	QVector<T> result(sz);

38	38	* where readers has type QList<Reader>
39	39	*/
40	40	template<typename S, typename T>
41		typename std::enable_if<!std::is_void<T>::value, QList<T> >::type map(const std::function<T(const S&)>& pFunc, const QList<S>& pItems)
	41	typename std::enable_if<!std::is_void<T>::value, QList<T>>::type map(const std::function<T(const S&)>& pFunc, const QList<S>& pItems)
42	42	{
43	43	const int sz = pItems.size();
44	44	QList<T> result;

57	57	* where readers has type QVector<Reader>
58	58	*/
59	59	template<typename T>
60		typename std::enable_if<!std::is_void<T>::value, QVector<T> >::type filter(const std::function<bool(const T&)>& pFunc, const QVector<T>& pItems)
	60	typename std::enable_if<!std::is_void<T>::value, QVector<T>>::type filter(const std::function<bool(const T&)>& pFunc, const QVector<T>& pItems)
61	61	{
62	62	QVector<T> result;
63	63	for (const T& item : pItems)

+37

-12

src/global/GlobalStatus.cpp less more

15	15	});
16	16
17	17
18		const QString GlobalStatus::getExternalInfo(int pIndex) const
19		{
20		return d->mExternalInformation.value(pIndex);
	18	QString GlobalStatus::getExternalInfo(ExternalInformation pType) const
	19	{
	20	return d->mExternalInformation.value(pType);
21	21	}
22	22
23	23

36	36	case Code::Workflow_Certificate_Sop_Error:
37	37	case Code::Workflow_Error_Page_Transmission_Error:
38	38	case Code::Workflow_Processing_Error:
39		case Code::Workflow_Redirect_Transmission_Error:
40	39	case Code::Workflow_TrustedChannel_Establishment_Error:
41	40	case Code::Workflow_TrustedChannel_Error_From_Server:
42	41	case Code::Workflow_TrustedChannel_No_Data_Received:

189	188	case Code::Workflow_TrustedChannel_Hash_Not_In_Description:
190	189	case Code::Workflow_Network_Ssl_Hash_Not_In_Certificate_Description:
191	190	//: ERROR ALL_PLATFORMS The TLS certificate was not folded with the Authorization Certificate, thus violating the security requirements. Might also be caused by a firewall and/or the antivirus software.
192		return tr("Hash of TLS certificate not in certificate description (issuer: %1). This indicates a misconfiguration or manipulation of the certificate. Please check that your antivirus-software and firewalls are not interfering with TLS traffic.").arg(getExternalInfo());
	191	return tr("Hash of TLS certificate not in certificate description (issuer: %1). This indicates a misconfiguration or manipulation of the certificate. Please check that your antivirus-software and firewalls are not interfering with TLS traffic.").arg(getExternalInfo(ExternalInformation::CERTIFICATE_ISSUER_NAME));
193	192
194	193	case Code::Workflow_TrustedChannel_No_Data_Received:
195	194	//: ERROR_MASKED ALL_PLATFORMS Received an empty TC token.

243	242	case Code::Workflow_TrustedChannel_Ssl_Certificate_Unsupported_Algorithm_Or_Length:
244	243	case Code::Workflow_Network_Ssl_Certificate_Unsupported_Algorithm_Or_Length:
245	244	//: ERROR ALL_PLATFORMS Received a TLS certificate that uses an invalid algorithm or key length.
246		return tr("Error while connecting to the server. The TLS certificate uses an unsupported key algorithm or length. Certificate issuer: %1").arg(getExternalInfo());
	245	return tr("Error while connecting to the server. The TLS certificate uses an unsupported key algorithm or length. Certificate issuer: %1").arg(getExternalInfo(ExternalInformation::CERTIFICATE_ISSUER_NAME));
247	246
248	247	case Code::Workflow_Network_Empty_Redirect_Url:
249	248	//: ERROR_MASKED ALL_PLATFORMS The redirect URL could not be determined because the server sent an empty response.

251	250
252	251	case Code::Workflow_Network_Expected_Redirect:
253	252	//: ERROR_MASKED ALL_PLATFORMS The redirect URL could not be determined due to an erroneous HTTP code.
254		return tr("Expected redirect, got %1").arg(getExternalInfo());
	253	return tr("Expected redirect, got %1").arg(getExternalInfo(ExternalInformation::HTTP_STATUS_CODE));
255	254
256	255	case Code::Workflow_Network_Invalid_Scheme:
257	256	//: ERROR_MASKED ALL_PLATFORMS The redirect URL could not be determined because the redirect URL did not adhere to the HTTPS scheme.
258		return tr("Invalid scheme: %1").arg(getExternalInfo());
	257	return tr("Invalid scheme: %1").arg(getExternalInfo(ExternalInformation::URL_SCHEME));
259	258
260	259	case Code::Workflow_Network_Malformed_Redirect_Url:
261	260	//: ERROR_MASKED ALL_PLATFORMS The redirect URL could not be determined because the redirect URL was invalid.
262		return tr("Malformed redirect URL: %1").arg(getExternalInfo());
	261	return tr("Malformed redirect URL: %1").arg(getExternalInfo(ExternalInformation::REDIRECT_URL));
263	262
264	263	case Code::Workflow_Cancellation_By_User:
	264	//: ERROR ALL_PLATFORMS The user cancelled the authentication in the UI.
	265	return tr("The process has been cancelled.");
	266
265	267	case Code::Card_Cancellation_By_User:
266		//: ERROR ALL_PLATFORMS The user cancelled the authentication in either the UI or the card reader.
267		return tr("The process has been cancelled.");
	268	//: ERROR ALL_PLATFORMS The user cancelled the authentication on his card reader.
	269	return tr("The process has been cancelled by the card reader.");
268	270
269	271	case Code::Paos_Generic_Server_Error:
270	272	case Code::Paos_Unexpected_Warning:

302	304
303	305	case Code::Card_Invalid_Can:
304	306	//: ERROR ALL_PLATFORMS The ID card declined the CAN.
305		return tr("The given card access number (CAN) is not correct.");
	307	return tr("The given Card Access Number (CAN) is not correct.");
306	308
307	309	case Code::Card_Invalid_Puk:
308	310	//: ERROR ALL_PLATFORMS The ID card declined the PUK.

378	380	}
379	381
380	382
	383	QString GlobalStatus::getExternalInfo(const QString& pToken) const
	384	{
	385	if (d->mExternalInformation.empty())
	386	{
	387	return {};
	388	}
	389
	390	if (d->mExternalInformation.size() == 1)
	391	{
	392	return d->mExternalInformation.first();
	393	}
	394
	395	QStringList keyValue;
	396	const auto& keys = d->mExternalInformation.keys();
	397	for (const auto key : keys)
	398	{
	399	keyValue << QStringLiteral("%1: %2").arg(Enum<ExternalInformation>::getName(key), d->mExternalInformation[key]);
	400	}
	401
	402	return keyValue.join(pToken);
	403	}
	404
	405
381	406	GlobalStatus::Origin GlobalStatus::getOrigin() const
382	407	{
383	408	return d->mOrigin;

+39

-6

src/global/GlobalStatus.h less more

8	8	#include "EnumHelper.h"
9	9
10	10	#include <QCoreApplication>
	11	#include <QMap>
	12	#include <QPair>
11	13	#include <QSharedData>
12	14
13	15	namespace governikus

117	119	Server, Client
118	120	};
119	121
	122	enum class ExternalInformation
	123	{
	124	ECARDAPI_ERROR,
	125	LAST_URL,
	126	HTTP_STATUS_CODE,
	127	REDIRECT_URL,
	128	CERTIFICATE_ISSUER_NAME,
	129	URL_SCHEME,
	130	ACTIVATION_ERROR
	131	};
	132
	133	using ExternalInfoMap = QMap<ExternalInformation, QString>;
	134
120	135	Q_ENUM(Code)
121	136	Q_ENUM(Origin)
	137	Q_ENUM(ExternalInformation)
122	138
123	139	private:
124	140	class InternalStatus

126	142	{
127	143	public:
128	144	const Code mStatusCode;
129		const QStringList mExternalInformation;
	145	const ExternalInfoMap mExternalInformation;
130	146	const Origin mOrigin;
131	147
132		InternalStatus(Code pStatusCode, const QStringList& pExternalInformation, const Origin pOrigin)
	148	InternalStatus(Code pStatusCode, const ExternalInfoMap& pExternalInformation, const Origin pOrigin)
133	149	: mStatusCode(pStatusCode)
134	150	, mExternalInformation(pExternalInformation)
	151	, mOrigin(pOrigin)
	152	{
	153	}
	154
	155
	156	InternalStatus(Code pStatusCode, const QPair<ExternalInformation, QString>& pExternalInformation, const Origin pOrigin)
	157	: mStatusCode(pStatusCode)
	158	, mExternalInformation({
	159	{pExternalInformation.first, pExternalInformation.second}
	160	})
135	161	, mOrigin(pOrigin)
136	162	{
137	163	}

148	174	};
149	175
150	176	QSharedDataPointer<InternalStatus> d;
151		const QString getExternalInfo(int pIndex = 0) const;
	177	QString getExternalInfo(ExternalInformation pType) const;
152	178
153	179	QString toErrorDescriptionInternal() const;
154	180
155	181	public:
156		GlobalStatus(Code pStatusCode = Code::Unknown_Error, const QStringList& pExternalInformation = QStringList(), const Origin pOrigin = Origin::Client)
	182	GlobalStatus(Code pStatusCode, const ExternalInfoMap& pExternalInformation, const Origin pOrigin = Origin::Client)
157	183	: d(new InternalStatus(pStatusCode, pExternalInformation, pOrigin))
158	184	{
159	185	}
160	186
161	187
162		GlobalStatus(Code pStatusCode, const QString& pExternalInformation, const Origin pOrigin = Origin::Client)
163		: GlobalStatus(pStatusCode, QStringList(pExternalInformation), pOrigin)
	188	GlobalStatus(Code pStatusCode, const QPair<ExternalInformation, QString>& pExternalInformation, const Origin pOrigin = Origin::Client)
	189	: d(new InternalStatus(pStatusCode, pExternalInformation, pOrigin))
	190	{
	191	}
	192
	193
	194	GlobalStatus(Code pStatusCode = Code::Unknown_Error, const Origin pOrigin = Origin::Client)
	195	: d(new InternalStatus(pStatusCode, ExternalInfoMap(), pOrigin))
164	196	{
165	197	}
166	198

171	203	Code getStatusCode() const;
172	204
173	205	QString toErrorDescription(const bool pSimplifiedVersion = false) const;
	206	QString getExternalInfo(const QString& pToken = QStringLiteral("; ")) const;
174	207
175	208	Origin getOrigin() const;
176	209	bool isOriginServer() const;

+1

-1

src/global/Initializer.h less more

17	17	{
18	18	private:
19	19	friend class ::test_Initializer;
20		std::list<std::function<void()> > mRegisteredFunctions;
	20	std::list<std::function<void()>> mRegisteredFunctions;
21	21
22	22	protected:
23	23	Initializer() = default;

+1

-1

src/global/LanguageLoader.h less more

27	27	static QLocale mDefaultLanguage;
28	28
29	29	QString mPath;
30		QVector<QSharedPointer<QTranslator> > mTranslatorList;
	30	QVector<QSharedPointer<QTranslator>> mTranslatorList;
31	31	const QStringList mComponentList;
32	32	QLocale mUsedLocale;
33	33

+24

-2

src/global/LogHandler.cpp less more

371	371
372	372	bool LogHandler::copy(const QString& pDest)
373	373	{
	374	const QMutexLocker mutexLocker(&mMutex);
	375
	376	if (useLogfile())
	377	{
	378	return copyOther(mLogFile.fileName(), pDest);
	379	}
	380
	381	return false;
	382	}
	383
	384
	385	bool LogHandler::copyOther(const QString& pSource, const QString& pDest) const
	386	{
374	387	if (pDest.trimmed().isEmpty())
375	388	{
376	389	return false;
377	390	}
378	391
379		const QMutexLocker mutexLocker(&mMutex);
380		return QFile::copy(mLogFile.fileName(), pDest);
	392	if (pSource != mLogFile.fileName() && !getOtherLogfiles().contains(pSource))
	393	{
	394	return false;
	395	}
	396
	397	if (QFile::exists(pDest) && !QFile::remove(pDest))
	398	{
	399	return false;
	400	}
	401
	402	return QFile::copy(pSource, pDest);
381	403	}
382	404
383	405

+3

-0

src/global/LogHandler.h less more

21	21	QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC, category().categoryName())
22	22
23	23	class test_LogHandler;
	24	class test_LogModel;
24	25
25	26	namespace governikus
26	27	{

31	32	Q_OBJECT
32	33	friend class Env;
33	34	friend class ::test_LogHandler;
	35	friend class ::test_LogModel;
34	36
35	37	struct LogWindowEntry
36	38	{

86	88
87	89	void setAutoRemove(bool pRemove);
88	90	bool copy(const QString& pDest);
	91	bool copyOther(const QString& pSource, const QString& pDest) const;
89	92	void resetBacklog();
90	93	QByteArray getBacklog(bool pAll = false);
91	94	QByteArray getCriticalLogWindow();

+1

-2

src/global/Randomizer.cpp less more

45	45
46	46	entropy += static_cast<T>(std::chrono::system_clock::now().time_since_epoch().count());
47	47	entropy += std::random_device()();
48		entropy += static_cast<T>(qrand());
49	48	entropy += QRandomGenerator::securelySeeded().generate();
50	49
51	50	UniversalBuffer<T> buffer;

156	155	buffer.number = mGenerator();
157	156	RAND_seed(buffer.data, sizeof(std::mt19937::result_type));
158	157
159		static const int MINIMUM_ENTROPY_SOURCES = 5;
	158	static const int MINIMUM_ENTROPY_SOURCES = 4;
160	159	mSecureRandom = seed.size() >= MINIMUM_ENTROPY_SOURCES;
161	160	}
162	161

+9

-2

src/global/ScopeGuard.h less more

14	14	{
15	15
16	16	QT_WARNING_PUSH
17		QT_WARNING_DISABLE_DEPRECATED
	17	QT_WARNING_DISABLE_DEPRECATED
18	18
19	19	class [[deprecated ("Use qScopeGuard")]] ScopeGuard
20	20	{

32	32
33	33	public:
34	34	ScopeGuard(const ScopeGuard& pCopy) = delete;
35		ScopeGuard(const ScopeGuard && pCopy) = delete;
	35	ScopeGuard(const ScopeGuard&& pCopy) = delete;
36	36	ScopeGuard& operator=(const ScopeGuard& pCopy) = delete;
37	37	ScopeGuard& operator=(const ScopeGuard&& pCopy) = delete;
38	38
39	39	~ScopeGuard();
	40
	41	void dismiss()
	42	{
	43	setEnabled(false);
	44	}
	45
	46
40	47	};
41	48
42	49	#if (QT_VERSION < QT_VERSION_CHECK(5, 12, 0))

+0

-2

src/init/Bootstrap.cpp less more

83	83	#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
84	84	QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
85	85	#endif
86		#if defined(Q_OS_ANDROID) \|\| defined(Q_OS_IOS)
87	86	QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
88		#endif
89	87
90	88	QCoreApplication::setOrganizationName(QStringLiteral(VENDOR));
91	89	QCoreApplication::setOrganizationDomain(QStringLiteral(VENDOR_DOMAIN));

+1

-1

src/init/CommandLineParser.cpp less more

30	30	, mOptionNoLogFile(QStringLiteral("no-logfile"), QStringLiteral("Disable logfile."))
31	31	, mOptionNoLogHandler(QStringLiteral("no-loghandler"), QStringLiteral("Disable default log handler."))
32	32	, mOptionShowWindow(QStringLiteral("show"), QStringLiteral("Show window on startup."))
33		, mOptionProxy(QStringLiteral("no-proxy"), QStringLiteral("Disable system proxy."))
	33	, mOptionProxy(QStringLiteral("no-proxy"), QStringLiteral("Ignore proxy settings."))
34	34	, mOptionUi(QStringLiteral("ui"), QStringLiteral("Use given UI plugin."), UILoader::getInstance().getDefault().join(QLatin1Char(',')))
35	35	, mOptionPort(QStringLiteral("port"), QStringLiteral("Use listening port."), QString::number(PortFile::cDefaultPort))
36	36	{

+1

-1

src/network/DatagramHandler.h less more

18	18	Q_OBJECT
19	19
20	20	public:
21		explicit DatagramHandler(bool pListen = true);
	21	explicit DatagramHandler(bool pEnableListening = true);
22	22	virtual ~DatagramHandler();
23	23	virtual bool isBound() const = 0;
24	24	virtual bool send(const QByteArray& pData) = 0;

+39

-17

src/network/DatagramHandlerImpl.cpp less more

26	26	}
27	27
28	28
29		template<> DatagramHandler* createNewObject<DatagramHandler*, bool>(bool&& pListen)
30		{
31		return new DatagramHandlerImpl(pListen);
	29	template<> DatagramHandler* createNewObject<DatagramHandler*, bool>(bool&& pEnableListening)
	30	{
	31	return new DatagramHandlerImpl(pEnableListening);
32	32	}
33	33
34	34

36	36
37	37	quint16 DatagramHandlerImpl::cPort = PortFile::cDefaultPort;
38	38
39		DatagramHandlerImpl::DatagramHandlerImpl(bool pListen, quint16 pPort)
	39	DatagramHandlerImpl::DatagramHandlerImpl(bool pEnableListening, quint16 pPort)
40	40	: DatagramHandler()
41		, mSocket(new QUdpSocket)
	41	, mSocket()
42	42	, mMulticastLock()
43	43	, mUsedPort(pPort)
44	44	, mPortFile(QStringLiteral("udp"))
45		{
46		#ifndef QT_NO_NETWORKPROXY
	45	, mEnableListening(pEnableListening)
	46	{
	47	resetSocket();
	48	}
	49
	50
	51	void DatagramHandlerImpl::resetSocket()
	52	{
	53	mSocket.reset(new QUdpSocket);
47	54	mSocket->setProxy(QNetworkProxy::NoProxy);
48		#endif
49	55
50	56	connect(mSocket.data(), &QUdpSocket::readyRead, this, &DatagramHandlerImpl::onReadyRead);
51	57
52		if (!pListen)
	58	if (!mEnableListening)
53	59	{
54	60	qCDebug(network) << "Skipping binding";
55	61

93	99
94	100	bool DatagramHandlerImpl::send(const QByteArray& pData)
95	101	{
96		return sendToAllAddressEntries(pData, 0);
	102	if (!sendToAllAddressEntries(pData, 0))
	103	{
	104	qCDebug(network) << "Socket error, resetting broadcasting socket.";
	105	resetSocket();
	106	return false;
	107	}
	108	return true;
97	109	}
98	110
99	111

118	130	const auto& entries = interface.addressEntries();
119	131	for (const QNetworkAddressEntry& addressEntry : entries)
120	132	{
121		switch (addressEntry.ip().protocol())
	133	const auto ipAddr = addressEntry.ip();
	134	if (ipAddr.isLoopback())
	135	{
	136	continue;
	137	}
	138
	139	switch (ipAddr.protocol())
122	140	{
123	141	case QAbstractSocket::NetworkLayerProtocol::IPv4Protocol:
124	142	{
125	143	const QHostAddress& broadcastAddr = addressEntry.broadcast();
	144	#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
	145	if (broadcastAddr.isNull() \|\| !ipAddr.isGlobal())
	146	#else
126	147	if (broadcastAddr.isNull())
127		{
128		continue;
129		}
130		if (addressEntry.ip().isEqual(QHostAddress::LocalHost, QHostAddress::TolerantConversion))
	148	#endif
131	149	{
132	150	continue;
133	151	}

143	161	continue;
144	162	}
145	163
146		const QString& scopeId = addressEntry.ip().scopeId();
	164	const QString& scopeId = ipAddr.scopeId();
	165	#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
	166	if (scopeId.isEmpty() \|\| !(ipAddr.isLinkLocal() \|\| ipAddr.isUniqueLocalUnicast()))
	167	#else
147	168	if (scopeId.isEmpty())
	169	#endif
148	170	{
149	171	continue;
150	172	}

159	181
160	182	default:
161	183	{
162		qCDebug(network) << "Skipping unknown protocol type:" << addressEntry.ip().protocol();
	184	qCDebug(network) << "Skipping unknown protocol type:" << ipAddr.protocol();
163	185	}
164	186	}
165	187	}

+3

-1

src/network/DatagramHandlerImpl.h less more

30	30	QScopedPointer<MulticastLock> mMulticastLock;
31	31	quint16 mUsedPort;
32	32	PortFile mPortFile;
	33	bool mEnableListening;
33	34
	35	void resetSocket();
34	36	bool sendToAddress(const QByteArray& pData, const QHostAddress& pAddress, quint16 pPort = 0);
35	37	bool sendToAllAddressEntries(const QByteArray& pData, quint16 pPort);
36	38
37	39	public:
38	40	static quint16 cPort;
39	41
40		DatagramHandlerImpl(bool pListen = true, quint16 pPort = DatagramHandlerImpl::cPort);
	42	DatagramHandlerImpl(bool pEnableListening = true, quint16 pPort = DatagramHandlerImpl::cPort);
41	43	virtual ~DatagramHandlerImpl() override;
42	44
43	45	virtual bool isBound() const override;

+61

-23

src/network/NetworkManager.cpp less more

3	3
4	4	#include "NetworkManager.h"
5	5
	6	#include "AppSettings.h"
6	7	#include "NetworkReplyError.h"
7	8	#include "NetworkReplyTimeout.h"
8	9	#include "SecureStorage.h"

32	33	, mTrackedConnections()
33	34	, mNetAccessManager(new QNetworkAccessManager())
34	35	{
35		#ifndef QT_NO_NETWORKPROXY
36	36	connect(mNetAccessManager.data(), &QNetworkAccessManager::proxyAuthenticationRequired, this, &NetworkManager::fireProxyAuthenticationRequired);
37		#endif
	37
	38	connect(&Env::getSingleton<AppSettings>()->getGeneralSettings(), &GeneralSettings::fireProxyChanged, this, &NetworkManager::onProxyChanged);
38	39	}
39	40
40	41

158	159	}
159	160
160	161
	162	void NetworkManager::onProxyChanged()
	163	{
	164	setApplicationProxyFactory();
	165	}
	166
	167
161	168	NetworkManager::NetworkError NetworkManager::toNetworkError(const QNetworkReply* const pNetworkReply)
162	169	{
163	170	qCDebug(network) << "Select error message for:" << pNetworkReply->error();

190	197
191	198	GlobalStatus NetworkManager::toTrustedChannelStatus(const QNetworkReply* const pNetworkReply)
192	199	{
	200	const GlobalStatus::ExternalInfoMap infoMap {
	201	{GlobalStatus::ExternalInformation::LAST_URL, pNetworkReply->url().toString()}
	202	};
193	203	switch (toNetworkError(pNetworkReply))
194	204	{
195	205	case NetworkManager::NetworkError::ServiceUnavailable:
196		return GlobalStatus::Code::Workflow_TrustedChannel_ServiceUnavailable;
	206	return {GlobalStatus::Code::Workflow_TrustedChannel_ServiceUnavailable, infoMap};
197	207
198	208	case NetworkManager::NetworkError::TimeOut:
199		return GlobalStatus::Code::Workflow_TrustedChannel_TimeOut;
	209	return {GlobalStatus::Code::Workflow_TrustedChannel_TimeOut, infoMap};
200	210
201	211	case NetworkManager::NetworkError::ProxyError:
202		return GlobalStatus::Code::Workflow_TrustedChannel_Proxy_Error;
	212	return {GlobalStatus::Code::Workflow_TrustedChannel_Proxy_Error, infoMap};
203	213
204	214	case NetworkManager::NetworkError::SecurityError:
205		return GlobalStatus::Code::Workflow_TrustedChannel_Establishment_Error;
	215	return {GlobalStatus::Code::Workflow_TrustedChannel_Establishment_Error, infoMap};
206	216
207	217	case NetworkManager::NetworkError::OtherError:
208		return GlobalStatus::Code::Workflow_TrustedChannel_Other_Network_Error;
209		}
210
211		return GlobalStatus::Code::Unknown_Error;
	218	return {GlobalStatus::Code::Workflow_TrustedChannel_Other_Network_Error, infoMap};
	219	}
	220
	221	return {GlobalStatus::Code::Unknown_Error, infoMap};
212	222	}
213	223
214	224
215	225	GlobalStatus NetworkManager::toStatus(const QNetworkReply* const pNetworkReply)
216	226	{
	227	const GlobalStatus::ExternalInfoMap infoMap {
	228	{GlobalStatus::ExternalInformation::LAST_URL, pNetworkReply->url().toString()}
	229	};
217	230	switch (toNetworkError(pNetworkReply))
218	231	{
219	232	case NetworkManager::NetworkError::ServiceUnavailable:
220		return GlobalStatus::Code::Network_ServiceUnavailable;
	233	return {GlobalStatus::Code::Network_ServiceUnavailable, infoMap};
221	234
222	235	case NetworkManager::NetworkError::TimeOut:
223		return GlobalStatus::Code::Network_TimeOut;
	236	return {GlobalStatus::Code::Network_TimeOut, infoMap};
224	237
225	238	case NetworkManager::NetworkError::ProxyError:
226		return GlobalStatus::Code::Network_Proxy_Error;
	239	return {GlobalStatus::Code::Network_Proxy_Error, infoMap};
227	240
228	241	case NetworkManager::NetworkError::SecurityError:
229		return GlobalStatus::Code::Network_Ssl_Establishment_Error;
	242	return {GlobalStatus::Code::Network_Ssl_Establishment_Error, infoMap};
230	243
231	244	case NetworkManager::NetworkError::OtherError:
232		return GlobalStatus::Code::Network_Other_Error;
233		}
234
235		return GlobalStatus::Code::Unknown_Error;
	245	return {GlobalStatus::Code::Network_Other_Error, infoMap};
	246	}
	247
	248	return {GlobalStatus::Code::Unknown_Error, infoMap};
236	249	}
237	250
238	251

293	306	}
294	307
295	308
296		#ifndef QT_NO_NETWORKPROXY
297	309	namespace
298	310	{
299	311	class NoProxyFactory

343	355
344	356	};
345	357
	358	class CustomProxyFactory
	359	: public QNetworkProxyFactory
	360	{
	361	public:
	362	CustomProxyFactory()
	363	: QNetworkProxyFactory()
	364	{
	365	}
	366
	367
	368	virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery& pInputQuery = QNetworkProxyQuery()) override
	369	{
	370	qCDebug(network) << pInputQuery;
	371	const auto& settings = Env::getSingleton<AppSettings>()->getGeneralSettings();
	372	auto proxy = QNetworkProxy(settings.getCustomProxyType(), settings.getCustomProxyHost(), settings.getCustomProxyPort());
	373	auto proxies = QList<QNetworkProxy>({proxy});
	374	qCDebug(network) << "Found proxies" << proxies;
	375	return proxies;
	376	}
	377
	378
	379	};
	380
346	381	} // namespace
347	382
348	383	void NetworkManager::setApplicationProxyFactory()
349	384	{
	385	const auto& settings = Env::getSingleton<AppSettings>()->getGeneralSettings();
350	386	if (Q_UNLIKELY(mLockProxy))
351	387	{
352		qCWarning(network) << "Won't use system proxy because user locked it!";
	388	qCWarning(network) << "Won't use any proxy because user locked it!";
353	389	qCDebug(network) << "proxy -> none";
354	390	QNetworkProxyFactory::setApplicationProxyFactory(new NoProxyFactory());
355	391	}
	392	else if (settings.useCustomProxy())
	393	{
	394	qCDebug(network) << "proxy -> custom";
	395	QNetworkProxyFactory::setApplicationProxyFactory(new CustomProxyFactory());
	396	}
356	397	else
357	398	{
358	399	qCDebug(network) << "proxy -> system";
359	400	QNetworkProxyFactory::setApplicationProxyFactory(new SystemProxyFactory());
360	401	}
361	402	}
362
363
364		#endif

+1

-0

src/network/NetworkManager.h less more

42	42
43	43	public Q_SLOTS:
44	44	void onShutdown();
	45	void onProxyChanged();
45	46
46	47	protected:
47	48	NetworkManager();

+4

-0

src/network/NetworkReplyError.cpp less more

16	16
17	17	void NetworkReplyError::onErrorSignals()
18	18	{
	19	#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
	20	Q_EMIT errorOccurred(NetworkError::OperationCanceledError);
	21	#else
19	22	Q_EMIT error(NetworkError::OperationCanceledError);
	23	#endif
20	24	Q_EMIT finished();
21	25	}
22	26

+16

-1

src/network/WifiInfo.h less more

0	0	/*!
1		* \brief Provides information about the Wifi status
	1	* \brief Provides information about the WiFi status
2	2	*
3	3	* \copyright Copyright (c) 2017-2020 Governikus GmbH & Co. KG, Germany
4	4	*/

8	8
9	9	#include <QHostAddress>
10	10	#include <QObject>
	11
	12	#if defined(Q_OS_IOS)
	13	#include <Network/Network.h>
	14	#endif
11	15
12	16	class test_WifiInfo;
13	17

22	26	private:
23	27	friend class ::test_WifiInfo;
24	28	bool mWifiEnabled;
	29	#if defined(Q_OS_ANDROID)
25	30	int mWifiCheckTimerId;
	31	#elif defined(Q_OS_IOS)
	32	nw_path_monitor_t mMonitor;
	33	#endif
26	34
27	35	static bool isPrivateIp(const QHostAddress& pAddress);
28	36	static bool hasPrivateIpAddress();
29	37
30	38	bool getCurrentWifiEnabled();
31	39
	40	#if defined(Q_OS_ANDROID)
	41
32	42	protected:
33	43	void timerEvent(QTimerEvent* pEvent) override;
	44	#endif
34	45
35	46	public:
36	47	WifiInfo();
	48	#if defined(Q_OS_IOS)
	49	virtual ~WifiInfo() override;
	50	#else
37	51	virtual ~WifiInfo() override = default;
	52	#endif
38	53
39	54	bool isWifiEnabled();
40	55

+3

-3

src/network/WifiInfo_android.cpp less more

9	9	#include <QtAndroid>
10	10	#include <QTimerEvent>
11	11
12		Q_DECLARE_LOGGING_CATEGORY(qml)
	12	Q_DECLARE_LOGGING_CATEGORY(network)
13	13
14	14
15	15	using namespace governikus;

30	30	const QAndroidJniObject context(QtAndroid::androidContext());
31	31	if (!context.isValid())
32	32	{
33		qCCritical(qml) << "Cannot determine android context.";
	33	qCCritical(network) << "Cannot determine android context.";
34	34	return false;
35	35	}
36	36

41	41
42	42	if (env->ExceptionCheck())
43	43	{
44		qCCritical(qml) << "Cannot call WifiInfo.wifiEnabled()";
	44	qCCritical(network) << "Cannot call WifiInfo.wifiEnabled()";
45	45	env->ExceptionDescribe();
46	46	env->ExceptionClear();
47	47	return false;

+2

-16

src/network/WifiInfo_generic.cpp less more

7	7	#include <QLoggingCategory>
8	8	#include <QTimerEvent>
9	9
10		Q_DECLARE_LOGGING_CATEGORY(qml)
	10	Q_DECLARE_LOGGING_CATEGORY(network)
11	11
12	12
13	13	using namespace governikus;

16	16	WifiInfo::WifiInfo()
17	17	: QObject()
18	18	, mWifiEnabled(getCurrentWifiEnabled())
19		, mWifiCheckTimerId(0)
20	19	{
	20	qCDebug(network) << "NOT IMPLEMENTED";
21	21	}
22	22
23	23

27	27	}
28	28
29	29
30		void WifiInfo::timerEvent(QTimerEvent* pEvent)
31		{
32		QObject::timerEvent(pEvent);
33		}
34
35
36	30	bool WifiInfo::isWifiEnabled()
37	31	{
38		#ifndef QT_NO_DEBUG
39		if (!QCoreApplication::applicationName().startsWith(QLatin1String("QmlTest")))
40
41		#endif
42		{
43		qCWarning(qml) << "NOT IMPLEMENTED";
44		}
45
46	32	return mWifiEnabled;
47	33	}
48	34

+18

-59

src/network/WifiInfo_ios.mm less more

7	7	#include <QTimerEvent>
8	8
9	9	#import <Foundation/Foundation.h>
10		#import <ifaddrs.h>
11		#import <net/if.h>
12	10	#import <UIKit/UIKit.h>
13	11
14		Q_DECLARE_LOGGING_CATEGORY(qml)
	12	Q_DECLARE_LOGGING_CATEGORY(network)
15	13
16	14
17	15	using namespace governikus;
18	16
19
20	17	WifiInfo::WifiInfo()
21	18	: QObject()
22		, mWifiEnabled(getCurrentWifiEnabled())
	19	, mWifiEnabled(false)
23	20	{
24		const int timeoutMs = 1000;
25		mWifiCheckTimerId = startTimer(timeoutMs);
	21	mMonitor = nw_path_monitor_create();
	22	nw_path_monitor_update_handler_t handler = ^(nw_path_t path){
	23	mWifiEnabled = nw_path_uses_interface_type(path, nw_interface_type_wifi);
	24
	25	qCDebug(network) << "WiFi status changed to:" << mWifiEnabled;
	26
	27	Q_EMIT fireWifiEnabledChanged(mWifiEnabled);
	28	};
	29
	30	nw_path_monitor_set_queue(mMonitor, dispatch_get_main_queue());
	31
	32	nw_path_monitor_set_update_handler(mMonitor, handler);
	33	nw_path_monitor_start(mMonitor);
26	34	}
27	35
28	36
29	37	bool WifiInfo::getCurrentWifiEnabled()
30	38	{
31		struct ifaddrs* interfaces;
32		if (!getifaddrs(&interfaces))
33		{
34
35		int en0Count = 0;
36		int awdl0Count = 0;
37
38		for (struct ifaddrs* interface = interfaces; interface != nullptr; interface = interface->ifa_next)
39		{
40		if (!(interface->ifa_flags & IFF_UP))
41		{
42		continue;
43		}
44
45		if (std::strcmp(interface->ifa_name, "en0") == 0)
46		{
47		++en0Count;
48		}
49		else if (std::strcmp(interface->ifa_name, "awdl0") == 0)
50		{
51		++awdl0Count;
52		}
53		}
54
55		freeifaddrs(interfaces);
56
57		// iOS doesn't provide an api to determine if wifi is enabled/connected
58		// On iOS 13 and hopefully later, we can, however, use the network interfaces to
59		// infer this in an undocumented hacky way:
60		// If there is more than one interface with the name "awdl0" it means wifi is enabled.
61		// If there is more than one interface with the name "en0" it means wifi is connected.
62		if (awdl0Count > 1 \|\| en0Count > 1) // Enabled or connected
63		{
64		return true;
65		}
66		}
67
68		return false;
	39	return isWifiEnabled();
69	40	}
70	41
71	42
72		void WifiInfo::timerEvent(QTimerEvent* pEvent)
	43	WifiInfo::~WifiInfo()
73	44	{
74		if (pEvent->timerId() == mWifiCheckTimerId)
75		{
76		pEvent->accept();
77
78		const bool currentEnabled = getCurrentWifiEnabled() \|\| hasPrivateIpAddress();
79		if (mWifiEnabled != currentEnabled)
80		{
81		mWifiEnabled = currentEnabled;
82		Q_EMIT fireWifiEnabledChanged(mWifiEnabled);
83		}
84		}
85
86		QObject::timerEvent(pEvent);
	45	nw_path_monitor_cancel(mMonitor);
87	46	}
88	47
89	48

+2

-2

src/remote_device/RemoteClient.h less more

31	31	void fireEstablishConnectionDone(const QSharedPointer<RemoteDeviceListEntry>& pEntry, const GlobalStatus& pStatus);
32	32
33	33	void fireNewRemoteDispatcher(const QSharedPointer<RemoteDispatcherClient>& pRemoteDispatcher);
34		void fireRemoteDevicesInfo(const QVector<QSharedPointer<RemoteDeviceListEntry> >& pRemoteDevices);
	34	void fireRemoteDevicesInfo(const QVector<QSharedPointer<RemoteDeviceListEntry>>& pRemoteDevices);
35	35	void fireDispatcherDestroyed(GlobalStatus::Code pCloseCode, const QString& pId);
36	36	void fireDetectionChanged();
37	37	void fireCertificateRemoved(const QString& pDeviceName);

46	46
47	47	Q_INVOKABLE virtual void establishConnection(const QSharedPointer<RemoteDeviceListEntry>& pEntry, const QString& pPsk) = 0;
48	48
49		virtual QVector<QSharedPointer<RemoteDeviceListEntry> > getAnnouncingRemoteDevices() const;
	49	virtual QVector<QSharedPointer<RemoteDeviceListEntry>> getAnnouncingRemoteDevices() const;
50	50	Q_INVOKABLE virtual void requestRemoteDevices();
51	51	virtual QStringList getConnectedDeviceIDs() const;
52	52	virtual QVector<RemoteServiceSettings::RemoteInfo> getConnectedDeviceInfos() = 0;

+4

-4

src/remote_device/RemoteClientImpl.cpp less more

152	152	{
153	153	qCCritical(remote_device) << "Remote device refused connection seven times, removing certificate with fingerprint:" << pRemoteDeviceDescriptor.getIfdId();
154	154	RemoteServiceSettings& settings = Env::getSingleton<AppSettings>()->getRemoteServiceSettings();
155		QString deviceName;
	155	QString deviceNameEscaped;
156	156	const auto& infos = settings.getRemoteInfos();
157	157	for (const auto& remoteInfo : infos)
158	158	{
159	159	if (remoteInfo.getFingerprint() == pRemoteDeviceDescriptor.getIfdId())
160	160	{
161		deviceName = remoteInfo.getName();
	161	deviceNameEscaped = remoteInfo.getNameEscaped();
162	162	}
163	163	}
164	164	settings.removeTrustedCertificate(pRemoteDeviceDescriptor.getIfdId());
165	165	mErrorCounter[pRemoteDeviceDescriptor.getIfdId()] = 0;
166		if (!deviceName.isEmpty())
	166	if (!deviceNameEscaped.isEmpty())
167	167	{
168		Q_EMIT fireCertificateRemoved(deviceName);
	168	Q_EMIT fireCertificateRemoved(deviceNameEscaped);
169	169	}
170	170	}
171	171	}

+2

-2

src/remote_device/RemoteClientImpl.h less more

37	37
38	38	QThread mRemoteConnectorThread;
39	39	QPointer<RemoteConnector> mRemoteConnector;
40		QVector<QSharedPointer<RemoteDeviceListEntry> > mRemoteConnectorPending;
	40	QVector<QSharedPointer<RemoteDeviceListEntry>> mRemoteConnectorPending;
41	41	QStringList mConnectedDeviceIds;
42	42
43	43	void bootstrapRemoteConnectorThread();

61	61
62	62	Q_INVOKABLE virtual void establishConnection(const QSharedPointer<RemoteDeviceListEntry>& pEntry, const QString& pPsk) override;
63	63
64		virtual QVector<QSharedPointer<RemoteDeviceListEntry> > getAnnouncingRemoteDevices() const override;
	64	virtual QVector<QSharedPointer<RemoteDeviceListEntry>> getAnnouncingRemoteDevices() const override;
65	65	Q_INVOKABLE virtual void requestRemoteDevices() override;
66	66	virtual QStringList getConnectedDeviceIDs() const override;
67	67	virtual QVector<RemoteServiceSettings::RemoteInfo> getConnectedDeviceInfos() override;

+0

-2

src/remote_device/RemoteConnectorImpl.cpp less more

203	203	connect(mSocket.data(), &QWebSocket::preSharedKeyAuthenticationRequired, this, &ConnectRequest::onPreSharedKeyAuthenticationRequired);
204	204	connect(mSocket.data(), &QWebSocket::sslErrors, this, &ConnectRequest::onSslErrors);
205	205
206		#ifndef QT_NO_NETWORKPROXY
207	206	mSocket->setProxy(QNetworkProxy(QNetworkProxy::NoProxy));
208		#endif
209	207	connect(mSocket.data(), &QWebSocket::connected, this, &ConnectRequest::onConnected);
210	208	connect(mSocket.data(), QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), this, &ConnectRequest::onError);
211	209

+1

-1

src/remote_device/RemoteConnectorImpl.h less more

22	22
23	23	private:
24	24	const int mConnectTimeoutMs;
25		QVector<QSharedPointer<ConnectRequest> > mPendingRequests;
	25	QVector<QSharedPointer<ConnectRequest>> mPendingRequests;
26	26
27	27	void removeRequest(const RemoteDeviceDescriptor& pRemoteDeviceDescriptor);
28	28

+6

-1

src/remote_device/RemoteDeviceList.cpp less more

176	176
177	177	void RemoteDeviceListImpl::clear()
178	178	{
179		mResponsiveList.clear();
	179	decltype(mResponsiveList) removedDevices;
	180	mResponsiveList.swap(removedDevices);
	181	for (const auto& entry : removedDevices)
	182	{
	183	Q_EMIT fireDeviceVanished(entry);
	184	}
180	185	}
181	186
182	187

+3

-3

src/remote_device/RemoteDeviceList.h less more

55	55
56	56	virtual void update(const RemoteDeviceDescriptor& pDescriptor) = 0;
57	57	virtual void clear() = 0;
58		virtual QVector<QSharedPointer<RemoteDeviceListEntry> > getRemoteDevices() const;
	58	virtual QVector<QSharedPointer<RemoteDeviceListEntry>> getRemoteDevices() const;
59	59	};
60	60
61	61

67	67	private:
68	68	QTimer mTimer;
69	69	const int mReaderResponsiveTimeout;
70		QVector<QSharedPointer<RemoteDeviceListEntry> > mResponsiveList;
	70	QVector<QSharedPointer<RemoteDeviceListEntry>> mResponsiveList;
71	71
72	72	private Q_SLOTS:
73	73	void onProcessUnresponsiveRemoteReaders();

78	78
79	79	virtual void update(const RemoteDeviceDescriptor& pDescriptor) override;
80	80	virtual void clear() override;
81		virtual QVector<QSharedPointer<RemoteDeviceListEntry> > getRemoteDevices() const override;
	81	virtual QVector<QSharedPointer<RemoteDeviceListEntry>> getRemoteDevices() const override;
82	82	};
83	83
84	84

+1

-1

src/remote_device/RemoteDispatcher.cpp less more

99	99	{
100	100	RemoteServiceSettings& settings = Env::getSingleton<AppSettings>()->getRemoteServiceSettings();
101	101	auto info = settings.getRemoteInfo(getId());
102		info.setName(pName);
	102	info.setNameUnescaped(pName);
103	103	settings.updateRemoteInfo(info);
104	104	}
105	105

+7

-4

src/remote_device/RemoteTlsServer.cpp less more

23	23	: QTcpServer()
24	24	, mPsk()
25	25	{
26		#ifndef QT_NO_NETWORKPROXY
27	26	//listening with proxy leads to socket error QNativeSocketEnginePrivate::InvalidProxyTypeString
28	27	setProxy(QNetworkProxy(QNetworkProxy::NoProxy));
29		#endif
30	28	}
31	29
32	30

80	78
81	79	if (Q_LIKELY(mSocket->setSocketDescriptor(pSocketDescriptor)))
82	80	{
	81	#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
	82	connect(mSocket.data(), &QAbstractSocket::errorOccurred, this, &RemoteTlsServer::onError);
	83	#else
	84	connect(mSocket.data(), QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
	85	this, &RemoteTlsServer::onError);
	86	#endif
	87
83	88	connect(mSocket.data(), QOverload<const QList<QSslError>&>::of(&QSslSocket::sslErrors),
84	89	this, &RemoteTlsServer::onSslErrors);
85		connect(mSocket.data(), QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
86		this, &RemoteTlsServer::onError);
87	90	connect(mSocket.data(), &QSslSocket::preSharedKeyAuthenticationRequired,
88	91	this, &RemoteTlsServer::onPreSharedKeyAuthenticationRequired);
89	92	connect(mSocket.data(), &QSslSocket::encrypted, this, &RemoteTlsServer::onEncrypted);

+1

-1

src/remote_device/ServerMessageHandler.h less more

52	52	private:
53	53	QPointer<ReaderManager> mReaderManager;
54	54	const QSharedPointer<RemoteDispatcherServer> mRemoteDispatcher;
55		QMap<QString, QSharedPointer<CardConnection> > mCardConnections;
	55	QMap<QString, QSharedPointer<CardConnection>> mCardConnections;
56	56
57	57	QString slotHandleForReaderName(const QString& pReaderName) const;
58	58	QString convertSlotHandleBackwardsCompatibility(const QString& pReaderName);

+10

-0

src/remote_device/messages/Discovery.cpp less more

5	5	#include "Discovery.h"
6	6
7	7	#include "Initializer.h"
	8	#include "RemoteServiceSettings.h"
8	9
9	10	#include <QJsonArray>
10	11	#include <QJsonObject>

56	57
57	58	mIfdName = getStringValue(pMessageObject, IFD_NAME());
58	59	mIfdId = getStringValue(pMessageObject, IFD_ID());
	60	if (!mIfdId.isEmpty() && mIfdId.size() != 64)
	61	{
	62	const QSslCertificate ifdCertificate(mIfdId.toLatin1());
	63	qCDebug(remote_device) << "Received ifdId is not a fingerprint. Interpretion as a certificate to create our own fingerprint" << (ifdCertificate.isNull() ? "failed" : "succeeded");
	64	if (!ifdCertificate.isNull())
	65	{
	66	mIfdId = RemoteServiceSettings::generateFingerprint(ifdCertificate);
	67	}
	68	}
59	69	mPort = static_cast<quint16>(getIntValue(pMessageObject, PORT()));
60	70
61	71	if (!pMessageObject.contains(SUPPORTED_API()))

+2

-2

src/remote_device/plugin/RemoteReaderManagerPlugIn.cpp less more

157	157	RemoteServiceSettings& settings = Env::getSingleton<AppSettings>()->getRemoteServiceSettings();
158	158	auto info = settings.getRemoteInfo(pId);
159	159	bool initialPairing = false;
160		if (info.getName().isEmpty())
	160	if (info.getNameEscaped().isEmpty())
161	161	{
162	162	initialPairing = true;
163	163	}
164		info.setName(pIfdName);
	164	info.setNameUnescaped(pIfdName);
165	165	settings.updateRemoteInfo(info);
166	166
167	167	const auto& remoteDispatcher = mDispatcherList[pId];

+2

-2

src/remote_device/plugin/RemoteReaderManagerPlugIn.h less more

29	29	private:
30	30	QTimer mScanTimer;
31	31	QMultiMap<QString, QString> mReadersForDispatcher;
32		QMap<QString, QSharedPointer<RemoteDispatcherClient> > mDispatcherList;
	32	QMap<QString, QSharedPointer<RemoteDispatcherClient>> mDispatcherList;
33	33	QMap<QString, Reader*> mReaderList;
34	34	bool mConnectToPairedReaders;
35	35	bool mConnectionCheckInProgress;

45	45	void onDispatcherClosed(GlobalStatus::Code pCloseCode, const QString& pId);
46	46	void addRemoteDispatcher(const QSharedPointer<RemoteDispatcherClient>& pRemoteDispatcher);
47	47	void connectToPairedReaders();
48		void continueConnectToPairedReaders(const QVector<QSharedPointer<RemoteDeviceListEntry> >& pRemoteDevices);
	48	void continueConnectToPairedReaders(const QVector<QSharedPointer<RemoteDeviceListEntry>>& pRemoteDevices);
49	49
50	50	public:
51	51	RemoteReaderManagerPlugIn();

+5

-5

src/services/AppUpdater.cpp less more

23	23	Q_DECLARE_LOGGING_CATEGORY(appupdate)
24	24
25	25	AppUpdater::AppUpdater()
26		: mIgnoreNextVersionskip(false)
	26	: mForceUpdate(false)
27	27	, mAppUpdateJsonUrl()
28	28	, mAppUpdateData()
29	29	{

39	39	}
40	40
41	41
42		void AppUpdater::checkAppUpdate(bool pIgnoreNextVersionskip)
	42	void AppUpdater::checkAppUpdate(bool pForceUpdate)
43	43	{
44		mIgnoreNextVersionskip = pIgnoreNextVersionskip;
	44	mForceUpdate = pForceUpdate;
45	45	mAppUpdateData = AppUpdateData();
46	46
47	47	auto* downloader = Env::getSingleton<Downloader>();

79	79
80	80	if (VersionNumber(version) > VersionNumber::getApplicationVersion())
81	81	{
82		if (!mIgnoreNextVersionskip && version == Env::getSingleton<AppSettings>()->getGeneralSettings().getSkipVersion())
	82	if (!mForceUpdate && version == Env::getSingleton<AppSettings>()->getGeneralSettings().getSkipVersion())
83	83	{
84	84	qCInfo(appupdate) << "Version will be skipped:" << version;
85	85	Q_EMIT fireAppUpdateCheckFinished(false, GlobalStatus::Code::No_Error);
86	86	}
87	87	else
88	88	{
89		mIgnoreNextVersionskip = false;
	89	mForceUpdate = false;
90	90	qCInfo(appupdate) << "Found new version:" << version << ", greater than old version" << QCoreApplication::applicationVersion();
91	91	Env::getSingleton<Downloader>()->download(mAppUpdateData.getNotesUrl());
92	92	return;

+2

-2

src/services/AppUpdater.h less more

22	22	private:
23	23	friend class Env;
24	24	friend class ::test_AppUpdater;
25		bool mIgnoreNextVersionskip;
	25	bool mForceUpdate;
26	26	QUrl mAppUpdateJsonUrl;
27	27	AppUpdateData mAppUpdateData;
28	28

34	34	static AppUpdater& getInstance();
35	35
36	36	public:
37		void checkAppUpdate(bool pIgnoreNextVersionskip = false);
	37	void checkAppUpdate(bool pForceUpdate = false);
38	38	const AppUpdateData& getUpdateData() const;
39	39	void skipVersion(const QString& pVersion);
40	40

+64

-53

src/services/Service.cpp less more

14	14
15	15	#include <QMetaObject>
16	16
	17
17	18	using namespace governikus;
18	19
	20
19	21	defineSingleton(Service)
	22
	23
	24	void Service::doAppUpdate(UpdateType pType, bool pForceUpdate)
	25	{
	26	switch (pType)
	27	{
	28	case UpdateType::APP:
	29	mExplicitSuccessMessage = pForceUpdate;
	30	#if defined(Q_OS_WIN) \|\| defined(Q_OS_MACOS) \|\| (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
	31	mTimer.start(mOneDayInMs);
	32	if (pForceUpdate \|\| Env::getSingleton<AppSettings>()->getGeneralSettings().isAutoUpdateCheck())
	33	{
	34	Env::getSingleton<AppUpdater>()->checkAppUpdate(pForceUpdate);
	35	break;
	36	}
	37	#endif
	38	Q_FALLTHROUGH();
	39
	40	case UpdateType::PROVIDER:
	41	Env::getSingleton<ProviderConfiguration>()->update();
	42	break;
	43
	44	case UpdateType::READER:
	45	#if defined(Q_OS_WIN) \|\| defined(Q_OS_MACOS) \|\| (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
	46	Env::getSingleton<ReaderConfiguration>()->update();
	47	#endif
	48	break;
	49	}
	50	}
	51
	52
	53	void Service::onTimedUpdateTriggered()
	54	{
	55	mUpdateScheduled = true;
	56	Q_EMIT fireUpdateScheduled();
	57	}
	58
	59
	60	void Service::onProviderUpdateFinished()
	61	{
	62	doAppUpdate(UpdateType::READER);
	63	}
	64
	65
	66	void Service::onAppUpdateFinished(bool pUpdateAvailable, const GlobalStatus& pError)
	67	{
	68	if (pUpdateAvailable \|\| pError.isError() \|\| mExplicitSuccessMessage)
	69	{
	70	Q_EMIT fireAppUpdateFinished(pUpdateAvailable, pError);
	71	}
	72
	73	if (pError.isNoError())
	74	{
	75	doAppUpdate(UpdateType::PROVIDER);
	76	}
	77	}
	78
20	79
21	80	Service::Service()
22	81	: mTimer(this)

24	83	, mExplicitSuccessMessage(true)
25	84	{
26	85	connect(&mTimer, &QTimer::timeout, this, &Service::onTimedUpdateTriggered);
	86	connect(Env::getSingleton<ProviderConfiguration>(), &ProviderConfiguration::fireUpdated, this, &Service::onProviderUpdateFinished);
	87	connect(Env::getSingleton<ProviderConfiguration>(), &ProviderConfiguration::fireNoUpdateAvailable, this, &Service::onProviderUpdateFinished);
27	88	connect(Env::getSingleton<AppUpdater>(), &AppUpdater::fireAppUpdateCheckFinished, this, &Service::onAppUpdateFinished);
28	89
29	90	mTimer.setSingleShot(true);

37	98	}
38	99
39	100
40		void Service::updateConfigurations()
	101	void Service::updateApp()
41	102	{
42		QMetaObject::invokeMethod(this, &Service::doConfigurationsUpdate, Qt::QueuedConnection);
43		}
44
45
46		void Service::updateApp(bool pIgnoreNextVersionskip)
47		{
48		#if defined(Q_OS_WIN) \|\| defined(Q_OS_MACOS) \|\| (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
49		mExplicitSuccessMessage = pIgnoreNextVersionskip;
50		mTimer.start(mOneDayInMs);
51		QMetaObject::invokeMethod(this, [ = ] {
52		doAppUpdate(pIgnoreNextVersionskip);
53		}, Qt::QueuedConnection);
54		#else
55		Q_UNUSED(pIgnoreNextVersionskip)
56		#endif
57		}
58
59
60		void Service::doConfigurationsUpdate()
61		{
62		#if defined(Q_OS_WIN) \|\| defined(Q_OS_MACOS) \|\| (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
63		Env::getSingleton<ReaderConfiguration>()->update();
64		#endif
65
66		Env::getSingleton<ProviderConfiguration>()->update();
67		}
68
69
70		void Service::doAppUpdate(bool pIgnoreNextVersionskip)
71		{
72		Env::getSingleton<AppUpdater>()->checkAppUpdate(pIgnoreNextVersionskip);
73		}
74
75
76		void Service::onTimedUpdateTriggered()
77		{
78		mUpdateScheduled = true;
79		Q_EMIT fireUpdateScheduled();
	103	doAppUpdate(UpdateType::APP, true);
80	104	}
81	105
82	106

91	115	if (mUpdateScheduled)
92	116	{
93	117	mUpdateScheduled = false;
94		updateConfigurations();
95		if (Env::getSingleton<AppSettings>()->getGeneralSettings().isAutoUpdateCheck())
96		{
97		updateApp();
98		}
	118	doAppUpdate(UpdateType::APP);
99	119	}
100	120	}
101	121

104	124	{
105	125	return Env::getSingleton<AppUpdater>()->getUpdateData();
106	126	}
107
108
109		void Service::onAppUpdateFinished(bool pUpdateAvailable, const GlobalStatus& pError)
110		{
111		if (pUpdateAvailable \|\| pError.isError() \|\| mExplicitSuccessMessage)
112		{
113		Q_EMIT fireAppUpdateFinished(pUpdateAvailable, pError);
114		}
115		}

+13

-8

src/services/Service.h less more

17	17	friend class Env;
18	18
19	19	private:
	20	enum class UpdateType
	21	{
	22	APP, PROVIDER, READER
	23	};
	24
20	25	QTimer mTimer;
21	26	bool mUpdateScheduled;
22	27	bool mExplicitSuccessMessage;
23	28	const int mOneDayInMs = 1000 * 60 * 60 * 24;
	29
	30	void doAppUpdate(UpdateType pType, bool pForceUpdate = false);
	31
	32	private Q_SLOTS:
	33	void onTimedUpdateTriggered();
	34	void onProviderUpdateFinished();
	35	void onAppUpdateFinished(bool pUpdateAvailable, const GlobalStatus& pError);
24	36
25	37	protected:
26	38	Service();
27	39	virtual ~Service() = default;
28	40	static Service& getInstance();
29	41
30		private Q_SLOTS:
31		void doConfigurationsUpdate();
32		void doAppUpdate(bool pIgnoreNextVersionskip);
33		void onTimedUpdateTriggered();
34		void onAppUpdateFinished(bool pUpdateAvailable, const GlobalStatus& pError);
35
36	42	public:
37		void updateConfigurations();
38		void updateApp(bool pIgnoreNextVersionskip = false);
	43	void updateApp();
39	44	bool isUpdateScheduled();
40	45	Q_INVOKABLE void runUpdateIfNeeded();
41	46	const AppUpdateData& getUpdateData() const;

+156

-16

src/settings/GeneralSettings.cpp less more

33	33	SETTINGS_NAME(SETTINGS_NAME_USE_SELF_AUTH_TEST_URI, "selfauthTestUri")
34	34	SETTINGS_NAME(SETTINGS_NAME_LANGUAGE, "language")
35	35	SETTINGS_NAME(SETTINGS_NAME_SELECTED_UI, "selectedUi")
	36	SETTINGS_NAME(SETTINGS_NAME_SCREEN_ORIENTATION, "screenOrientation")
36	37	SETTINGS_NAME(SETTINGS_NAME_DEVICE_SURVEY_PENDING, "deviceSurveyPending")
37	38	SETTINGS_NAME(SETTINGS_NAME_LAST_READER_PLUGIN_TYPE, "lastTechnology")
38	39	SETTINGS_NAME(SETTINGS_NAME_IN_APP_NOTIFICATIONS, "showInAppNotifications")
39	40	SETTINGS_NAME(SETTINGS_NAME_REQUEST_STORE_FEEDBACK, "requestStoreFeedback")
40		SETTINGS_NAME(SETTINGS_GROUP_NAME_COMMON, "common")
41	41	SETTINGS_NAME(SETTINGS_NAME_AUTO, "autoUpdateCheck")
42	42	SETTINGS_NAME(SETTINGS_NAME_KEYLESS_PASSWORD, "keylessPassword")
43	43	SETTINGS_NAME(SETTINGS_NAME_VISUAL_PRIVACY, "visualPrivacy")
44	44	SETTINGS_NAME(SETTINGS_NAME_SHUFFLE_SCREEN_KEYBOARD, "shuffleScreenKeyboard")
	45	SETTINGS_NAME(SETTINGS_NAME_CUSTOM_PROXY_HOST, "customProxyHost")
	46	SETTINGS_NAME(SETTINGS_NAME_CUSTOM_PROXY_PORT, "customProxyPort")
	47	SETTINGS_NAME(SETTINGS_NAME_CUSTOM_PROXY_TYPE, "customProxyType")
	48	SETTINGS_NAME(SETTINGS_NAME_USE_CUSTOM_PROXY, "useCustomProxy")
	49	SETTINGS_NAME(SETTINGS_NAME_ENABLE_CAN_ALLOWED, "enableCanAllowed")
	50	SETTINGS_NAME(SETTINGS_NAME_SKIP_RIGHTS_ON_CAN_ALLOWED, "skipRightsOnCanAllowed")
45	51	} // namespace
46	52
47	53	GeneralSettings::GeneralSettings()

59	65	mStoreCommon->beginGroup(QStringLiteral("providers"));
60	66	mStoreCommon->remove(QString()); // remove the whole group
61	67	mStoreCommon->endGroup();
62		}
63
64		mStoreCommon->beginGroup(SETTINGS_GROUP_NAME_COMMON());
	68
	69	// With 1.20.1 the common values are moved to the general values
	70
	71	mStoreCommon->beginGroup(QStringLiteral("common"));
	72	if (!autoUpdateCheckIsSetByAdmin() && mStoreCommon->contains(SETTINGS_NAME_AUTO()))
	73	{
	74	mStoreGeneral->setValue(SETTINGS_NAME_AUTO(), mStoreCommon->value(SETTINGS_NAME_AUTO()).toBool());
	75	}
	76	if (mStoreCommon->contains(SETTINGS_NAME_KEYLESS_PASSWORD()))
	77	{
	78	mStoreGeneral->setValue(SETTINGS_NAME_KEYLESS_PASSWORD(), mStoreCommon->value(SETTINGS_NAME_KEYLESS_PASSWORD()).toBool());
	79	}
	80	if (mStoreCommon->contains(SETTINGS_NAME_SHUFFLE_SCREEN_KEYBOARD()))
	81	{
	82	mStoreGeneral->setValue(SETTINGS_NAME_SHUFFLE_SCREEN_KEYBOARD(), mStoreCommon->value(SETTINGS_NAME_SHUFFLE_SCREEN_KEYBOARD()).toBool());
	83	}
	84	mStoreCommon->remove(QString()); // remove the whole group
	85	mStoreCommon->endGroup();
	86	}
65	87
66	88	// QFuture.result() crashes under linux and win if uninitalized
67	89	mAutoStart = QtConcurrent::run([] {

371	393	}
372	394
373	395
	396	QString GeneralSettings::getScreenOrientation() const
	397	{
	398	return mStoreGeneral->value(SETTINGS_NAME_SCREEN_ORIENTATION(), QStringLiteral("auto")).toString();
	399	}
	400
	401
	402	void GeneralSettings::setScreenOrientation(const QString& pScreenOrientation)
	403	{
	404	if (pScreenOrientation != getScreenOrientation())
	405	{
	406	mStoreGeneral->setValue(SETTINGS_NAME_SCREEN_ORIENTATION(), pScreenOrientation);
	407	Q_EMIT fireSettingsChanged();
	408	}
	409	}
	410
	411
374	412	bool GeneralSettings::askForDeviceSurvey() const
375	413	{
376	414	return !mStoreGeneral->contains(SETTINGS_NAME_DEVICE_SURVEY_PENDING());

447	485	{
448	486	if (autoUpdateCheckIsSetByAdmin())
449	487	{
450		mStoreCommon->remove(SETTINGS_NAME_AUTO());
451		// Start writing the new path since 1.17, too, so that we can rely on it in a future version.
452	488	mStoreGeneral->remove(SETTINGS_NAME_AUTO());
453	489	}
454	490
455	491	#if defined(Q_OS_WIN) \|\| defined(Q_OS_MACOS)
456		return mStoreCommon->value(SETTINGS_NAME_AUTO(), true).toBool();
	492	return mStoreGeneral->value(SETTINGS_NAME_AUTO(), true).toBool();
457	493
458	494	#else
459		return mStoreCommon->value(SETTINGS_NAME_AUTO(), false).toBool();
	495	return mStoreGeneral->value(SETTINGS_NAME_AUTO(), false).toBool();
460	496
461	497	#endif
462	498	}

474	510	#endif
475	511	#endif
476	512
477		settings.beginGroup(SETTINGS_GROUP_NAME_COMMON());
478	513	return settings.contains(SETTINGS_NAME_AUTO());
479	514	}
480	515

483	518	{
484	519	if (!autoUpdateCheckIsSetByAdmin() && pAutoUpdateCheck != isAutoUpdateCheck())
485	520	{
486		mStoreCommon->setValue(SETTINGS_NAME_AUTO(), pAutoUpdateCheck);
487		// Start writing the new path since 1.17, too, so that we can rely on it in a future version.
488	521	mStoreGeneral->setValue(SETTINGS_NAME_AUTO(), pAutoUpdateCheck);
489	522	Q_EMIT fireSettingsChanged();
490	523	}

493	526
494	527	bool GeneralSettings::isUseScreenKeyboard() const
495	528	{
496		return mStoreCommon->value(SETTINGS_NAME_KEYLESS_PASSWORD(), false).toBool();
	529	return mStoreGeneral->value(SETTINGS_NAME_KEYLESS_PASSWORD(), false).toBool();
497	530	}
498	531
499	532

501	534	{
502	535	if (pUseScreenKeyboard != isUseScreenKeyboard())
503	536	{
504		mStoreCommon->setValue(SETTINGS_NAME_KEYLESS_PASSWORD(), pUseScreenKeyboard);
505		// Start writing the new path since 1.17, too, so that we can rely on it in a future version.
506	537	mStoreGeneral->setValue(SETTINGS_NAME_KEYLESS_PASSWORD(), pUseScreenKeyboard);
507	538	Q_EMIT fireSettingsChanged();
508	539	}

527	558
528	559	bool GeneralSettings::isShuffleScreenKeyboard() const
529	560	{
530		return mStoreCommon->value(SETTINGS_NAME_SHUFFLE_SCREEN_KEYBOARD(), false).toBool();
	561	return mStoreGeneral->value(SETTINGS_NAME_SHUFFLE_SCREEN_KEYBOARD(), false).toBool();
531	562	}
532	563
533	564

535	566	{
536	567	if (pShuffleScreenKeyboard != isShuffleScreenKeyboard())
537	568	{
538		mStoreCommon->setValue(SETTINGS_NAME_SHUFFLE_SCREEN_KEYBOARD(), pShuffleScreenKeyboard);
	569	mStoreGeneral->setValue(SETTINGS_NAME_SHUFFLE_SCREEN_KEYBOARD(), pShuffleScreenKeyboard);
	570	Q_EMIT fireSettingsChanged();
	571	}
	572	}
	573
	574
	575	bool GeneralSettings::isEnableCanAllowed() const
	576	{
	577	return mStoreGeneral->value(SETTINGS_NAME_ENABLE_CAN_ALLOWED(), false).toBool();
	578	}
	579
	580
	581	void GeneralSettings::setEnableCanAllowed(bool pEnableCanAllowed)
	582	{
	583	if (pEnableCanAllowed != isEnableCanAllowed())
	584	{
	585	mStoreGeneral->setValue(SETTINGS_NAME_ENABLE_CAN_ALLOWED(), pEnableCanAllowed);
	586	Q_EMIT fireSettingsChanged();
	587	}
	588	}
	589
	590
	591	bool GeneralSettings::isSkipRightsOnCanAllowed() const
	592	{
	593	if (!isEnableCanAllowed())
	594	{
	595	return false;
	596	}
	597	return mStoreGeneral->value(SETTINGS_NAME_SKIP_RIGHTS_ON_CAN_ALLOWED(), false).toBool();
	598	}
	599
	600
	601	void GeneralSettings::setSkipRightsOnCanAllowed(bool pSkipRightsOnCanAllowed)
	602	{
	603	if (pSkipRightsOnCanAllowed != isSkipRightsOnCanAllowed())
	604	{
	605	mStoreGeneral->setValue(SETTINGS_NAME_SKIP_RIGHTS_ON_CAN_ALLOWED(), pSkipRightsOnCanAllowed);
539	606	Q_EMIT fireSettingsChanged();
540	607	}
541	608	}

560	627	Q_EMIT fireShowInAppNotificationsChanged();
561	628	}
562	629	}
	630
	631
	632	bool GeneralSettings::isCustomProxyHost() const
	633	{
	634	return !getCustomProxyHost().isEmpty();
	635	}
	636
	637
	638	QString GeneralSettings::getCustomProxyHost() const
	639	{
	640	return mStoreGeneral->value(SETTINGS_NAME_CUSTOM_PROXY_HOST(), QString()).toString();
	641	}
	642
	643
	644	bool GeneralSettings::isCustomProxyType() const
	645	{
	646	return getCustomProxyType() != QNetworkProxy::ProxyType::NoProxy;
	647	}
	648
	649
	650	QNetworkProxy::ProxyType GeneralSettings::getCustomProxyType() const
	651	{
	652	QNetworkProxy::ProxyType result;
	653	auto value = mStoreGeneral->value(SETTINGS_NAME_CUSTOM_PROXY_TYPE(), QString()).toString().toLower();
	654	if (value == QLatin1String("socks5"))
	655	{
	656	result = QNetworkProxy::ProxyType::Socks5Proxy;
	657	}
	658	else if (value == QLatin1String("http"))
	659	{
	660	result = QNetworkProxy::ProxyType::HttpProxy;
	661	}
	662	else
	663	{
	664	result = QNetworkProxy::ProxyType::NoProxy;
	665	}
	666	return result;
	667	}
	668
	669
	670	bool GeneralSettings::isCustomProxyPort() const
	671	{
	672	return getCustomProxyPort() != 0;
	673	}
	674
	675
	676	quint16 GeneralSettings::getCustomProxyPort() const
	677	{
	678	return static_cast<quint16>(mStoreGeneral->value(SETTINGS_NAME_CUSTOM_PROXY_PORT(), 0).toInt());
	679	}
	680
	681
	682	bool GeneralSettings::customProxyAttributesPresent() const
	683	{
	684	return isCustomProxyHost() && isCustomProxyType() && isCustomProxyPort();
	685	}
	686
	687
	688	bool GeneralSettings::useCustomProxy() const
	689	{
	690	bool useCustomProxy = mStoreGeneral->value(SETTINGS_NAME_USE_CUSTOM_PROXY(), true).toBool();
	691	return useCustomProxy && customProxyAttributesPresent();
	692	}
	693
	694
	695	void GeneralSettings::setUseCustomProxy(bool pUseCustomProxy)
	696	{
	697	if (useCustomProxy() != pUseCustomProxy)
	698	{
	699	mStoreGeneral->setValue(SETTINGS_NAME_USE_CUSTOM_PROXY(), pUseCustomProxy);
	700	Q_EMIT fireProxyChanged();
	701	}
	702	}

+24

-0

src/settings/GeneralSettings.h less more

8	8	#include "AbstractSettings.h"
9	9
10	10	#include <QFuture>
	11	#include <QNetworkProxy>
11	12	#include <QUuid>
12	13
13	14	class test_GeneralSettings;

83	84	QString getSelectedUi() const;
84	85	void setSelectedUi(const QString& pSelectedUi);
85	86
	87	QString getScreenOrientation() const;
	88	void setScreenOrientation(const QString& pScreenOrientation);
	89
86	90	bool askForDeviceSurvey() const;
87	91	bool isDeviceSurveyPending() const;
88	92	void setDeviceSurveyPending(bool pDeviceSurveyPending);

108	112	bool isShuffleScreenKeyboard() const;
109	113	void setShuffleScreenKeyboard(bool pShuffleScreenKeyboard);
110	114
	115	bool isEnableCanAllowed() const;
	116	void setEnableCanAllowed(bool pEnableCanAllowed);
	117
	118	bool isSkipRightsOnCanAllowed() const;
	119	void setSkipRightsOnCanAllowed(bool pSkipRightsOnCanAllowed);
	120
111	121	bool isShowInAppNotifications() const;
112	122	void setShowInAppNotifications(bool pShowInAppNotifications);
	123
	124	bool isCustomProxyType() const;
	125	QNetworkProxy::ProxyType getCustomProxyType() const;
	126
	127	bool isCustomProxyHost() const;
	128	QString getCustomProxyHost() const;
	129
	130	bool isCustomProxyPort() const;
	131	quint16 getCustomProxyPort() const;
	132
	133	bool customProxyAttributesPresent() const;
	134	bool useCustomProxy() const;
	135	void setUseCustomProxy(bool pUseCustomProxy);
113	136
114	137	Q_SIGNALS:
115	138	void fireLanguageChanged();
116	139	void fireDeveloperOptionsChanged();
117	140	void fireShowInAppNotificationsChanged();
	141	void fireProxyChanged();
118	142	};
119	143
120	144

+15

-10

src/settings/RemoteServiceSettings.cpp less more

342	342	}
343	343
344	344
	345	QString RemoteServiceSettings::escapeDeviceName(const QString& pDeviceNameUnescaped)
	346	{
	347	return pDeviceNameUnescaped.left(33).toHtmlEscaped();
	348	}
	349
	350
345	351	RemoteServiceSettings::RemoteInfo::RemoteInfo(const QString& pFingerprint,
346		const QDateTime& pLastConnected,
347		const QString& pName)
	352	const QDateTime& pLastConnected)
348	353	: mFingerprint(pFingerprint)
349		, mName(pName)
	354	, mName()
350	355	, mLastConnected(pLastConnected)
351	356	{
352	357	}

378	383	}
379	384
380	385
381		const QString& RemoteServiceSettings::RemoteInfo::getName() const
382		{
383		return mName;
384		}
385
386
387		void RemoteServiceSettings::RemoteInfo::setName(const QString& pName)
	386	QString RemoteServiceSettings::RemoteInfo::getNameEscaped() const
	387	{
	388	return RemoteServiceSettings::escapeDeviceName(mName);
	389	}
	390
	391
	392	void RemoteServiceSettings::RemoteInfo::setNameUnescaped(const QString& pName)
388	393	{
389	394	mName = pName;
390	395	}

+5

-4

src/settings/RemoteServiceSettings.h less more

46	46	QDateTime mLastConnected;
47	47
48	48	RemoteInfo(const QString& pFingerprint,
49		const QDateTime& pLastConnected = QDateTime(),
50		const QString& pName = QString());
	49	const QDateTime& pLastConnected);
51	50
52	51	public:
53	52	RemoteInfo() = default;

57	56
58	57	const QString& getFingerprint() const;
59	58
60		const QString& getName() const;
61		void setName(const QString& pName);
	59	QString getNameEscaped() const;
	60	void setNameUnescaped(const QString& pName);
62	61
63	62	const QDateTime& getLastConnected() const;
64	63	void setLastConnected(const QDateTime& pLastConnected);

107	106	QVector<RemoteInfo> getRemoteInfos() const;
108	107	bool updateRemoteInfo(const RemoteInfo& pInfo);
109	108
	109	static QString escapeDeviceName(const QString& pDeviceNameUnescaped);
	110
110	111	Q_SIGNALS:
111	112	void fireTrustedCertificatesChanged();
112	113	void fireTrustedRemoteInfosChanged();

+0

-4

src/ui/base/UIPlugIn.cpp less more

36	36	}
37	37
38	38
39		#ifndef QT_NO_NETWORKPROXY
40	39	void UIPlugIn::onProxyAuthenticationRequired(const QNetworkProxy& pProxy, QAuthenticator* pAuthenticator)
41	40	{
42	41	Q_UNUSED(pProxy)

55	54	void UIPlugIn::onUiDominationReleased()
56	55	{
57	56	}
58
59
60		#endif

+0

-2

src/ui/base/UIPlugIn.h less more

44	44	virtual void onShowUi(UiModule pModule);
45	45	virtual void onHideUi();
46	46	virtual void onShowReaderSettings();
47		#ifndef QT_NO_NETWORKPROXY
48	47	virtual void onProxyAuthenticationRequired(const QNetworkProxy& pProxy, QAuthenticator* pAuthenticator);
49		#endif
50	48	virtual void onUiDomination(const UIPlugIn* pUi, const QString& pInformation, bool pAccepted);
51	49	virtual void onUiDominationReleased();
52	50

+12

-4

src/ui/common/Email.cpp less more

7	7	#include "GlobalStatus.h"
8	8	#include "LogHandler.h"
9	9
10		#include <QUrl>
11
12	10	namespace governikus
13	11	{
14	12
15		QString generateMailBody(const GlobalStatus& pStatus)
	13	QString generateMailBody(const GlobalStatus& pStatus, const QUrl& pServiceUrl)
16	14	{
17	15	const auto& logHandler = Env::getSingleton<LogHandler>();
18	16	QStringList mailBody(QObject::tr("Please describe the error that occurred."));

36	34	mailBody << newLine + QObject::tr("Error code") + QLatin1Char(':');
37	35	mailBody << getEnumName(pStatus.getStatusCode());
38	36
	37	if (!pServiceUrl.isEmpty())
	38	{
	39	const auto& serviceUrlStub = pServiceUrl.scheme() + QStringLiteral("://") + pServiceUrl.authority();
	40	mailBody << newLine + QObject::tr("Service URL") + QLatin1Char(':') << serviceUrlStub;
	41	}
	42
	43	mailBody << newLine + QObject::tr("Parameter of occurred error:") << pStatus.getExternalInfo(newLine);
	44
39	45	if (logHandler->hasCriticalLog())
40	46	{
41	47	const QString criticalMessages = QString::fromUtf8(logHandler->getCriticalLogWindow());
42	48	mailBody << newLine + QObject::tr("Critical errors:") + newLine + criticalMessages;
43	49	}
44	50
45		return mailBody.join(newLine);
	51	// We need to replace the ambersand char since it will signal the end of the predefined mail body
	52	// and everything beyond that ambersand will be missing from the mail.
	53	return mailBody.join(newLine).replace(QStringLiteral("&"), QStringLiteral("%26"));
46	54	}
47	55
48	56

+2

-1

src/ui/common/Email.h less more

4	4	#pragma once
5	5
6	6	#include <QString>
	7	#include <QUrl>
7	8
8	9	namespace governikus
9	10	{
10	11
11	12	class GlobalStatus;
12	13
13		QString generateMailBody(const GlobalStatus&);
	14	QString generateMailBody(const GlobalStatus& pStatus, const QUrl& pServiceUrl = {});
14	15
15	16	} // namespace governikus

+10

-3

src/ui/common/ReaderDriverModel.cpp less more

260	260	}
261	261
262	262
263		QString ReaderDriverModel::getEmptyListDescriptionString() const
264		{
265		const QString& url = HelpAction::getOnlineUrl(QStringLiteral("readerDeviceTab"));
	263	QString ReaderDriverModel::getEmptyListDescriptionStringQml() const
	264	{
	265	return getEmptyListDescriptionString(false);
	266	}
	267
	268
	269	QString ReaderDriverModel::getEmptyListDescriptionString(bool pWidgetUiHelp) const
	270	{
	271	const QString& onlineHelpSection = pWidgetUiHelp ? QStringLiteral("readerDeviceTab") : QStringLiteral("settingsPcscReader");
	272	const QString& url = HelpAction::getOnlineUrl(onlineHelpSection, pWidgetUiHelp);
266	273	//: Is embedded in a sentence.
267	274	const QString& hyperlink = QStringLiteral("<a href=\"%1\">%2</a>").arg(url, tr("online help"));
268	275	//: INFO ALL_PLATFORMS No card reader was found, the message contains a link to the installation section of the manual.

+3

-2

src/ui/common/ReaderDriverModel.h less more

23	23	Q_OBJECT
24	24
25	25	Q_PROPERTY(QString noReaderFoundIconPath READ getNoReaderFoundIconPath CONSTANT)
26		Q_PROPERTY(QString emptyListDescriptionString READ getEmptyListDescriptionString NOTIFY fireLanguageChanged)
	26	Q_PROPERTY(QString emptyListDescriptionString READ getEmptyListDescriptionStringQml NOTIFY fireLanguageChanged)
27	27	Q_PROPERTY(QString lastUpdatedInformation READ getLastUpdatedInformation NOTIFY fireModelChanged)
28	28
29	29	private:

66	66	QString getReaderImagePath(const QModelIndex& pIndex) const;
67	67	QString getNoReaderFoundIconPath() const;
68	68	QString getHTMLDescription(const QModelIndex& pIndex) const;
69		QString getEmptyListDescriptionString() const;
	69	QString getEmptyListDescriptionStringQml() const;
	70	QString getEmptyListDescriptionString(bool pWidgetUiHelp = true) const;
70	71	bool isInstalledSupportedReader(const QModelIndex& pIndex) const;
71	72	QString getLastUpdatedInformation() const;
72	73

+30

-20

src/ui/common/RemoteDeviceModel.cpp less more

15	15
16	16	using namespace governikus;
17	17
18		RemoteDeviceModelEntry::RemoteDeviceModelEntry(const QString& pDeviceName, const QString& pId, QSharedPointer<RemoteDeviceListEntry>& pRemoteDeviceListEntry)
19		: mDeviceName(pDeviceName)
	18	RemoteDeviceModelEntry::RemoteDeviceModelEntry(const QString& pDeviceNameEscaped, const QString& pId, QSharedPointer<RemoteDeviceListEntry>& pRemoteDeviceListEntry)
	19	: mDeviceName(pDeviceNameEscaped)
20	20	, mId(pId)
21	21	, mPaired(false)
22	22	, mNetworkVisible(false)

25	25	, mLastConnected()
26	26	, mRemoteDeviceListEntry(pRemoteDeviceListEntry)
27	27	{
28		}
29
30
31		RemoteDeviceModelEntry::RemoteDeviceModelEntry(const QString& pDeviceName, const QString& pId, bool pNetworkVisible, bool pConnected, bool pSupported, const QDateTime& pLastConnected, QSharedPointer<RemoteDeviceListEntry>& pRemoteDeviceListEntry)
32		: mDeviceName(pDeviceName)
	28	Q_ASSERT(!mDeviceName.contains(QLatin1Char('<')));
	29	}
	30
	31
	32	RemoteDeviceModelEntry::RemoteDeviceModelEntry(const QString& pDeviceNameEscaped, const QString& pId, bool pNetworkVisible, bool pConnected, bool pSupported, const QDateTime& pLastConnected, QSharedPointer<RemoteDeviceListEntry>& pRemoteDeviceListEntry)
	33	: mDeviceName(pDeviceNameEscaped)
33	34	, mId(pId)
34	35	, mPaired(true)
35	36	, mNetworkVisible(pNetworkVisible)

38	39	, mLastConnected(pLastConnected)
39	40	, mRemoteDeviceListEntry(pRemoteDeviceListEntry)
40	41	{
41		}
42
43
44		RemoteDeviceModelEntry::RemoteDeviceModelEntry(const QString& pDeviceName)
45		: mDeviceName(pDeviceName)
	42	Q_ASSERT(!mDeviceName.contains(QLatin1Char('<')));
	43	}
	44
	45
	46	RemoteDeviceModelEntry::RemoteDeviceModelEntry(const QString& pDeviceNameEscaped)
	47	: mDeviceName(pDeviceNameEscaped)
46	48	, mId()
47	49	, mPaired(false)
48	50	, mNetworkVisible(false)

51	53	, mLastConnected()
52	54	, mRemoteDeviceListEntry(nullptr)
53	55	{
	56	Q_ASSERT(!mDeviceName.contains(QLatin1Char('<')));
54	57	}
55	58
56	59

60	63	}
61	64
62	65
63		QString RemoteDeviceModelEntry::getDeviceName() const
	66	QString RemoteDeviceModelEntry::getDeviceNameEscaped() const
64	67	{
65	68	return mDeviceName;
66	69	}

266	269	supported = true;
267	270	}
268	271	auto modelEntry = RemoteDeviceModelEntry(
269		pairedReader.getName(),
	272	pairedReader.getNameEscaped(),
270	273	pairedReader.getFingerprint(),
271	274	visible,
272	275	connected,

326	329	for (auto deviceListEntry : announcingRemoteDevices)
327	330	{
328	331	const auto& deviceDescriptor = deviceListEntry->getRemoteDeviceDescriptor();
329		auto modelEntry = RemoteDeviceModelEntry(deviceDescriptor.getIfdName(), deviceDescriptor.getIfdId(), deviceListEntry);
	332	auto modelEntry = RemoteDeviceModelEntry(RemoteServiceSettings::escapeDeviceName(deviceDescriptor.getIfdName()), deviceDescriptor.getIfdId(), deviceListEntry);
330	333	presentReaders.append(modelEntry);
331	334	}
332	335

404	407	}
405	408	else
406	409	{
407		return reader.getDeviceName();
	410	return reader.getDeviceNameEscaped();
408	411	}
409	412
410	413	case REMOTE_DEVICE_NAME:
411		return reader.getDeviceName();
	414	return reader.getDeviceNameEscaped();
412	415
413	416	case REMOTE_DEVICE_STATUS:
414	417	return getStatus(reader);

568	571	}
569	572
570	573
571		QString RemoteDeviceModel::getEmptyListDescriptionString() const
572		{
573		const QString& url = HelpAction::getOnlineUrl(QStringLiteral("readerDeviceTab"));
	574	QString RemoteDeviceModel::getEmptyListDescriptionStringQml() const
	575	{
	576	return getEmptyListDescriptionString(false);
	577	}
	578
	579
	580	QString RemoteDeviceModel::getEmptyListDescriptionString(bool pWidgetUiHelp) const
	581	{
	582	const QString& onlineHelpSection = pWidgetUiHelp ? QStringLiteral("readerDeviceTab") : QStringLiteral("settingsRemoteReader");
	583	const QString& url = HelpAction::getOnlineUrl(onlineHelpSection, pWidgetUiHelp);
574	584	//: Is embedded in a sentence.
575	585	const QString& hyperlink = QStringLiteral("<a href=\"%1\">%2</a>").arg(url, tr("online help"));
576	586	//: INFO ALL_PLATFORMS No smartphone with enabled remote service was found on the same network.

+7

-6

src/ui/common/RemoteDeviceModel.h less more

36	36	QSharedPointer<RemoteDeviceListEntry> mRemoteDeviceListEntry;
37	37
38	38	public:
39		RemoteDeviceModelEntry(const QString& pDeviceName, const QString& mId, QSharedPointer<RemoteDeviceListEntry>& pRemoteDeviceListEntry);
40		RemoteDeviceModelEntry(const QString& pDeviceName, const QString& mId, bool pNetworkVisible, bool pConnected, bool pSupported, const QDateTime& pLastConnected, QSharedPointer<RemoteDeviceListEntry>& pRemoteDeviceListEntry);
41		RemoteDeviceModelEntry(const QString& pDeviceName = QStringLiteral("UnknownReader"));
	39	RemoteDeviceModelEntry(const QString& pDeviceNameEscaped, const QString& mId, QSharedPointer<RemoteDeviceListEntry>& pRemoteDeviceListEntry);
	40	RemoteDeviceModelEntry(const QString& pDeviceNameEscaped, const QString& mId, bool pNetworkVisible, bool pConnected, bool pSupported, const QDateTime& pLastConnected, QSharedPointer<RemoteDeviceListEntry>& pRemoteDeviceListEntry);
	41	RemoteDeviceModelEntry(const QString& pDeviceNameEscaped = QStringLiteral("UnknownReader"));
42	42
43	43	bool isPaired() const;
44	44	void setPaired(bool pPaired);

53	53	bool operator==(const RemoteDeviceModelEntry& pOther) const;
54	54
55	55	const QSharedPointer<RemoteDeviceListEntry> getRemoteDeviceListEntry() const;
56		QString getDeviceName() const;
	56	QString getDeviceNameEscaped() const;
57	57
58	58	};
59	59

62	62	{
63	63	Q_OBJECT
64	64
65		Q_PROPERTY(QString emptyListDescriptionString READ getEmptyListDescriptionString NOTIFY fireLanguageChanged)
	65	Q_PROPERTY(QString emptyListDescriptionString READ getEmptyListDescriptionStringQml NOTIFY fireLanguageChanged)
66	66
67	67	private:
68	68	friend class ::test_RemoteDeviceModel;

120	120	void forgetDevice(const QModelIndex& pIndex);
121	121	void forgetDevice(const QString& pDeviceId);
122	122
123		QString getEmptyListDescriptionString() const;
	123	QString getEmptyListDescriptionStringQml() const;
	124	QString getEmptyListDescriptionString(bool pWidgetUiHelp = true) const;
124	125
125	126	public Q_SLOTS:
126	127	void onUiShown();

+4

-0

src/ui/common/TrayIcon.cpp less more

32	32
33	33	TrayIcon::TrayIcon()
34	34	: QObject()
	35	#ifdef Q_OS_MACOS
	36	, mIcon(QStringLiteral(":/images/macos/appIcon.svg"))
	37	#else
35	38	, mIcon(QStringLiteral(":/images/npa.svg"))
	39	#endif
36	40	#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
37	41	, mTrayIcon(nullptr)
38	42	#endif

+25

-27

src/ui/qml/ApplicationModel.cpp less more

9	9
10	10	#include "AppSettings.h"
11	11	#include "BuildHelper.h"
12		#include "DpiCalculator.h"
13	12	#include "Env.h"
14	13	#include "HelpAction.h"
15	14	#include "ReaderInfo.h"

62	61
63	62	ApplicationModel::ApplicationModel()
64	63	: mContext()
65		, mDpiScale(DpiCalculator::getDpiScale())
66		, mScaleFactor(mDpiScale)
	64	, mScaleFactor(DEFAULT_SCALE_FACTOR)
67	65	, mWifiInfo()
68	66	, mWifiEnabled(false)
69	67	, mBluetoothResponding(true)

80	78	connect(readerManager, &ReaderManager::fireReaderPropertiesUpdated, this, &ApplicationModel::fireReaderPropertiesUpdated);
81	79	connect(readerManager, &ReaderManager::fireStatusChanged, this, &ApplicationModel::onStatusChanged);
82	80	connect(readerManager, &ReaderManager::fireStatusChanged, this, &ApplicationModel::fireBluetoothReaderChanged);
83		connect(readerManager, &ReaderManager::fireReaderAdded, this, &ApplicationModel::fireSelectedReaderChanged);
84		connect(readerManager, &ReaderManager::fireReaderRemoved, this, &ApplicationModel::fireSelectedReaderChanged);
	81	connect(readerManager, &ReaderManager::fireReaderAdded, this, &ApplicationModel::fireAvailableReaderChanged);
	82	connect(readerManager, &ReaderManager::fireReaderRemoved, this, &ApplicationModel::fireAvailableReaderChanged);
85	83	connect(&mWifiInfo, &WifiInfo::fireWifiEnabledChanged, this, &ApplicationModel::onWifiEnabledChanged);
86	84
87	85	onWifiEnabledChanged();

98	96	{
99	97	if (mContext)
100	98	{
101		disconnect(mContext.data(), &WorkflowContext::fireReaderPlugInTypesChanged, this, &ApplicationModel::fireSelectedReaderChanged);
	99	disconnect(mContext.data(), &WorkflowContext::fireReaderPlugInTypesChanged, this, &ApplicationModel::fireAvailableReaderChanged);
102	100	}
103	101
104	102	if ((mContext = pContext))
105	103	{
106		connect(mContext.data(), &WorkflowContext::fireReaderPlugInTypesChanged, this, &ApplicationModel::fireSelectedReaderChanged);
107		connect(mContext.data(), &WorkflowContext::fireReaderNameChanged, this, &ApplicationModel::fireSelectedReaderChanged);
	104	connect(mContext.data(), &WorkflowContext::fireReaderPlugInTypesChanged, this, &ApplicationModel::fireAvailableReaderChanged);
	105	connect(mContext.data(), &WorkflowContext::fireReaderNameChanged, this, &ApplicationModel::fireAvailableReaderChanged);
108	106	connect(mContext.data(), &WorkflowContext::fireReaderNameChanged, this, &ApplicationModel::fireReaderPropertiesUpdated);
109	107	connect(mContext.data(), &WorkflowContext::fireReaderInfoChanged, this, &ApplicationModel::fireReaderPropertiesUpdated);
110	108	}

272	270	}
273	271
274	272
275		qreal ApplicationModel::getDpiScale() const
276		{
277		return mDpiScale;
278		}
279
280
281	273	qreal ApplicationModel::getScaleFactor() const
282	274	{
283	275	return mScaleFactor;

286	278
287	279	void ApplicationModel::setScaleFactor(qreal pScaleFactor)
288	280	{
289		pScaleFactor *= mDpiScale;
	281	pScaleFactor *= DEFAULT_SCALE_FACTOR;
290	282
291	283	if (qAbs(pScaleFactor - mScaleFactor) > 0)
292	284	{

314	306	}
315	307
316	308
317		bool ApplicationModel::foundSelectedReader() const
	309	int ApplicationModel::getAvailableReader() const
318	310	{
319	311	if (!mContext)
320	312	{
321		return false;
322		}
323
324		return !Env::getSingleton<ReaderManager>()->getReaderInfos(ReaderFilter(mContext->getReaderPlugInTypes())).isEmpty();
	313	return 0;
	314	}
	315
	316	return Env::getSingleton<ReaderManager>()->getReaderInfos(ReaderFilter(mContext->getReaderPlugInTypes())).size();
325	317	}
326	318
327	319

481	473	qCCritical(qml) << "Suppressing an unexpected exception.";
482	474	env->ExceptionDescribe();
483	475	env->ExceptionClear();
484		// The toast was probably not displayed (e.g. DeadObjectException). We halt on error
485		// since it is used to display information to the user as required by the TR.
	476	// The toast was probably not displayed (e.g. DeadObjectException). We halt on error
	477	// since it is used to display information to the user as required by the TR.
486	478	Q_ASSERT(false);
487	479	}
488	480	});

531	523	#endif
532	524
533	525
	526	#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
	527	QString ApplicationModel::onlineHelpUrl(const QString& pHelpSectionName)
	528	{
	529	return HelpAction::getOnlineUrl(pHelpSectionName, false);
	530	}
	531
	532
534	533	void ApplicationModel::openOnlineHelp(const QString& pHelpSectionName)
535	534	{
536		#if defined(Q_OS_ANDROID) \|\| defined(Q_OS_IOS)
537		qCWarning(qml) << "NOT IMPLEMENTED:" << pHelpSectionName;
538		#else
539	535	HelpAction::openContextHelp(pHelpSectionName, false);
540		#endif
541		}
	536	}
	537
	538
	539	#endif
542	540
543	541
544	542	void ApplicationModel::onWifiEnabledChanged()

+7

-6

src/ui/qml/ApplicationModel.h less more

43	43	Q_PROPERTY(bool bluetoothAvailable READ isBluetoothAvailable CONSTANT)
44	44	Q_PROPERTY(bool locationPermissionRequired READ locationPermissionRequired NOTIFY fireBluetoothReaderChanged)
45	45
46		Q_PROPERTY(qreal dpiScale READ getDpiScale CONSTANT)
47	46	Q_PROPERTY(qreal scaleFactor READ getScaleFactor WRITE setScaleFactor NOTIFY fireScaleFactorChanged)
48	47	Q_PROPERTY(bool wifiEnabled READ isWifiEnabled NOTIFY fireWifiEnabledChanged)
49	48
50	49	Q_PROPERTY(QString currentWorkflow READ getCurrentWorkflow NOTIFY fireCurrentWorkflowChanged)
51		Q_PROPERTY(bool foundSelectedReader READ foundSelectedReader NOTIFY fireSelectedReaderChanged)
	50	Q_PROPERTY(int availableReader READ getAvailableReader NOTIFY fireAvailableReaderChanged)
52	51
53	52	Q_PROPERTY(QString feedback READ getFeedback NOTIFY fireFeedbackChanged)
54	53

58	57	ReaderManagerPlugInInfo getFirstPlugInInfo(ReaderManagerPlugInType pType) const;
59	58
60	59	private:
61		qreal mDpiScale;
	60	constexpr static qreal DEFAULT_SCALE_FACTOR = 0.6;
62	61	qreal mScaleFactor;
63	62	WifiInfo mWifiInfo;
64	63	bool mWifiEnabled;

112	111	bool locationPermissionRequired() const;
113	112
114	113	bool isWifiEnabled() const;
115		qreal getDpiScale() const;
116	114	qreal getScaleFactor() const;
117	115	void setScaleFactor(qreal pScaleFactor);
118	116
119	117	QString getCurrentWorkflow() const;
120		bool foundSelectedReader() const;
	118	int getAvailableReader() const;
121	119
122	120	QString getFeedback() const;
123	121

133	131	Q_INVOKABLE void showSettings(const QString& pAction);
134	132	Q_INVOKABLE void showFeedback(const QString& pMessage, bool pReplaceExisting = false);
135	133	Q_INVOKABLE void keepScreenOn(bool pActive);
	134	#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
	135	Q_INVOKABLE QString onlineHelpUrl(const QString& pHelpSectionName);
136	136	Q_INVOKABLE void openOnlineHelp(const QString& pHelpSectionName);
	137	#endif
137	138	Q_INVOKABLE QString stripHtmlTags(QString pString) const;
138	139	#ifdef Q_OS_IOS
139	140	Q_INVOKABLE void showAppStoreRatingDialog();

152	153	void fireBluetoothReaderChanged();
153	154
154	155	void fireCurrentWorkflowChanged();
155		void fireSelectedReaderChanged();
	156	void fireAvailableReaderChanged();
156	157
157	158	void fireScaleFactorChanged();
158	159	void fireWifiEnabledChanged();

+38

-0

src/ui/qml/AuthModel.cpp less more

69	69	}
70	70
71	71
	72	QString AuthModel::getErrorHeader() const
	73	{
	74	if (!mContext \|\| mContext->getTcTokenUrl().isEmpty())
	75	{
	76	return QString();
	77	}
	78
	79	const auto& tcTokenUrl = mContext->getTcTokenUrl();
	80	return tcTokenUrl.scheme() + QStringLiteral("://") + tcTokenUrl.authority();
	81	}
	82
	83
	84	QString AuthModel::getErrorText() const
	85	{
	86	if (!mContext)
	87	{
	88	return QString();
	89	}
	90
	91	const auto& status = mContext->getStatus();
	92	const auto& externalInfo = status.getExternalInfo();
	93	const auto& errorDescription = status.toErrorDescription(false);
	94	if (externalInfo.isEmpty() \|\| errorDescription == externalInfo)
	95	{
	96	return errorDescription;
	97	}
	98
	99	return errorDescription + QStringLiteral("\n(%1)").arg(externalInfo);
	100	}
	101
	102
	103	QString AuthModel::getStatusCode() const
	104	{
	105	const auto statusCode = mContext ? mContext->getStatus().getStatusCode() : GlobalStatus::Code::Unknown_Error;
	106	return getEnumName(statusCode);
	107	}
	108
	109
72	110	AuthModel& AuthModel::getInstance()
73	111	{
74	112	return *Instance;

+6

-0

src/ui/qml/AuthModel.h less more

26	26	Q_PROPERTY(QString transactionInfo READ getTransactionInfo NOTIFY fireTransactionInfoChanged)
27	27	Q_PROPERTY(int progressValue READ getProgressValue NOTIFY fireProgressChanged)
28	28	Q_PROPERTY(QString progressMessage READ getProgressMessage NOTIFY fireProgressChanged)
	29	Q_PROPERTY(QString errorHeader READ getErrorHeader NOTIFY fireResultChanged)
	30	Q_PROPERTY(QString errorText READ getErrorText NOTIFY fireResultChanged)
	31	Q_PROPERTY(QString statusCode READ getStatusCode NOTIFY fireResultChanged)
29	32
30	33	private:
31	34	QSharedPointer<AuthContext> mContext;

42	45	const QString& getTransactionInfo() const;
43	46	int getProgressValue() const;
44	47	const QString getProgressMessage() const;
	48	QString getErrorHeader() const;
	49	QString getErrorText() const;
	50	QString getStatusCode() const;
45	51
46	52	Q_INVOKABLE void setSkipRedirect(bool pSkipRedirect);
47	53

+4

-2

src/ui/qml/CertificateDescriptionModel.cpp less more

4	4	#include "CertificateDescriptionModel.h"
5	5
6	6	#include "AppSettings.h"
	7	#include "LanguageLoader.h"
7	8	#include "SecureStorage.h"
8	9
9	10

124	125	if (mContext && mContext->getDidAuthenticateEac1() && !mContext->getDidAuthenticateEac1()->getCvCertificates().isEmpty())
125	126	{
126	127	const CVCertificateBody body = mContext->getDidAuthenticateEac1()->getCvCertificates().at(0)->getBody();
127		const QString effectiveDate = body.getCertificateEffectiveDate().toString(Qt::DefaultLocaleShortDate);
128		const QString expirationDate = body.getCertificateExpirationDate().toString(Qt::DefaultLocaleShortDate);
	128	const auto locale = LanguageLoader::getInstance().getUsedLocale();
	129	const auto effectiveDate = locale.toString(body.getCertificateEffectiveDate(), QLocale::ShortFormat);
	130	const auto expirationDate = locale.toString(body.getCertificateExpirationDate(), QLocale::ShortFormat);
129	131
130	132	return QStringLiteral("%1 - %2").arg(effectiveDate, expirationDate);
131	133	}

+1

-1

src/ui/qml/CertificateDescriptionModel.h less more

24	24	Q_PROPERTY(QString subjectName READ getSubjectName NOTIFY fireChanged)
25	25	Q_PROPERTY(QString purpose READ getPurpose NOTIFY fireChanged)
26	26
27		QVector<QPair<QString, QString> > mData;
	27	QVector<QPair<QString, QString>> mData;
28	28	QSharedPointer<AuthContext> mContext;
29	29
30	30	inline QSharedPointer<const CertificateDescription> getCertificateDescription() const;

+0

-57

~~src/ui/qml/DpiCalculator.cpp~~ less more

0		/*
1		* \copyright Copyright (c) 2015-2020 Governikus GmbH & Co. KG, Germany
2		*/
3
4		#include "DpiCalculator.h"
5
6		#include <QGuiApplication>
7		#include <QLoggingCategory>
8		#include <QScreen>
9
10
11		using namespace governikus;
12
13
14		Q_DECLARE_LOGGING_CATEGORY(qml)
15
16
17		qreal DpiCalculator::getDpi()
18		{
19		qreal dpi = 0.0;
20		auto app = static_cast<QGuiApplication*>(QCoreApplication::instance());
21		auto screen = app->primaryScreen();
22		if (screen)
23		{
24		#if defined(Q_OS_ANDROID)
25		auto envDpi = qgetenv("QT_ANDROID_THEME_DISPLAY_DPI");
26		bool ok;
27		dpi = envDpi.toDouble(&ok);
28		if (!ok)
29		{
30		qCCritical(qml) << "Cannot get screen dpi";
31		dpi = -1.0;
32		}
33		#elif defined(Q_OS_MACOS) \|\| defined(Q_OS_IOS)
34		// The physical DPI changes on Apple devices with screen scaling, on other platforms it behaves the other way around.
35		dpi = screen->physicalDotsPerInch();
36		#else
37		dpi = screen->logicalDotsPerInch();
38		#endif
39		qCInfo(qml) << "Determined dpi:"
40		<< screen->logicalDotsPerInch() << "(logical),"
41		<< screen->physicalDotsPerInch() << "(physical)";
42		}
43
44		qCInfo(qml) << "Using dpi" << dpi;
45
46		#ifndef QT_NO_DEBUG
47		const char* const overrideDpi = "OVERRIDE_DPI";
48		if (!qEnvironmentVariableIsEmpty(overrideDpi))
49		{
50		dpi = qEnvironmentVariableIntValue(overrideDpi);
51		qCDebug(qml) << "Override DPI:" << dpi;
52		}
53		#endif
54
55		return dpi;
56		}

+0

-31

~~src/ui/qml/DpiCalculator.h~~ less more

0		/*!
1		* \copyright Copyright (c) 2015-2020 Governikus GmbH & Co. KG, Germany
2		*/
3
4		#pragma once
5
6		#include <QtGlobal>
7
8		namespace governikus
9		{
10
11		class DpiCalculator
12		{
13		private:
14		DpiCalculator()
15		{
16		}
17
18
19		static qreal getDpi();
20
21		public:
22		static qreal getDpiScale()
23		{
24		return getDpi() / 160;
25		}
26
27
28		};
29
30		} // namespace governikus

+52

-22

src/ui/qml/LogModel.cpp less more

3	3
4	4	#include "LogModel.h"
5	5
	6	#include "ApplicationModel.h"
6	7	#include "LanguageLoader.h"
7	8	#include "LogHandler.h"
8	9	#include "PlatformHelper.h"

11	12	#include "SingletonHelper.h"
12	13
13	14	#include <QDir>
	15	#include <QFile>
14	16	#include <QFileInfo>
15	17	#include <QtMath>
16	18

60	62	, mSelectedLogFile(-1)
61	63	, mLogEntries()
62	64	{
	65	mLogFiles += QString(); // dummy entry for "current logfile"
	66	const auto logHandler = Env::getSingleton<LogHandler>();
	67	for (const auto& entry : logHandler->getOtherLogfiles())
	68	{
	69	mLogFiles += entry.absoluteFilePath();
	70	}
	71
63	72	setLogfile(0);
	73
64	74	connect(Env::getSingleton<SettingsModel>(), &SettingsModel::fireLanguageChanged, this, &LogModel::fireLogFilesChanged); // needed to translate the "Current log" entry on language change
65	75	}
66	76

71	81	}
72	82
73	83
74		QStringList LogModel::getLogfiles()
75		{
76		mLogFiles.clear();
77		mLogFiles += QString();
78		const auto& logHandler = Env::getSingleton<LogHandler>();
79
	84	QStringList LogModel::getLogfiles() const
	85	{
	86	const auto logHandler = Env::getSingleton<LogHandler>();
80	87	QStringList logFileNames;
81	88	//: LABEL ALL_PLATFORMS
82	89	logFileNames += tr("Current log");
83		const auto& logFiles = logHandler->getOtherLogfiles();
84		for (const auto& entry : logFiles)
85		{
86		mLogFiles += entry.absoluteFilePath();
87		logFileNames += LanguageLoader::getInstance().getUsedLocale().toString(logHandler->getFileDate(entry), tr("dd.MM.yyyy hh:mm:ss"));
88		}
89
90		setLogfile(0);
	90	for (const auto& entry : qAsConst(mLogFiles))
	91	{
	92	if (!entry.isEmpty())
	93	{
	94	logFileNames += LanguageLoader::getInstance().getUsedLocale().toString(logHandler->getFileDate(entry), tr("dd.MM.yyyy hh:mm:ss"));
	95	}
	96	}
	97
91	98	return logFileNames;
92	99	}
93	100

114	121
115	122	void LogModel::removeCurrentLogfile()
116	123	{
117		QFile::remove(mLogFiles[mSelectedLogFile]);
	124	if (mSelectedLogFile == 0)
	125	{
	126	return;
	127	}
	128
	129	if (!QFile::remove(mLogFiles[mSelectedLogFile]))
	130	{
	131	qDebug() << mLogFiles[mSelectedLogFile] << "could not be removed";
	132	return;
	133	}
	134
	135	mLogFiles.removeAt(mSelectedLogFile);
118	136	Q_EMIT fireLogFilesChanged();
119	137	}
120	138
121	139
122	140	void LogModel::setLogfile(int pIndex)
123	141	{
	142	if (pIndex < 0 \|\| pIndex >= mLogFiles.size())
	143	{
	144	qDebug() << "Called with invalid index:" << pIndex;
	145	return;
	146	}
	147
124	148	if (pIndex == mSelectedLogFile)
125	149	{
126	150	return;
127	151	}
128	152
129	153	mSelectedLogFile = pIndex;
130		const auto& logHandler = Env::getSingleton<LogHandler>();
	154	const auto logHandler = Env::getSingleton<LogHandler>();
131	155
132	156	if (pIndex == 0)
133	157	{
134		const auto& backLog = logHandler->getBacklog();
135		QTextStream in(backLog);
	158	QTextStream in(logHandler->useLogfile() ? logHandler->getBacklog() : tr("The logfile is disabled.").toUtf8());
	159	in.setCodec("UTF-8");
	160
136	161	setLogEntries(in);
137	162	connect(logHandler, &LogHandler::fireLog, this, &LogModel::onNewLogMsg);
138	163	}

143	168	if (inputFile.open(QIODevice::ReadOnly))
144	169	{
145	170	QTextStream in(&inputFile);
	171	in.setCodec("UTF-8");
146	172	setLogEntries(in);
147	173	inputFile.close();
148	174	}

152	178
153	179	void LogModel::saveCurrentLogfile(const QUrl& pFilename) const
154	180	{
	181	bool success = false;
	182	const auto logHandler = Env::getSingleton<LogHandler>();
155	183	const QString logfilePath = mLogFiles.at(mSelectedLogFile);
156	184
157	185	if (logfilePath.isEmpty())
158	186	{
159		const auto& logHandler = Env::getSingleton<LogHandler>();
160		logHandler->copy(pFilename.toLocalFile());
	187	success = logHandler->copy(pFilename.toLocalFile());
161	188	}
162	189	else
163	190	{
164		QFile::copy(logfilePath, pFilename.toLocalFile());
165		}
	191	success = logHandler->copyOther(logfilePath, pFilename.toLocalFile());
	192	}
	193
	194	const auto applicationModel = Env::getSingleton<ApplicationModel>();
	195	applicationModel->showFeedback((success ? tr("Successfully saved logfile to \"%1\"") : tr("Error while saving logfile to \"%1\"")).arg(pFilename.toLocalFile()));
166	196	}
167	197
168	198

+1

-1

src/ui/qml/LogModel.h less more

50	50	static LogModel& getInstance();
51	51
52	52	public:
53		QStringList getLogfiles();
	53	QStringList getLogfiles() const;
54	54	Q_INVOKABLE QDateTime getCurrentLogfileDate() const;
55	55	Q_INVOKABLE void removeOtherLogfiles();
56	56	Q_INVOKABLE void removeCurrentLogfile();

+14

-14

src/ui/qml/NumberModel.cpp less more

60	60	connect(mContext.data(), &WorkflowContext::firePaceResultUpdated, this, &NumberModel::fireInputErrorChanged);
61	61
62	62	// The length of the pin doesn't matter for the core. Requesting
63		// a 5- or 6-digit PIN is only part of the gui. Therefore we handle
	63	// a five- or six-digit PIN is only part of the gui. Therefore we handle
64	64	// this state in the NumberModel. The only case where the core need
65		// to know if the transport PIN should be requested is, when we
	65	// to know if the Transport PIN should be requested is, when we
66	66	// are in an authentication workflow and want to start a pin change.
67		// Therefore we enqueue a ChangePinContext with the transport PIN
	67	// Therefore we enqueue a ChangePinContext with the Transport PIN
68	68	// request and consider it in this function.
69	69	const QSharedPointer<ChangePinContext> context = mContext.objectCast<ChangePinContext>();
70	70	mRequestTransportPin \|= (context && context->requestTransportPin());

235	235	return QString();
236	236
237	237	case CardReturnCode::INVALID_PIN:
238		//: INFO ALL_PLATFORMS The wrong PIN was entered on the first attempt.
239		return tr("The given PIN is not correct. You have 2 tries to enter the correct PIN.");
	238	//: INFO ALL_PLATFORMS The wrong (Transport) PIN was entered on the first attempt.
	239	return tr("The given %1 is not correct. You have two attempts to enter the correct %1.").arg(isRequestTransportPin() ? tr("Transport PIN") : tr("PIN"));
240	240
241	241	case CardReturnCode::INVALID_PIN_2:
242		//: INFO ALL_PLATFORMS The wrong PIN was entered twice, the next attempt requires the CAN for additional verification.
243		return tr("A wrong PIN has been entered twice on your ID card. "
244		"Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. "
245		"You can find your card access number (CAN) on the front of your ID card.");
	242	//: INFO ALL_PLATFORMS The wrong (Transport) PIN was entered twice, the next attempt requires the CAN for additional verification.
	243	return tr("A wrong %1 has been entered twice on your ID card. "
	244	"For a third attempt, please first enter the six-digit Card Access Number (CAN). "
	245	"You can find your Card Access Number (CAN) in the bottom right on the front of your ID card.").arg(isRequestTransportPin() ? tr("Transport PIN") : tr("PIN"));
246	246
247	247	case CardReturnCode::INVALID_PIN_3:
248		//: INFO ALL_PLATFORMS The PIN was entered wrongfully three times, the ID card needs to be unlocked using the PUK.
249		return tr("A wrong PIN has been entered three times on your ID card. "
250		"Your PIN is now blocked. "
251		"To unblock your PIN you have to enter the PUK.");
	248	//: INFO ALL_PLATFORMS The (Transport) PIN was entered wrongfully three times, the ID card needs to be unlocked using the PUK.
	249	return tr("A wrong %1 has been entered three times on your ID card. "
	250	"Your %1 is now blocked. "
	251	"You have to enter the PUK to remove the block.").arg(isRequestTransportPin() ? tr("Transport PIN") : tr("PIN"));
252	252
253	253	case CardReturnCode::INVALID_CAN:
254	254	//: INFO ALL_PLATFORMS The CAN was entered wrongfully and needs to be supplied again.
255		return tr("The entered card access number (CAN) is incorrect. Please try again.");
	255	return tr("The entered Card Access Number (CAN) is incorrect. Please try again.");
256	256
257	257	case CardReturnCode::INVALID_PUK:
258	258	//: INFO ALL_PLATFORMS The PUK entered wrongfully and needs to be supplied again.

+6

-1

src/ui/qml/ProviderCategoryFilterModel.cpp less more

32	32
33	33	int ProviderCategoryFilterModel::getAdditionalResultCount() const
34	34	{
35		if (mSearchString.isEmpty())
	35	if (mSearchString.isEmpty() \|\| mSelectedCategories.isEmpty())
36	36	{
37	37	return 0;
38	38	}
39	39
40	40	auto excludedCategories = ProviderModel::getProviderCategories() - mSelectedCategories;
	41	if (excludedCategories.isEmpty())
	42	{
	43	return 0;
	44	}
	45
41	46	return resultCountForFilter(excludedCategories, mSearchString);
42	47	}
43	48

+105

-0

src/ui/qml/ProxyCredentials.cpp less more

	0	/*!
	1	* \copyright Copyright (c) 2020 Governikus GmbH & Co. KG, Germany
	2	*/
	3
	4	#include "ProxyCredentials.h"
	5
	6
	7	using namespace governikus;
	8
	9
	10	QString ProxyCredentials::createUrl(const QNetworkProxy& pProxy)
	11	{
	12	QUrl url;
	13	switch (pProxy.type())
	14	{
	15	case QNetworkProxy::Socks5Proxy:
	16	url.setScheme(QStringLiteral("socks5"));
	17	break;
	18
	19	case QNetworkProxy::FtpCachingProxy:
	20	url.setScheme(QStringLiteral("ftp"));
	21	break;
	22
	23	default:
	24	url.setScheme(QStringLiteral("http"));
	25	}
	26	url.setHost(pProxy.hostName());
	27	url.setPort(pProxy.port());
	28
	29	return url.toString();
	30	}
	31
	32
	33	ProxyCredentials::ProxyCredentials(const QNetworkProxy& pProxy, QAuthenticator* pAuthenticator)
	34	: QObject()
	35	, mLoop()
	36	, mAuthenticator(pAuthenticator)
	37	, mProposedUser(pProxy.user())
	38	, mUrl(createUrl(pProxy))
	39	{
	40	}
	41
	42
	43	QString ProxyCredentials::getProposedUser() const
	44	{
	45	return mProposedUser;
	46	}
	47
	48
	49	QString ProxyCredentials::getUrl() const
	50	{
	51	return mUrl;
	52	}
	53
	54
	55	QString ProxyCredentials::getUser() const
	56	{
	57	if (mAuthenticator)
	58	{
	59	return mAuthenticator->user();
	60	}
	61
	62	return QString();
	63	}
	64
	65
	66	void ProxyCredentials::setUser(const QString& pUser)
	67	{
	68	if (mAuthenticator)
	69	{
	70	mAuthenticator->setUser(pUser);
	71	}
	72	}
	73
	74
	75	QString ProxyCredentials::getPassword() const
	76	{
	77	if (mAuthenticator)
	78	{
	79	return mAuthenticator->password();
	80	}
	81
	82	return QString();
	83	}
	84
	85
	86	void ProxyCredentials::setPassword(const QString& pPassword)
	87	{
	88	if (mAuthenticator)
	89	{
	90	mAuthenticator->setPassword(pPassword);
	91	}
	92	}
	93
	94
	95	void ProxyCredentials::confirmInput()
	96	{
	97	mLoop.exit();
	98	}
	99
	100
	101	void ProxyCredentials::waitForConfirmation()
	102	{
	103	mLoop.exec();
	104	}

+50

-0

src/ui/qml/ProxyCredentials.h less more

	0	/*!
	1	* \copyright Copyright (c) 2020 Governikus GmbH & Co. KG, Germany
	2	*/
	3
	4	#pragma once
	5
	6	#include <QAuthenticator>
	7	#include <QEventLoop>
	8	#include <QNetworkProxy>
	9
	10
	11	namespace governikus
	12	{
	13
	14	class ProxyCredentials
	15	: public QObject
	16	{
	17	Q_OBJECT
	18
	19	Q_PROPERTY(QString proposedUser READ getProposedUser CONSTANT)
	20	Q_PROPERTY(QString url READ getUrl CONSTANT)
	21	Q_PROPERTY(QString user READ getUser WRITE setUser)
	22	Q_PROPERTY(QString password READ getPassword WRITE setPassword)
	23
	24	private:
	25	QEventLoop mLoop;
	26	QAuthenticator* mAuthenticator;
	27	const QString mProposedUser;
	28	const QString mUrl;
	29
	30	QString createUrl(const QNetworkProxy& pProxy);
	31
	32	public:
	33	ProxyCredentials(const QNetworkProxy& pProxy, QAuthenticator* pAuthenticator);
	34
	35	QString getProposedUser() const;
	36	QString getUrl() const;
	37
	38	QString getUser() const;
	39	void setUser(const QString& pUser);
	40
	41	QString getPassword() const;
	42	void setPassword(const QString& pPassword);
	43
	44	Q_INVOKABLE void confirmInput();
	45	void waitForConfirmation();
	46	};
	47
	48
	49	} // namespace governikus

+4

-4

src/ui/qml/RemoteServiceModel.cpp less more

180	180	auto* const remoteClient = Env::getSingleton<RemoteClient>();
181	181	disconnect(remoteClient, &RemoteClient::fireEstablishConnectionDone, this, &RemoteServiceModel::onEstablishConnectionDone);
182	182	qDebug() << "Pairing finished:" << pStatus;
183		const auto deviceName = pEntry->getRemoteDeviceDescriptor().getIfdName();
	183	const auto deviceName = RemoteServiceSettings::escapeDeviceName(pEntry->getRemoteDeviceDescriptor().getIfdName());
184	184	if (pStatus.isError())
185	185	{
186	186	Q_EMIT firePairingFailed(deviceName, pStatus.toErrorDescription());

197	197	if (mContext && pConnected)
198	198	{
199	199	const RemoteServiceSettings& settings = Env::getSingleton<AppSettings>()->getRemoteServiceSettings();
200		const QString peerName = settings.getRemoteInfo(mContext->getRemoteServer()->getCurrentCertificate()).getName();
	200	const QString peerName = settings.getRemoteInfo(mContext->getRemoteServer()->getCurrentCertificate()).getNameEscaped();
201	201	//: INFO ANDROID IOS The smartphone is connected as card reader (SaK) and currently processing an authentication request. The user is asked to pay attention the its screen.
202	202	mConnectionInfo = tr("Please pay attention to the display on your other device \"%1\".").arg(peerName);
203	203	Q_EMIT fireConnectionInfoChanged();

349	349	}
350	350	if (!pWifiEnabled)
351	351	{
352		//: INFO ALL_PLATFORMS The wifi feature is not enabled but required to use the smartphone as a card reader (SaK).
	352	//: INFO ALL_PLATFORMS The WiFi feature is not enabled but required to use the smartphone as a card reader (SaK).
353	353	return tr("Please connect your WiFi to use the remote service.");
354	354	}
355	355

385	385	QStringList deviceNames;
386	386	for (const auto& info : deviceInfos)
387	387	{
388		deviceNames.append(QLatin1Char('"') + info.getName() + QLatin1Char('"'));
	388	deviceNames.append(QLatin1Char('"') + info.getNameEscaped() + QLatin1Char('"'));
389	389	}
390	390	mConnectedServerDeviceNames = deviceNames.join(QLatin1String(", "));
391	391	Q_EMIT fireConnectedServerDeviceNamesChanged();

+7

-0

src/ui/qml/SelfDiagnosisModel.cpp less more

17	17	defineSingleton(SelfDiagnosisModel)
18	18
19	19
	20	bool SelfDiagnosisModel::isRunning() const
	21	{
	22	return mDiagnosisModel.isRunning();
	23	}
	24
	25
20	26	SelfDiagnosisModel::SelfDiagnosisModel(QObject* pParent)
21	27	: QObject(pParent)
22	28	, mDiagnosisContext(new DiagnosisContext)

24	30	{
25	31	const GeneralSettings& generalSettings = Env::getSingleton<AppSettings>()->getGeneralSettings();
26	32	connect(&generalSettings, &GeneralSettings::fireLanguageChanged, this, &SelfDiagnosisModel::fireSectionContentModelChanged);
	33	connect(&mDiagnosisModel, &DiagnosisModel::fireRunningChanged, this, &SelfDiagnosisModel::fireRunningChanged);
27	34	}
28	35
29	36

+4

-0

src/ui/qml/SelfDiagnosisModel.h less more

24	24	friend class Env;
25	25
26	26	Q_PROPERTY(QAbstractListModel * sectionsModel READ getSectionsModel CONSTANT)
	27	Q_PROPERTY(bool running READ isRunning NOTIFY fireRunningChanged)
27	28
28	29	private:
	30	bool isRunning() const;
	31
29	32	QSharedPointer<DiagnosisContext> mDiagnosisContext;
30	33	DiagnosisModel mDiagnosisModel;
31	34	QScopedPointer<DiagnosisController> mDiagnosisController;

45	48	Q_SIGNALS:
46	49	void fireSectionContentModelChanged();
47	50	void fireCurrentSectionChanged();
	51	void fireRunningChanged();
48	52	};
49	53
50	54	} // namespace governikus

+97

-1

src/ui/qml/SettingsModel.cpp less more

6	6	#include "AppSettings.h"
7	7	#include "HistorySettings.h"
8	8	#include "LanguageLoader.h"
	9	#include "NetworkManager.h"
9	10	#include "PlatformHelper.h"
10	11	#include "Service.h"
11	12	#include "SingletonHelper.h"

23	24
24	25	SettingsModel::SettingsModel()
25	26	: QObject()
	27	, mAdvancedSettings(false)
26	28	, mIsStartedByAuth(false)
27	29	, mShowBetaTesting(true)
28	30	{

68	70	settings.setLanguage(QLocale(pLanguage).language());
69	71	settings.save();
70	72	Q_EMIT fireLanguageChanged();
	73	}
	74	}
	75
	76
	77	bool SettingsModel::isAdvancedSettings() const
	78	{
	79	return mAdvancedSettings;
	80	}
	81
	82
	83	void SettingsModel::setAdvancedSettings(bool pEnabled)
	84	{
	85	if (mAdvancedSettings != pEnabled)
	86	{
	87	mAdvancedSettings = pEnabled;
	88	Q_EMIT fireAdvancedSettingsChanged();
71	89	}
72	90	}
73	91

245	263	}
246	264
247	265
	266	bool SettingsModel::isEnableCanAllowed() const
	267	{
	268	return Env::getSingleton<AppSettings>()->getGeneralSettings().isEnableCanAllowed();
	269	}
	270
	271
	272	void SettingsModel::setEnableCanAllowed(bool pEnableCanAllowed)
	273	{
	274	if (isEnableCanAllowed() != pEnableCanAllowed)
	275	{
	276	auto& settings = Env::getSingleton<AppSettings>()->getGeneralSettings();
	277	settings.setEnableCanAllowed(pEnableCanAllowed);
	278	settings.save();
	279	Q_EMIT fireCanAllowedChanged();
	280	}
	281	}
	282
	283
	284	bool SettingsModel::isSkipRightsOnCanAllowed() const
	285	{
	286	return Env::getSingleton<AppSettings>()->getGeneralSettings().isSkipRightsOnCanAllowed();
	287	}
	288
	289
	290	void SettingsModel::setSkipRightsOnCanAllowed(bool pSkipRightsOnCanAllowed)
	291	{
	292	if (isSkipRightsOnCanAllowed() != pSkipRightsOnCanAllowed)
	293	{
	294	auto& settings = Env::getSingleton<AppSettings>()->getGeneralSettings();
	295	settings.setSkipRightsOnCanAllowed(pSkipRightsOnCanAllowed);
	296	settings.save();
	297	Q_EMIT fireCanAllowedChanged();
	298	}
	299	}
	300
	301
248	302	bool SettingsModel::isShowSetupAssistantOnStart() const
249	303	{
250	304	auto& generalSettings = Env::getSingleton<AppSettings>()->getGeneralSettings();

451	505
452	506	void SettingsModel::updateApp()
453	507	{
454		Env::getSingleton<Service>()->updateApp(true);
	508	Env::getSingleton<Service>()->updateApp();
455	509	}
456	510
457	511

460	514	auto* dataModel = Env::getSingleton<AppUpdateDataModel>();
461	515	return dataModel;
462	516	}
	517
	518
	519	QUrl SettingsModel::getCustomProxyUrl() const
	520	{
	521	auto& settings = Env::getSingleton<AppSettings>()->getGeneralSettings();
	522	QUrl url;
	523	switch (settings.getCustomProxyType())
	524	{
	525	case QNetworkProxy::Socks5Proxy:
	526	url.setScheme(QLatin1String("socks5"));
	527	break;
	528
	529	case QNetworkProxy::HttpProxy:
	530	url.setScheme(QLatin1String("http"));
	531	break;
	532
	533	default:
	534	url.setScheme(QLatin1String("unknown"));
	535	break;
	536	}
	537	url.setHost(settings.getCustomProxyHost());
	538	url.setPort(settings.getCustomProxyPort());
	539	return url.toString();
	540	}
	541
	542
	543	bool SettingsModel::isCustomProxyAttributesPresent() const
	544	{
	545	return Env::getSingleton<AppSettings>()->getGeneralSettings().customProxyAttributesPresent();
	546	}
	547
	548
	549	bool SettingsModel::isUseCustomProxy()
	550	{
	551	return Env::getSingleton<AppSettings>()->getGeneralSettings().useCustomProxy();
	552	}
	553
	554
	555	void SettingsModel::setUseCustomProxy(bool pUseCustomProxy)
	556	{
	557	Env::getSingleton<AppSettings>()->getGeneralSettings().setUseCustomProxy(pUseCustomProxy);
	558	}

+24

-0

src/ui/qml/SettingsModel.h less more

9	9	#include "Env.h"
10	10
11	11	#include <QObject>
	12	#include <QUrl>
12	13
13	14	namespace governikus
14	15	{

21	22
22	23	Q_PROPERTY(QString translationTrigger READ getEmptyString NOTIFY fireLanguageChanged)
23	24	Q_PROPERTY(QString language READ getLanguage WRITE setLanguage NOTIFY fireLanguageChanged)
	25	Q_PROPERTY(bool advancedSettings READ isAdvancedSettings WRITE setAdvancedSettings NOTIFY fireAdvancedSettingsChanged)
24	26	Q_PROPERTY(bool developerOptions READ isDeveloperOptions WRITE setDeveloperOptions NOTIFY fireDeveloperOptionsChanged)
25	27	Q_PROPERTY(bool developerMode READ isDeveloperMode WRITE setDeveloperMode NOTIFY fireDeveloperOptionsChanged)
26	28	Q_PROPERTY(bool showBetaTesting MEMBER mShowBetaTesting NOTIFY fireDeveloperOptionsChanged)

31	33	Q_PROPERTY(bool useScreenKeyboard READ isUseScreenKeyboard WRITE setUseScreenKeyboard NOTIFY fireScreenKeyboardChanged)
32	34	Q_PROPERTY(bool visualPrivacy READ isVisualPrivacy WRITE setVisualPrivacy NOTIFY fireScreenKeyboardChanged)
33	35	Q_PROPERTY(bool shuffleScreenKeyboard READ isShuffleScreenKeyboard WRITE setShuffleScreenKeyboard NOTIFY fireScreenKeyboardChanged)
	36	Q_PROPERTY(bool enableCanAllowed READ isEnableCanAllowed WRITE setEnableCanAllowed NOTIFY fireCanAllowedChanged)
	37	Q_PROPERTY(bool skipRightsOnCanAllowed READ isSkipRightsOnCanAllowed WRITE setSkipRightsOnCanAllowed NOTIFY fireCanAllowedChanged)
34	38	Q_PROPERTY(bool showSetupAssistantOnStart READ isShowSetupAssistantOnStart WRITE setShowSetupAssistantOnStart NOTIFY fireShowSetupAssistantOnStartChanged)
35	39	Q_PROPERTY(bool autoStartAvailable READ isAutoStartAvailable CONSTANT)
36	40	Q_PROPERTY(bool autoStartApp READ isAutoStart WRITE setAutoStart NOTIFY fireAutoStartChanged)

44	48	Q_PROPERTY(bool showInAppNotifications READ isShowInAppNotifications WRITE setShowInAppNotifications NOTIFY fireShowInAppNotificationsChanged)
45	49	Q_PROPERTY(AppUpdateDataModel * appUpdateData READ getAppUpdateData NOTIFY fireAppUpdateDataChanged)
46	50	Q_PROPERTY(bool showNewUiHint READ isShowNewUiHint WRITE setShowNewUiHint NOTIFY fireShowNewUiHintChanged)
	51	Q_PROPERTY(QUrl customProxyUrl READ getCustomProxyUrl CONSTANT)
	52	Q_PROPERTY(bool customProxyAttributesPresent READ isCustomProxyAttributesPresent CONSTANT)
	53	Q_PROPERTY(bool useCustomProxy READ isUseCustomProxy WRITE setUseCustomProxy)
47	54
48	55	private:
	56	bool mAdvancedSettings;
49	57	bool mIsStartedByAuth;
50	58	bool mShowBetaTesting;
51	59

58	66	QString getEmptyString();
59	67	QString getLanguage() const;
60	68	void setLanguage(const QString& pLanguage);
	69
	70	bool isAdvancedSettings() const;
	71	void setAdvancedSettings(bool pEnabled);
61	72
62	73	bool isDeveloperOptions() const;
63	74	void setDeveloperOptions(bool pEnabled);

90	101	bool isShuffleScreenKeyboard() const;
91	102	void setShuffleScreenKeyboard(bool pShuffleScreenKeyboard);
92	103
	104	bool isEnableCanAllowed() const;
	105	void setEnableCanAllowed(bool pEnableCanAllowed);
	106
	107	bool isSkipRightsOnCanAllowed() const;
	108	void setSkipRightsOnCanAllowed(bool pSkipRightsOnCanAllowed);
	109
93	110	bool isShowSetupAssistantOnStart() const;
94	111	void setShowSetupAssistantOnStart(bool pShowSetupAssistantOnStart);
95	112

118	135	bool isShowNewUiHint() const;
119	136	void setShowNewUiHint(bool pShowNewUiHint);
120	137
	138	QUrl getCustomProxyUrl() const;
	139	bool isCustomProxyAttributesPresent() const;
	140	bool isUseCustomProxy();
	141	void setUseCustomProxy(bool pUseCustomProxy);
	142
121	143	Q_INVOKABLE bool requestStoreFeedback() const;
122	144	Q_INVOKABLE void hideFutureStoreFeedbackDialogs();
123	145

130	152
131	153	Q_SIGNALS:
132	154	void fireLanguageChanged();
	155	void fireAdvancedSettingsChanged();
133	156	void fireDeveloperOptionsChanged();
134	157	void fireDeviceNameChanged();
135	158	void firePinPadModeChanged();
136	159	void fireHistoryEnabledChanged();
137	160	void fireScreenKeyboardChanged();
	161	void fireCanAllowedChanged();
138	162	void fireShowSetupAssistantOnStartChanged();
139	163	void fireAutoStartChanged();
140	164	void fireAutoCloseWindowAfterAuthenticationChanged();

+81

-23

src/ui/qml/UIPlugInQml.cpp less more

160	160	auto* service = Env::getSingleton<Service>();
161	161	connect(service, &Service::fireAppUpdateFinished, this, &UIPlugInQml::onUpdateAvailable);
162	162	connect(service, &Service::fireUpdateScheduled, this, &UIPlugInQml::onUpdateScheduled);
163		service->runUpdateIfNeeded();
164	163
165	164	init();
166	165	}

204	203	// Activate logging of Qt scenegraph information on startup, e.g. GL_RENDERER, GL_VERSION, ...
205	204	qputenv("QSG_INFO", "1");
206	205
	206	#ifdef Q_OS_ANDROID
	207	const auto orientation = isTabletLayout()
	208	? "SCREEN_ORIENTATION_SENSOR_LANDSCAPE"
	209	: "SCREEN_ORIENTATION_PORTRAIT";
	210	QtAndroid::androidActivity().callMethod<void>("setRequestedOrientation", "(I)V", QAndroidJniObject::getStaticField<jint>("android/content/pm/ActivityInfo", orientation));
	211	#endif
	212
207	213	mEngine.reset(new QQmlApplicationEngine());
208	214
209	215	connect(mEngine.data(), &QQmlApplicationEngine::warnings, this, &UIPlugInQml::onQmlWarnings, Qt::QueuedConnection);

225	231	mEngine->addImportPath(getPath(QStringLiteral("qml/")).toString());
226	232	mEngine->load(getPath(QStringLiteral("qml/main.qml")));
227	233
228		if (!mEngine->rootObjects().isEmpty())
229		{
230		QQuickWindow* rootWindow = qobject_cast<QQuickWindow*>(mEngine->rootObjects().first());
231		if (rootWindow != nullptr)
232		{
	234	QQuickWindow* rootWindow = getRootWindow();
	235	if (rootWindow != nullptr)
	236	{
233	237	#if defined(Q_OS_WIN) && QT_VERSION < QT_VERSION_CHECK(5, 14, 1)
234		// we need to call create() explicitly because Windows needs a handle to fire WM_ENDSESSION!
235		// Since we start as a systemtray only we don't have a correct handle until we call show()
236		rootWindow->create();
237		#endif
238		connect(rootWindow, &QQuickWindow::sceneGraphError, this, &UIPlugInQml::onSceneGraphError);
239		qCDebug(qml) << "Using renderer interface:" << rootWindow->rendererInterface()->graphicsApi();
240		}
241		}
242
243		Env::getSingleton<Service>()->updateConfigurations();
	238	// we need to call create() explicitly because Windows needs a handle to fire WM_ENDSESSION!
	239	// Since we start as a systemtray only we don't have a correct handle until we call show()
	240	rootWindow->create();
	241	#endif
	242	connect(rootWindow, &QQuickWindow::sceneGraphError, this, &UIPlugInQml::onSceneGraphError);
	243	qCDebug(qml) << "Using renderer interface:" << rootWindow->rendererInterface()->graphicsApi();
	244	}
244	245
245	246	onWindowPaletteChanged();
246	247	}
247	248
248	249
249		void UIPlugInQml::hide()
	250	void UIPlugInQml::hideFromTaskbar()
250	251	{
251	252	PlatformTools::hideFromTaskbar();
252	253	}

280	281
281	282	#if defined(Q_OS_ANDROID) \|\| defined(Q_OS_IOS)
282	283	const QString platform = QStringLiteral("mobile,");
283		const QString tablet = (isTablet() ? QStringLiteral("tablet,") : QStringLiteral("phone,"));
	284	const QString tablet = (isTabletLayout() ? QStringLiteral("tablet,") : QStringLiteral("phone,"));
284	285	const QString brand = QGuiApplication::platformName();
285	286	#else
286	287	const QString platform = QStringLiteral("desktop,");
287	288	const QString tablet;
288		#if defined(Q_OS_MAC)
289		const QString brand = QStringLiteral("mac");
	289	#if defined(Q_OS_WIN)
	290	const QString brand = QStringLiteral("win");
290	291	#else
291		const QString brand = QStringLiteral("win");
	292	const QString brand = QStringLiteral("nowin");
292	293	#endif
293	294	#endif
294	295

298	299
299	300	void UIPlugInQml::onWorkflowStarted(QSharedPointer<WorkflowContext> pContext)
300	301	{
	302	if (isDominated())
	303	{
	304	return;
	305	}
	306
301	307	Env::getSingleton<ApplicationModel>()->keepScreenOn(true);
302	308	Env::getSingleton<ApplicationModel>()->resetContext(pContext);
303	309	Env::getSingleton<NumberModel>()->resetContext(pContext);

355	361	// workflows and never manually brought to foreground in between.
356	362	if (!pContext.objectCast<SelfAuthContext>() && !pContext->hasNextWorkflowPending() && generalSettings.isAutoCloseWindowAfterAuthentication() && !showUpdateInformationIfPending())
357	363	{
358		Q_EMIT fireHideRequest();
	364	onHideUi();
359	365	}
360	366	}
361	367

391	397	void UIPlugInQml::onShowUi(UiModule pModule)
392	398	{
393	399	PlatformTools::restoreToTaskbar();
	400	if (isDominated())
	401	{
	402	pModule = UiModule::CURRENT;
	403	}
394	404	Q_EMIT fireShowRequest(pModule);
	405
	406	Env::getSingleton<Service>()->runUpdateIfNeeded();
395	407	}
396	408
397	409
398	410	void UIPlugInQml::onHideUi()
399	411	{
400	412	Q_EMIT fireHideRequest();
	413	}
	414
	415
	416	void UIPlugInQml::onProxyAuthenticationRequired(const QNetworkProxy& pProxy, QAuthenticator* pAuthenticator)
	417	{
	418	ProxyCredentials proxyCredentials(pProxy, pAuthenticator);
	419
	420	Q_EMIT fireProxyAuthenticationRequired(&proxyCredentials);
	421	proxyCredentials.waitForConfirmation();
401	422	}
402	423
403	424

444	465
445	466	void UIPlugInQml::onUpdateScheduled()
446	467	{
447		Env::getSingleton<Service>()->runUpdateIfNeeded();
	468	if (!isHidden())
	469	{
	470	Env::getSingleton<Service>()->runUpdateIfNeeded();
	471	}
448	472	}
449	473
450	474

464	488	}
465	489
466	490
	491	bool UIPlugInQml::isTabletLayout() const
	492	{
	493	const auto screenOrientationSetting = Env::getSingleton<AppSettings>()->getGeneralSettings().getScreenOrientation();
	494	if (screenOrientationSetting == QLatin1String("landscape"))
	495	{
	496	return true;
	497	}
	498	if (screenOrientationSetting == QLatin1String("portrait"))
	499	{
	500	return false;
	501	}
	502	return isTablet();
	503	}
	504
	505
467	506	bool UIPlugInQml::showUpdateInformationIfPending()
468	507	{
469	508	if (!mUpdateInformationPending)

492	531	}
493	532
494	533	return QUrl::fromLocalFile(FileDestination::getPath(pRelativePath, QStandardPaths::LocateDirectory));
	534	}
	535
	536
	537	QQuickWindow* UIPlugInQml::getRootWindow() const
	538	{
	539	if (mEngine->rootObjects().isEmpty())
	540	{
	541	return nullptr;
	542	}
	543
	544	return qobject_cast<QQuickWindow*>(mEngine->rootObjects().first());
	545	}
	546
	547
	548	bool UIPlugInQml::isHidden() const
	549	{
	550	QQuickWindow* rootWindow = getRootWindow();
	551	return !rootWindow \|\| rootWindow->visibility() == QWindow::Hidden;
495	552	}
496	553
497	554

659	716	if (mExplicitPlatformStyle != pPlatformStyle)
660	717	{
661	718	mExplicitPlatformStyle = pPlatformStyle;
	719	Env::getSingleton<AppSettings>()->getGeneralSettings().setScreenOrientation(pPlatformStyle.indexOf(QLatin1String("tablet")) == -1 ? QStringLiteral("portrait") : QStringLiteral("landscape"));
662	720	doRefresh();
663	721	}
664	722	}

+8

-1

src/ui/qml/UIPlugInQml.h less more

11	11	#include "GlobalStatus.h"
12	12	#include "HistoryModel.h"
13	13	#include "NumberModel.h"
	14	#include "ProxyCredentials.h"
14	15	#include "SettingsModel.h"
15	16	#include "TrayIcon.h"
16	17	#include "UIPlugIn.h"

40	41	Q_PROPERTY(QVariantMap safeAreaMargins READ getSafeAreaMargins NOTIFY fireSafeAreaMarginsChanged)
41	42	Q_PROPERTY(bool highContrastEnabled READ isHighContrastEnabled NOTIFY fireHighContrastEnabledChanged)
42	43	Q_PROPERTY(QString fixedFontFamily READ getFixedFontFamily CONSTANT)
	44	Q_PROPERTY(bool tablet READ isTablet CONSTANT)
43	45
44	46	private:
45	47	QScopedPointer<QQmlApplicationEngine> mEngine;

59	61
60	62	QString getPlatformSelectors() const;
61	63	static QUrl getPath(const QString& pRelativePath, bool pQrc = true);
	64	QQuickWindow* getRootWindow() const;
	65	bool isHidden() const;
62	66	bool isTablet() const;
	67	bool isTabletLayout() const;
63	68	bool showUpdateInformationIfPending();
64	69
65	70	public:

79	84
80	85	Q_INVOKABLE void applyPlatformStyle(const QString& pPlatformStyle);
81	86	Q_INVOKABLE void init();
82		Q_INVOKABLE void hide();
	87	Q_INVOKABLE void hideFromTaskbar();
83	88	Q_INVOKABLE void switchUi();
84	89
85	90	Q_SIGNALS:

88	93	void fireDominatorChanged();
89	94	void fireSafeAreaMarginsChanged();
90	95	void fireHighContrastEnabledChanged();
	96	void fireProxyAuthenticationRequired(ProxyCredentials* pProxyCredentials);
91	97
92	98	private Q_SLOTS:
93	99	void show();

97	103	virtual void onApplicationStarted() override;
98	104	virtual void onShowUi(UiModule pModule) override;
99	105	virtual void onHideUi() override;
	106	virtual void onProxyAuthenticationRequired(const QNetworkProxy& pProxy, QAuthenticator* pAuthenticator) override;
100	107	virtual void onUiDomination(const UIPlugIn* pUi, const QString& pInformation, bool pAccepted) override;
101	108	virtual void onUiDominationReleased() override;
102	109	void onShowUserInformation(const QString& pMessage);

+1

-1

src/ui/qml/VersionInformationModel.h less more

22	22	LABEL = Qt::UserRole + 1,
23	23	TEXT
24	24	};
25		QVector<QPair<QString, QString> > mData;
	25	QVector<QPair<QString, QString>> mData;
26	26
27	27	void init();
28	28

+4

-2

src/ui/qml/WorkflowModel.cpp less more

4	4	#include "WorkflowModel.h"
5	5
6	6	#include "AppSettings.h"
	7	#include "context/AuthContext.h"
7	8	#include "Email.h"
8	9	#include "FuncUtils.h"
9	10	#include "GeneralSettings.h"

218	219	void WorkflowModel::sendResultMail() const
219	220	{
220	221	Q_ASSERT(mContext);
221		const GlobalStatus status = mContext->getStatus();
	222	const auto& status = mContext->getStatus();
222	223	//: Subject from error report mail
223	224	QString mailSubject = tr("AusweisApp2 error report - %1").arg(status.toErrorDescription());
224		QString mailBody = generateMailBody(status);
	225	const auto& authContext = qobject_cast<AuthContext*>(mContext);
	226	QString mailBody = generateMailBody(status, authContext.isNull() ? QUrl() : authContext->getTcTokenUrl());
225	227	QString url = QStringLiteral("mailto:support@ausweisapp.de?subject=%1&body=%2").arg(mailSubject, mailBody);
226	228
227	229	QDesktopServices::openUrl(url);

+4

-11

src/ui/widget/AppQtGui.cpp less more

14	14	#include "workflow/WorkflowGui.h"
15	15
16	16	#include <QApplication>
	17	#include <QAuthenticator>
17	18	#include <QCloseEvent>
18	19	#include <QDesktopWidget>
19	20	#include <QFile>

21	22	#include <QLoggingCategory>
22	23	#include <QMenu>
23	24	#include <QMessageBox>
24
25		#ifndef QT_NO_NETWORKPROXY
26		#include <QAuthenticator>
27		#include <QNetworkProxy>
28		#endif
	25	#include <QNetworkProxy>
29	26
30	27
31	28	using namespace governikus;

289	286	messageBox.setWindowTitle(QCoreApplication::applicationName() + QStringLiteral(" - ") + tr("Information"));
290	287	messageBox.setWindowModality(Qt::WindowModal);
291	288	messageBox.setWindowFlags(messageBox.windowFlags() & ~Qt::WindowContextHelpButtonHint);
292		messageBox.setText(tr("Did you change the transport PIN already?<br><br>Prior to the first use of the online identification function you have to replace the transport PIN by an individual 6-digit PIN. Online identification with transport PIN is not possible."));
	289	messageBox.setText(tr("Did you change the Transport PIN already?<br><br>Prior to the first use of the online identification function you have to replace the Transport PIN by an individual six-digit PIN. Online identification with Transport PIN is not possible."));
293	290	messageBox.setStandardButtons(QMessageBox::Yes);
294	291	messageBox.button(QMessageBox::Yes)->setFocus();
295		auto changePinButton = messageBox.addButton(tr("No, change transport PIN now"), QMessageBox::NoRole);
	292	auto changePinButton = messageBox.addButton(tr("No, change Transport PIN now"), QMessageBox::NoRole);
296	293	messageBox.exec();
297	294
298	295	if (messageBox.clickedButton() != changePinButton)

431	428	}
432	429
433	430
434		#ifndef QT_NO_NETWORKPROXY
435	431	void AppQtGui::onProxyAuthenticationRequired(const QNetworkProxy& pProxy, QAuthenticator* pAuthenticator)
436	432	{
437	433	CredentialDialog dialog(mMainWidget);

443	439	pAuthenticator->setPassword(dialog.getPassword());
444	440	}
445	441	}
446
447
448		#endif
449	442
450	443
451	444	void AppQtGui::show(UiModule pModule)

+0

-2

src/ui/widget/AppQtGui.h less more

55	55	virtual void show(UiModule pModule = UiModule::CURRENT);
56	56	virtual void onApplicationStarted();
57	57	virtual void onShowUserInformation(const QString& pAppName);
58		#ifndef QT_NO_NETWORKPROXY
59	58	void onProxyAuthenticationRequired(const QNetworkProxy& pProxy, QAuthenticator* pAuthenticator);
60		#endif
61	59
62	60	private Q_SLOTS:
63	61	void onCloseWindowRequested(bool* pDoClose);

+1

-1

src/ui/widget/DiagnosisDialog.cpp less more

50	50	filename = QFileDialog::getSaveFileName(this,
51	51	QCoreApplication::applicationName() + QStringLiteral(" - ") + tr("Save"),
52	52	QDir::homePath() + QLatin1Char('/') + filename,
53		tr("Text files") + QStringLiteral(" (*.txt)"));
	53	tr("Textfiles") + QStringLiteral(" (*.txt)"));
54	54
55	55	if (filename.isEmpty())
56	56	{

+1

-1

src/ui/widget/GeneralSettingsWidget.cpp less more

107	107
108	108	void GeneralSettingsWidget::onUpdateCheckButtonClicked()
109	109	{
110		Env::getSingleton<Service>()->updateApp(true);
	110	Env::getSingleton<Service>()->updateApp();
111	111	}
112	112
113	113

+2

-7

src/ui/widget/LogFileSaveDialog.cpp less more

73	73
74	74	qCDebug(gui) << "File location:" << filename;
75	75
76		if (QFile::exists(filename))
77		{
78		const bool deleted = QFile::remove(filename);
79		qCDebug(gui) << "Delete file location:" << deleted;
80		}
81
82		const bool copied = pSource.isEmpty() ? Env::getSingleton<LogHandler>()->copy(filename) : QFile::copy(pSource, filename);
	76	const auto logHandler = Env::getSingleton<LogHandler>();
	77	const bool copied = pSource.isEmpty() ? logHandler->copy(filename) : logHandler->copyOther(pSource, filename);
83	78	qCDebug(gui) << "Copy log to file location:" << copied;
84	79	if (!copied)
85	80	{

+6

-6

src/ui/widget/PinSettingsWidget.ui less more

43	43	<property name="text">
44	44	<string>Select a secure PIN that consists of six digits. Do not select a number that can be guessed easily, such as "123456", your date of birth or any other number that is printed on your ID card.
45	45
46		When you change your PIN for the first time, please enter your five-digit transport PIN in the field "Current PIN / Transport PIN". You received your transport PIN with the letter sent to you by your competent authority.
	46	When you change your PIN for the first time, please enter the five-digit Transport PIN in the field "Current PIN / Transport PIN". You received your Transport PIN with the letter sent to you by your competent authority.
47	47
48	48	Please note that the PIN may only consist of digits (0-9).</string>
49	49	</property>

79	79	<property name="text">
80	80	<string>Select a secure PIN that consists of six digits. Do not select a number that can be guessed easily, such as "123456", your date of birth or any other number that is printed on your ID card.
81	81
82		When you change your PIN for the first time, please enter your five-digit transport PIN in the field "Current PIN / Transport PIN". You received your transport PIN with the letter sent to you by your competent authority.
	82	When you change your PIN for the first time, please enter the five-digit Transport PIN in the field "Current PIN / Transport PIN". You received your Transport PIN with the letter sent to you by your competent authority.
83	83
84	84	Please note that the PIN may only consist of digits (0-9).</string>
85	85	</property>

155	155	<enum>Qt::TabFocus</enum>
156	156	</property>
157	157	<property name="accessibleName">
158		<string>Display of the card access number (CAN) in the lower right corner of the id card</string>
	158	<string>Display of the Card Access Number (CAN) in the lower right corner of the id card</string>
159	159	</property>
160	160	<property name="pixmap">
161	161	<pixmap resource="../../../resources/ausweisapp.qrc">:/images/canHint.png</pixmap>

171	171	<enum>Qt::TabFocus</enum>
172	172	</property>
173	173	<property name="text">
174		<string>A wrong PIN has been entered twice on your ID card. Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. You can find your card access number (CAN) on the front of your ID card.</string>
	174	<string>A wrong PIN has been entered twice on your ID card. For a third attempt, please first enter the six-digit Card Access Number (CAN). You can find your Card Access Number (CAN) in the bottom right on the front of your ID card.</string>
175	175	</property>
176	176	<property name="wordWrap">
177	177	<bool>true</bool>

601	601	<enum>Qt::TabFocus</enum>
602	602	</property>
603	603	<property name="text">
604		<string>Card access number (CAN):</string>
	604	<string>Card Access Number (CAN):</string>
605	605	</property>
606	606	</widget>
607	607	</item>

1006	1006	<item>
1007	1007	<widget class="QLabel" name="label_7">
1008	1008	<property name="text">
1009		<string>Click on "Change PIN" to enter your card access number (CAN) and then set a new PIN. You can find your card access number (CAN) on the front side of your ID card next to the date of expiry. On the electronic residence permit the card access number (CAN) is printed above your signature.</string>
	1009	<string>Click on "Change PIN" to enter your Card Access Number (CAN) and then set a new PIN. You can find your Card Access Number (CAN) on the front side of your ID card next to the date of expiry. On the electronic residence permit the Card Access Number (CAN) is printed above your signature.</string>
1010	1010	</property>
1011	1011	<property name="alignment">
1012	1012	<set>Qt::AlignCenter</set>

+1

-1

src/ui/widget/RemotePinInputDialog.cpp less more

74	74	}
75	75	else
76	76	{
77		QToolTip::showText(mUi->pinEntryLine->mapToGlobal(QPoint(0, 0)), tr("A pairing code has to be 4 digits long."), mUi->pinEntryLine, QRect(), 3000);
	77	QToolTip::showText(mUi->pinEntryLine->mapToGlobal(QPoint(0, 0)), tr("A pairing code has to be four digits long."), mUi->pinEntryLine, QRect(), 3000);
78	78	}
79	79	}

+1

-1

src/ui/widget/RemotePinInputDialog.ui less more

48	48	</size>
49	49	</property>
50	50	<property name="text">
51		<string>Enter the 4-digit pairing code shown on your other device.</string>
	51	<string>Enter the four-digit pairing code shown on your other device.</string>
52	52	</property>
53	53	<property name="alignment">
54	54	<set>Qt::AlignCenter</set>

+2

-2

src/ui/widget/SettingsWidget.cpp less more

207	207	const QWidget* const currentWidget = mUi->settingsTabWidget->currentWidget();
208	208	if (currentWidget == mUi->pinTab)
209	209	{
210		if (mWorkflowRunning == true)
	210	if (mWorkflowRunning)
211	211	{
212	212	mUi->pinTab->continueWorkflow();
213	213	}

248	248
249	249	void SettingsWidget::onCancelButtonClicked()
250	250	{
251		if (mWorkflowRunning == true)
	251	if (mWorkflowRunning)
252	252	{
253	253	mUi->pinTab->cancelWorkflow();
254	254	}

+3

-3

src/ui/widget/SetupAssistantWizard.cpp less more

166	166
167	167	auto* conclusionPageVLayout = new QVBoxLayout(conclusionPage);
168	168
169		const auto& title = tr("Personal 6-digit PIN");
170		const auto& desc = tr("Prior to the first use of the online identification function, you have to replace the transport PIN by an individual 6-digit PIN. "
171		"The transport PIN was sent to you by postal mail.");
	169	const auto& title = tr("Personal six-digit PIN");
	170	const auto& desc = tr("Prior to the first use of the online identification function, you have to replace the Transport PIN by an individual six-digit PIN. "
	171	"The Transport PIN was sent to you by postal mail.");
172	172	QLabel* transportPinLabel = new QLabel(createDescription(title, desc));
173	173	transportPinLabel->setWordWrap(true);
174	174	transportPinLabel->setFocusPolicy(Qt::TabFocus);

+0

-4

src/ui/widget/UIPlugInWidgets.cpp less more

107	107	}
108	108
109	109
110		#ifndef QT_NO_NETWORKPROXY
111	110	void UIPlugInWidgets::onProxyAuthenticationRequired(const QNetworkProxy& pProxy, QAuthenticator* pAuthenticator)
112	111	{
113	112	mGui.onProxyAuthenticationRequired(pProxy, pAuthenticator);
114	113	}
115
116
117		#endif
118	114
119	115
120	116	void UIPlugInWidgets::onUiDomination(const UIPlugIn* pUi, const QString& pInformation, bool pAccepted)

+0

-2

src/ui/widget/UIPlugInWidgets.h less more

32	32	virtual void onApplicationStarted() override;
33	33	virtual void onShowUi(UiModule pModule) override;
34	34	virtual void onHideUi() override;
35		#ifndef QT_NO_NETWORKPROXY
36	35	virtual void onProxyAuthenticationRequired(const QNetworkProxy& pProxy, QAuthenticator* pAuthenticator) override;
37		#endif
38	36	virtual void onUiDomination(const UIPlugIn* pUi, const QString& pInformation, bool pAccepted) override;
39	37	virtual void onUiDominationReleased() override;
40	38	};

+6

-6

src/ui/widget/generic/GuiUtils.cpp less more

20	20	switch (pReturnCode)
21	21	{
22	22	case CardReturnCode::INVALID_CAN:
23		title = tr("Wrong card access number (CAN)");
	23	title = tr("Wrong Card Access Number (CAN)");
24	24	if (pCanAllowedMode)
25	25	{
26		text = tr("The given card access number (CAN) is not correct.");
	26	text = tr("The given Card Access Number (CAN) is not correct.");
27	27	}
28	28	else
29	29	{
30		text = tr("The given card access number (CAN) is not correct. You have one more try to enter the correct PIN."
31		" Please mind that you have to acknowledge this last try with your card access number (CAN).");
	30	text = tr("The given Card Access Number (CAN) is not correct. You have one more try to enter the correct PIN."
	31	" Please mind that you have to acknowledge this last try with your Card Access Number (CAN).");
32	32	}
33	33	break;
34	34

52	52	case CardReturnCode::INVALID_PIN_2:
53	53	title = tr("Wrong PIN");
54	54	text = tr("The given PIN is not correct. You have one more try to enter the correct PIN."
55		" Please mind that you have to acknowledge this last try with your card access"
56		" number (CAN).");
	55	" Please mind that you have to acknowledge this last try with your Card Access"
	56	" Number (CAN).");
57	57	break;
58	58
59	59	case CardReturnCode::INVALID_PIN_3:

+2

-2

src/ui/widget/generic/ListItem.cpp less more

8	8
9	9	using namespace governikus;
10	10
11		ListItem::ListItem(QWidget* pParent, Qt::WindowFlags pWindowFlags)
12		: QWidget(pParent, pWindowFlags)
	11	ListItem::ListItem(QWidget* pParent)
	12	: QWidget(pParent)
13	13	{
14	14	}
15	15

+1

-1

src/ui/widget/generic/ListItem.h less more

15	15	Q_OBJECT
16	16
17	17	public:
18		ListItem(QWidget* pParent = nullptr, Qt::WindowFlags pWindowFlags = 0);
	18	ListItem(QWidget* pParent = nullptr);
19	19	virtual ~ListItem() override;
20	20
21	21	void paintEvent(QPaintEvent*) override;

+9

-7

src/ui/widget/step/StepAuthenticationEac1Widget.cpp less more

8	8	#include "CardConnection.h"
9	9	#include "DetailDialog.h"
10	10	#include "generic/PasswordEdit.h"
	11	#include "LanguageLoader.h"
11	12	#include "RandomPinDialog.h"
12	13
13	14	#include <QApplication>

122	123	{
123	124	if (mContext->isCanAllowedMode())
124	125	{
125		mUi->pinGroupBox->setTitle(tr("Please enter the 6-digit card access number (CAN) for identification."));
	126	mUi->pinGroupBox->setTitle(tr("Please enter the six-digit Card Access Number (CAN) for identification."));
126	127	}
127	128	else if (cardConnection->getReaderInfo().getRetryCounter() == 1)
128	129	{
129		mUi->pinGroupBox->setTitle(tr("Please enter your 6-digit card access number (CAN) and your PIN for identification."));
	130	mUi->pinGroupBox->setTitle(tr("Please enter your six-digit Card Access Number (CAN) and your PIN for identification."));
130	131	}
131	132	else
132	133	{
133		mUi->pinGroupBox->setTitle(tr("Please enter your 6-digit PIN for identification"));
	134	mUi->pinGroupBox->setTitle(tr("Please enter your six-digit PIN for identification"));
134	135	}
135	136
136	137	if (cardConnection->getReaderInfo().isBasicReader())

187	188
188	189	auto eac1 = mContext->getDidAuthenticateEac1();
189	190	CVCertificateBody body = eac1->getCvCertificates().at(0)->getBody();
190		QString effectiveDate = body.getCertificateEffectiveDate().toString(Qt::DefaultLocaleShortDate);
191		QString expirationDate = body.getCertificateExpirationDate().toString(Qt::DefaultLocaleShortDate);
	191	const auto locale = LanguageLoader::getInstance().getUsedLocale();
	192	const auto effectiveDate = locale.toString(body.getCertificateEffectiveDate(), QLocale::ShortFormat);
	193	const auto expirationDate = locale.toString(body.getCertificateExpirationDate(), QLocale::ShortFormat);
192	194	auto certificateDescription = eac1->getCertificateDescription();
193	195
194	196	QString details;

391	393	mCANField->configureValidation(onlyNumbersExpression, allowedDigitsMsg);
392	394	connect(mCANField, &PasswordEdit::textEdited, this, &StepAuthenticationEac1Widget::canTextEdited);
393	395
394		QLabel* canLabel = new QLabel(tr("Card access number (CAN):"));
	396	QLabel* canLabel = new QLabel(tr("Card Access Number (CAN):"));
395	397	canLabel->setFocusPolicy(Qt::TabFocus);
396	398	basicReaderWidgetLayout->addWidget(canLabel);
397	399	basicReaderWidgetLayout->addWidget(mCANField);

423	425	mPINField->setEnabled(false);
424	426	}
425	427
426		const QString labelLabel = mContext->isCanAllowedMode() == false ? tr("PIN:") : tr("Card access number (CAN):");
	428	const QString labelLabel = mContext->isCanAllowedMode() ? tr("Card Access Number (CAN):") : tr("PIN:");
427	429	QLabel* pinLabel = new QLabel(labelLabel);
428	430	pinLabel->setFocusPolicy(Qt::TabFocus);
429	431	basicReaderWidgetLayout->addWidget(pinLabel);

+1

-1

src/ui/widget/step/StepChooseCardGui.cpp less more

175	175	QStringList deviceNames;
176	176	for (const auto& info : deviceInfos)
177	177	{
178		deviceNames.append(QLatin1Char('"') + info.getName() + QLatin1Char('"'));
	178	deviceNames.append(QLatin1Char('"') + info.getNameEscaped() + QLatin1Char('"'));
179	179	}
180	180	return deviceNames.join(QLatin1String(", "));
181	181	}

+0

-1

src/ui/widget/step/StepGui.h less more

68	68	Q_EMIT mDelegate->setCancelButtonState(pState);
69	69	}
70	70
71
72	71	protected:
73	72	QScopedPointer<StepGuiDelegate> mDelegate;
74	73

+0

-1

src/ui/widget/workflow/GenericWorkflowGui.h less more

69	69	pStepUi->activate();
70	70	}
71	71
72
73	72	private:
74	73	void deactivateCurrentStepUi()
75	74	{

+0

-1

src/ui/widget/workflow/WorkflowGui.h less more

56	56	{
57	57	}
58	58
59
60	59	public Q_SLOTS:
61	60	virtual void onCloseActiveDialogs();
62	61

+1

-1

src/whitelist_client/SurveyModel.h less more

28	28	const QString mModelName;
29	29	const QString mAusweisAppVersionNumber;
30	30
31		QVector<QPair<QString, QString> > mData;
	31	QVector<QPair<QString, QString>> mData;
32	32
33	33	enum UserRoles
34	34	{

+4

-4

test/CMakeLists.txt less more

0		qt5_add_resources(QRC_FIXTURE "fixture/fixture.qrc")
1		ADD_OBJECT_LIBRARY(QRC_FIXTURE_OBJ ${QRC_FIXTURE} Qt5::Core)
2
3
4	0	FUNCTION(EXTRACT_TESTNAME result filepath)
5	1	STRING(REPLACE ".cpp" "" testname ${filepath})
6	2	STRING(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" testname ${testname})

71	67	ENDFUNCTION()
72	68
73	69	IF(TARGET Qt5::Test)
	70	qt5_add_resources(QRC_FIXTURE "fixture/fixture.qrc")
	71	ADD_OBJECT_LIBRARY(QRC_FIXTURE_OBJ ${QRC_FIXTURE} Qt5::Core)
	72
74	73	ADD_SUBDIRECTORY(helper)
75	74	IF(TARGET Qt5::Qml AND TARGET Qt5::QuickTest)
76	75	ADD_SUBDIRECTORY(qml)
77	76	ENDIF()
78	77	ADD_SUBDIRECTORY(qt)
	78	ADD_SUBDIRECTORY(json)
79	79	ENDIF()

+0

-1

test/helper/MockNetworkManager.h less more

74	74	return mLastData;
75	75	}
76	76
77
78	77	Q_SIGNALS:
79	78	void fireReply();
80	79	};

+0

-1

test/helper/MockReader.h less more

63	63	mEvent = pEvent;
64	64	}
65	65
66
67	66	private:
68	67	virtual Reader::CardEvent updateCard() override
69	68	{

+5

-5

test/helper/PersoSimController.cpp less more

18	18
19	19	PersoSimController::PersoSimController()
20	20	: QObject()
21		, mProcess(nullptr)
	21	, mProcess()
22	22	, mSocket(new QTcpSocket)
23	23	{
24	24	}

63	63
64	64	bool PersoSimController::shutdown()
65	65	{
66		if (mProcess != nullptr)
	66	if (!mProcess.isNull())
67	67	{
68	68	write("shutdown\n");
69	69	mSocket->close();

80	80
81	81	bool PersoSimController::startProcess()
82	82	{
83		if (mProcess != nullptr)
	83	if (!mProcess.isNull())
84	84	{
85	85	return false;
86	86	}
87	87
88		mProcess = new QProcess;
	88	mProcess.reset(new QProcess);
89	89	mProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
90	90
91	91	connect(mSocket.data(), &QTcpSocket::readyRead, this, &PersoSimController::newData);
92	92
93		mProcess->start(QStringLiteral(PERSOSIM_EXECUTABLE));
	93	mProcess->start(QStringLiteral(PERSOSIM_EXECUTABLE), QStringList());
94	94	if (!mProcess->waitForStarted(-1))
95	95	{
96	96	qDebug() << PERSOSIM_EXECUTABLE;

+2

-1

test/helper/PersoSimController.h less more

8	8	#include <QByteArray>
9	9	#include <QObject>
10	10	#include <QProcess>
	11	#include <QScopedPointer>
11	12	#include <QTcpSocket>
12	13
13	14	namespace governikus

28	29	bool shutdown();
29	30
30	31	private:
31		QProcess* mProcess;
	32	QScopedPointer<QProcess> mProcess;
32	33	const QSharedPointer<QTcpSocket> mSocket;
33	34
34	35	bool startProcess();

+7

-25

test/helper/WebSocketHelper.cpp less more

12	12
13	13	void WebSocketHelper::connectWebsocket(int pPort)
14	14	{
15		QEventLoop eventLoop;
16
17		connect(&mWebSocket, &QWebSocket::connected, &eventLoop, &QEventLoop::quit);
18		connect(&mWebSocket, &QWebSocket::disconnected, &eventLoop, &QEventLoop::quit);
19		connect(&mWebSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), &eventLoop, &QEventLoop::quit);
20
21	15	const QString address = QStringLiteral("ws://localhost:%1/eID-Kernel").arg(pPort);
22	16	mWebSocket.open(QUrl(address));
23
24		QTimer timer;
25		timer.setSingleShot(true);
26		timer.setInterval(mConnectionTiemout);
27		connect(&timer, &QTimer::timeout, &eventLoop, &QEventLoop::quit);
28
29		eventLoop.exec();
30	17	}
31	18
32	19

40	27	: mConnectionTiemout(pConnectionTimeout)
41	28	{
42	29	connect(&mWebSocket, &QWebSocket::textMessageReceived, this, &WebSocketHelper::onTextMessageReceived);
	30	connectWebsocket(pPort);
	31	}
43	32
44		const qint64 start = QDateTime::currentMSecsSinceEpoch();
45		do
46		{
47		connectWebsocket(pPort);
48		}
49		while (mWebSocket.state() != QAbstractSocket::SocketState::ConnectedState
50		&& mWebSocket.error() == QAbstractSocket::SocketError::ConnectionRefusedError
51		&& QDateTime::currentMSecsSinceEpoch() - start < mConnectionTiemout);
	33
	34	bool WebSocketHelper::isConnected() const
	35	{
	36	return mWebSocket.state() == QAbstractSocket::SocketState::ConnectedState;
52	37	}
53	38
54	39

78	63	QEventLoop eventLoop;
79	64	connect(&mWebSocket, &QWebSocket::textMessageReceived, &eventLoop, &QEventLoop::quit);
80	65
81		QTimer timer;
82		timer.setSingleShot(true);
83		timer.setInterval(mConnectionTiemout);
84		connect(&timer, &QTimer::timeout, &eventLoop, &QEventLoop::quit);
	66	QTimer::singleShot(mConnectionTiemout, &eventLoop, &QEventLoop::quit);
85	67
86	68	eventLoop.exec();
87	69	}

+1

-1

test/helper/WebSocketHelper.h less more

28	28
29	29	public:
30	30	WebSocketHelper(int pPort, int pConnectionTimeout = 15000);
31
	31	bool isConnected() const;
32	32	QAbstractSocket::SocketState getState() const;
33	33	bool waitForMessage(const std::function<bool(const QJsonObject&)>& pMessageMatcher);
34	34	void sendMessage(const QString& pMessage);

+18

-0

test/json/CMakeLists.txt less more

	0	FIND_PROGRAM(JSONSCHEMA_BIN NAMES jsonschema jsonschema-3 python-jsonschema python3-jsonschema py-jsonschema py3-jsonschema CMAKE_FIND_ROOT_PATH_BOTH)
	1
	2	IF(JSONSCHEMA_BIN)
	3	SET(JSON_FILES updatable-files/supported-providers.json)
	4
	5	FOREACH(jsonfile ${JSON_FILES})
	6	SET(file ${RESOURCES_DIR}/${jsonfile})
	7	IF(NOT EXISTS "${file}")
	8	MESSAGE(FATAL_ERROR "File does not exist: ${file}")
	9	ENDIF()
	10
	11	GET_FILENAME_COMPONENT(filename ${file} NAME)
	12	SET(schema ${RESOURCES_DIR}/json-schemas/${filename})
	13
	14	ADD_TEST(NAME ${filename} COMMAND ${JSONSCHEMA_BIN} -i ${file} ${schema})
	15	SET_TESTS_PROPERTIES(${filename} PROPERTIES LABELS "json" TIMEOUT 10)
	16	ENDFOREACH()
	17	ENDIF()

+0

-16

test/qml/desktop/test_View.qml less more

14	14	", parent);
15	15	item.destroy();
16	16	}
17
18		function test_load_FocusFrame() {
19		var item = createTemporaryQmlObject("
20		import Governikus.View 1.0;
21		FocusFrame {}
22		", parent);
23		item.destroy();
24		}
25
26		function test_load_FocusPoint() {
27		var item = createTemporaryQmlObject("
28		import Governikus.View 1.0;
29		FocusPoint {}
30		", parent);
31		item.destroy();
32		}
33	17	}

+8

-0

test/qml/generic/test_Global.qml less more

179	179	", parent);
180	180	item.destroy();
181	181	}
	182
	183	function test_load_ProxyCredentialsPopup() {
	184	var item = createTemporaryQmlObject("
	185	import Governikus.Global 1.0;
	186	ProxyCredentialsPopup {}
	187	", parent);
	188	item.destroy();
	189	}
182	190	}

+16

-0

test/qml/generic/test_View.qml less more

14	14	", parent);
15	15	item.destroy();
16	16	}
	17
	18	function test_load_FocusFrame() {
	19	var item = createTemporaryQmlObject("
	20	import Governikus.View 1.0;
	21	FocusFrame {}
	22	", parent);
	23	item.destroy();
	24	}
	25
	26	function test_load_FocusPoint() {
	27	var item = createTemporaryQmlObject("
	28	import Governikus.View 1.0;
	29	FocusPoint {}
	30	", parent);
	31	item.destroy();
	32	}
17	33	}

+0

-18

~~test/qml/mobile/test_DeveloperView.qml~~ less more

0		/*
1		* \copyright Copyright (c) 2017-2020 Governikus GmbH & Co. KG, Germany
2		*/
3
4		import QtTest 1.10
5
6		TestCase {
7		name: "ModuleImportTest"
8		id: parent
9
10		function test_load_DeveloperView() {
11		var item = createTemporaryQmlObject("
12		import Governikus.DeveloperView 1.0;
13		DeveloperView {}
14		", parent);
15		item.destroy();
16		}
17		}

+18

-0

test/qml/mobile/test_SettingsView.qml less more

	0	/*
	1	* \copyright Copyright (c) 2017-2020 Governikus GmbH & Co. KG, Germany
	2	*/
	3
	4	import QtTest 1.10
	5
	6	TestCase {
	7	name: "ModuleImportTest"
	8	id: parent
	9
	10	function test_load_SettingsView() {
	11	var item = createTemporaryQmlObject("
	12	import Governikus.SettingsView 1.0;
	13	SettingsView {}
	14	", parent);
	15	item.destroy();
	16	}
	17	}

+0

-1

test/qt/card/asn1/test_AccessRoleAndRight.cpp less more

41	41	QTest::newRow("WriteResidencePermitI") << AccessRight::WRITE_DG19;
42	42	QTest::newRow("WriteResidencePermitII") << AccessRight::WRITE_DG20;
43	43	}
44
45	44
46	45	private Q_SLOTS:
47	46	void checkAccessRightNames_data()

+1

-2

test/qt/card/asn1/test_CVCertificate.cpp less more

32	32	BN_bn2bin(pBigNum, buf.data());
33	33	return QByteArray(reinterpret_cast<char*>(buf.data()), bufLen);
34	34	}
35
36	35
37	36	private Q_SLOTS:
38	37	void initTestCase()

139	138	#else
140	139	const BIGNUM* r = nullptr;
141	140	const BIGNUM* s = nullptr;
142		ECDSA_SIG_get0(ecdsaSignature.data(), &r, &s);
	141	ECDSA_SIG_get0(ecdsaSignature, &r, &s);
143	142	#endif
144	143
145	144	QCOMPARE(valueOf(r).toHex(), QByteArray("9f25ebfaf4b91e4c60a1683754c5dc076a3179753ef97d9f8cb01fe1dcd3b8c8"));

+4

-4

test/qt/card/asn1/test_CVCertificateBody.cpp less more

58	58	{
59	59	auto cvc = CVCertificate::fromHex(TestFileHelper::readFile(":/card/cvdv-DEDVeIDDPST00035.hex"));
60	60
61		QVERIFY(cvc->getBody().getPublicKey().getUncompressedPublicPoint().isNull() == false);
62		QVERIFY(cvc->getBody().getPublicKey().getEcKey().isNull());
	61	QVERIFY(!cvc->getBody().getPublicKey().getUncompressedPublicPoint().isNull());
	62	QVERIFY(!cvc->getBody().getPublicKey().getEcKey());
63	63	}
64	64
65	65

67	67	{
68	68	auto cvc = CVCertificate::fromHex(TestFileHelper::readFile(":/card/cvca-DETESTeID00002_DETESTeID00001.hex"));
69	69
70		QVERIFY(cvc->getBody().getPublicKey().getUncompressedPublicPoint().isNull() == false);
71		QVERIFY(cvc->getBody().getPublicKey().getEcKey().isNull() == false);
	70	QVERIFY(!cvc->getBody().getPublicKey().getUncompressedPublicPoint().isNull());
	71	QVERIFY(cvc->getBody().getPublicKey().getEcKey());
72	72	}
73	73
74	74

+0

-1

test/qt/card/asn1/test_CVCertificateChainBuilder.cpp less more

53	53	}
54	54	return output;
55	55	}
56
57	56
58	57	private Q_SLOTS:
59	58	void initTestCase()

+0

-1

test/qt/card/asn1/test_ChainBuilder.cpp less more

37	37	}
38	38	return pChild.at(0) == pParent.at(1);
39	39	}
40
41	40
42	41	private Q_SLOTS:
43	42	void testEmpty()

+0

-1

test/qt/card/asn1/test_Chat.cpp less more

24	24	QSharedPointer<CHAT> chat = CHAT::fromHex(pHexEncodedChat);
25	25	return chat->encode().toHex().toUpper();
26	26	}
27
28	27
29	28	private Q_SLOTS:
30	29	void createEmpty()

+2

-3

test/qt/card/asn1/test_EcdsaPublicKey.cpp less more

35	35	return QByteArray(reinterpret_cast<const char*>(buf.data()), buf.size());
36	36	}
37	37
38
39	38	private Q_SLOTS:
40	39	void parseCrap()
41	40	{

195	194	QVERIFY(ecdsaPublicKey != nullptr);
196	195	QVERIFY(ecdsaPublicKey->getEcKey() != nullptr);
197	196
198		const EC_GROUP* ecGroup = EC_KEY_get0_group(ecdsaPublicKey->getEcKey().data());
	197	const EC_GROUP* ecGroup = EC_KEY_get0_group(ecdsaPublicKey->getEcKey());
199	198	BIGNUM* a = BN_new(), * b = BN_new(), * p = BN_new(), * cofactor = BN_new(), * order = BN_new();
200	199	EC_GROUP_get_curve_GFp(ecGroup, p, a, b, nullptr);
201	200

248	247	QVERIFY(ecdsaPublicKey != nullptr);
249	248	QVERIFY(ecdsaPublicKey->getEcKey() != nullptr);
250	249
251		const EC_GROUP* ecGroup = EC_KEY_get0_group(ecdsaPublicKey->getEcKey().data());
	250	const EC_GROUP* ecGroup = EC_KEY_get0_group(ecdsaPublicKey->getEcKey());
252	251	BIGNUM* a = BN_new(), * b = BN_new(), * p = BN_new(), * cofactor = BN_new(), * order = BN_new();
253	252	EC_GROUP_get_curve_GFp(ecGroup, p, a, b, nullptr);
254	253

+0

-1

test/qt/card/asn1/test_SignatureChecker.cpp less more

35	35	QByteArray bytes = TestFileHelper::readFile(pName);
36	36	return CVCertificate::fromHex(bytes);
37	37	}
38
39	38
40	39	private Q_SLOTS:
41	40	void init()

+0

-1

test/qt/card/base/command/test_DidAuthenticateEAC2Command.cpp less more

27	27	CVCertificateChainBuilder builder(false);
28	28	return builder.getChainStartingWith(certificate);
29	29	}
30
31	30
32	31	private Q_SLOTS:
33	32	void init()

+0

-1

test/qt/card/base/test_CardConnectionWorker.cpp less more

28	28	MockCardConfig cardConfig(transmitConfigs);
29	29	mReader->setCard(cardConfig);
30	30	}
31
32	31
33	32	private Q_SLOTS:
34	33	void init()

+0

-1

test/qt/card/base/test_PinModify.cpp less more

20	20	: mTimeoutSeconds(5)
21	21	{
22	22	}
23
24	23
25	24	private:
26	25	const quint8 mTimeoutSeconds;

+0

-1

test/qt/card/drivers/test_ReaderDetector.cpp less more

40	40	QCOMPARE(info.getUrl(), KOMFORT_DRIVER_URL);
41	41	}
42	42
43
44	43	private Q_SLOTS:
45	44	void initTestCase()
46	45	{

+0

-1

test/qt/card/pcsc/test_pcscReaderFeature.cpp less more

34	34	}
35	35	return count;
36	36	}
37
38	37
39	38	private Q_SLOTS:
40	39	void initTestCase()

+0

-1

test/qt/card/pcsc/test_pcscReaderPaceCapability.cpp less more

34	34	}
35	35	return count;
36	36	}
37
38	37
39	38	private Q_SLOTS:
40	39	void initTestCase()

+0

-1

test/qt/card/test_MSEBuilder.cpp less more

19	19	{
20	20	QCOMPARE(mMseBuilder->build().getData(), pExpectedContent);
21	21	}
22
23	22
24	23	private Q_SLOTS:
25	24	void init()

+0

-1

test/qt/card/test_SecureMessaging.cpp less more

78	78	return result;
79	79	}
80	80
81
82	81	private Q_SLOTS:
83	82	void init()
84	83	{

+69

-0

test/qt/configuration/test_ProviderConfiguration.cpp less more

277	277	}
278	278
279	279
	280	void testCheckAttachedEidServices()
	281	{
	282	uint attachedEidCounter = 0;
	283
	284	const auto& providers = Env::getSingleton<ProviderConfiguration>()->getProviderConfigurationInfos();
	285	for (const auto& provider : providers)
	286	{
	287	const auto& urls = provider.getSubjectUrls();
	288	for (const auto& urlString : urls)
	289	{
	290	const auto& subjectHost = QUrl(urlString).host();
	291	if (subjectHost == provider.getAddressDomain() \|\| subjectHost == provider.getHomepageBase())
	292	{
	293	attachedEidCounter++;
	294	}
	295	}
	296	}
	297
	298	QCOMPARE(attachedEidCounter, 18);
	299	}
	300
	301
	302	void testCheckServicesWithoutAnOwnEidServer()
	303	{
	304	const auto& providers = Env::getSingleton<ProviderConfiguration>()->getProviderConfigurationInfos();
	305	for (const auto& provider : providers)
	306	{
	307	QVERIFY2(!provider.getSubjectUrls().isEmpty() \|\| !provider.getSubjectUrlInfo().isEmpty(), provider.getShortName().toString().toStdString().c_str());
	308	}
	309	}
	310
	311
	312	void testCheckUniqueSubjectUrls()
	313	{
	314	QSet<QString> subjectUrls;
	315	uint subjectUrlCounter = 0;
	316
	317	const auto& providers = Env::getSingleton<ProviderConfiguration>()->getProviderConfigurationInfos();
	318	for (const auto& provider : providers)
	319	{
	320	const auto& urls = provider.getSubjectUrls();
	321	for (const auto& urlString : urls)
	322	{
	323	QUrl url(urlString);
	324	QVERIFY(url.isValid());
	325	QCOMPARE(urlString, QString("https://%1").arg(url.host()));
	326
	327	subjectUrls += urlString;
	328	subjectUrlCounter++;
	329	}
	330	}
	331
	332	QCOMPARE(subjectUrls.size(), subjectUrlCounter);
	333	}
	334
	335
	336	void testCheckUrlFormat()
	337	{
	338	const auto& providers = Env::getSingleton<ProviderConfiguration>()->getProviderConfigurationInfos();
	339	for (const auto& provider : providers)
	340	{
	341	QVERIFY(QUrl(provider.getAddress()).isValid());
	342	QVERIFY(!provider.getAddress().endsWith('/'));
	343	QVERIFY(QUrl(provider.getHomepage()).isValid());
	344	QVERIFY(!provider.getHomepage().endsWith('/'));
	345	}
	346	}
	347
	348
280	349	};
281	350
282	351	QTEST_GUILESS_MAIN(test_ProviderConfiguration)

+8

-4

test/qt/configuration/test_ProviderConfigurationParser.cpp less more

9	9	#include "TestFileHelper.h"
10	10
11	11	#include <QtTest>
	12
	13	#include <algorithm>
12	14
13	15
14	16	using namespace governikus;

249	251	{
250	252	QTest::addColumn<int>("count");
251	253
252		const int desktop = 62;
	254	const int desktop = 80;
253	255	QTest::newRow("win") << desktop;
254	256	QTest::newRow("mac") << desktop;
255	257	QTest::newRow("linux") << desktop;
256	258	QTest::newRow("android") << desktop;
257		QTest::newRow("ios") << 30;
	259	QTest::newRow("ios") << 41;
258	260	}
259	261
260	262

263	265	QFETCH(int, count);
264	266
265	267	QByteArray data = TestFileHelper::readFile(QStringLiteral(":/updatable-files/supported-providers.json"));
266
267	268	const auto providers = ProviderConfigurationParser::parseProvider(data, QLatin1String(QTest::currentDataTag()));
268
269	269	QCOMPARE(providers.size(), count);
	270
	271	auto sortedProviders = providers;
	272	std::sort(sortedProviders.begin(), sortedProviders.end());
	273	QCOMPARE(providers, sortedProviders);
270	274	}
271	275
272	276

+48

-42

test/qt/configuration/test_ReaderConfiguration.cpp less more

33	33	Env::set(ReaderDetector::staticMetaObject, &mMockReaderDetector);
34	34	}
35	35
36
37	36	private:
38	37	static const int cCardReadersInConfigurationFile;
39	38

79	78	QTest::newRow("REINER SCT cyberJack RFID komfort") << UsbId(0x0C4B, 0x0501) << "REINER SCT cyberJack RFID komfort" << "REINER SCT cyberJack RFID komfort" << "img_Reiner_SCT_cyberjack_RFID_komfort" << "REINER SCT cyberJack RFID komfort";
80	79	QTest::newRow("REINER SCT cyberJack RFID standard") << UsbId(0x0C4B, 0x0500) << "REINER SCT cyberJack RFID standard" << "REINER SCT cyberJack RFID standard" << "img_Reiner_SCT_cyberjack_RFID_standard" << "REINER SCT cyberJack RFID standard";
81	80	QTest::newRow("REINER SCT cyberJack RFID basis") << UsbId(0x0C4B, 0x9102) << "REINER SCT cyberJack RFID basis" << "REINER SCT cyberJack RFID basis" << "img_Reiner_SCT_cyberjack_RFID_basis" << "REINER SCT cyberJack RFID basis";
82		QTest::newRow("REINER SCT cyberJack wave") << UsbId(0x0C4B, 0x0505) << "REINER SCT cyberJack wave" << "REINER SCT cyberJack wave" << "img_cyberjack_wave" << "REINER SCT cyberJack wave";
	81	QTest::newRow("REINER SCT cyberJack wave") << UsbId(0x0C4B, 0x0505) << "REINER SCT cyberJack wave" << "REINER SCT cyberJack wave" << "img_cyberjack_wave" << "REINER SCT cyberJack wave( USB 1)?$";
83	82
84	83	QTest::newRow("KOBIL IDToken") << UsbId(0x0D46, 0x301D) << "KOBIL Systems IDToken" << "KOBIL IDToken" << "img_KOBIL_ID_Token" << "KOBIL (Systems )?IDToken";
85	84
86		QTest::newRow("SCM SDI011") << UsbId(0x04E6, 0x512B) << "SCM Microsystems Inc. SDI011 Contactless Reader" << "SDI011 Contactless Reader" << "img_Identive_SDI011" << "SDI011 Contactless Reader\|SDI011 USB Smart Card Reader(\$1\$\|\$2\$)";
	85	QTest::newRow("SCM SDI011") << UsbId(0x04E6, 0x512B) << "SCM Microsystems Inc. SDI011 Contactless Reader" << "SDI011 Contactless Reader" << "img_Identive_SDI011" << "(SCM Microsystems Inc. SDI011G (Contactless\| Smart Card) Reader 0)\|(SDI011 (USB Smart Card\|Contactless) Reader(\$1\$\|\$2\$)?)";
87	86	QTest::newRow("SCM SCL011") << UsbId(0x04E6, 0x5292) << "SCM Microsystems Inc. SCL011 Contactless Reader" << "SCL01x Contactless Reader" << "img_Identive_SCL011" << "^(SCM Microsystems Inc. )?SCL011 Contactless Reader( 0)?$";
88	87
89	88	QTest::newRow("ACS-ACR1281U") << UsbId(0x072F, 0x0901) << "ACS ACR1281 PICC Reader" << "ACS ACR1281U" << "img_ACS_ACR1281U" << "ACS ACR1281 PICC Reader( 0)?";
90		QTest::newRow("ACS-ACR1252U") << UsbId(0x072F, 0x223B) << "ACS ACR1252 1S CL Reader PICC 0" << "ACS ACR1252U" << "img_ACS_ACR1252U" << "ACS ACR1252 1S CL Reader PICC 0\|ACS ACR1252 Dual Reader\$2\$";
	89	QTest::newRow("ACS-ACR1252U") << UsbId(0x072F, 0x223B) << "ACS ACR1252 1S CL Reader PICC 0" << "ACS ACR1252U" << "img_ACS_ACR1252U" << "ACS ACR1252 (1S CL\|Dual)? Reader PICC 0\|ACS ACR1252 Dual Reader\$2\$";
91	90
92	91	QTest::newRow("OMNIKEY 5021") << UsbId(0x076B, 0x5340) << "OMNIKEY CardMan 5x21-CL 0" << "OMNIKEY 5021-CL" << "img_HID_Omnikey_Mobile_Reader_502X_CL" << "OMNIKEY CardMan 5x21-CL 0\|OMNIKEY CardMan \$076B:5340\$ 5021 CL";
93		QTest::newRow("OMNIKEY 5022") << UsbId(0x076B, 0x5022) << "HID Global OMNIKEY 5022 Smart Card Reader 0" << "OMNIKEY 5022-CL" << "img_HID_Omnikey_Mobile_Reader_502X_CL" << "HID Global OMNIKEY 5022 Smart Card Reader 0\|HID Global OMNIKEY 5022 Smart Card Reader";
	92	QTest::newRow("OMNIKEY 5022") << UsbId(0x076B, 0x5022) << "HID Global OMNIKEY 5022 Smart Card Reader 0" << "OMNIKEY 5022-CL" << "img_HID_Omnikey_Mobile_Reader_502X_CL" << "HID Global OMNIKEY 5022 Smart Card Reader( 0)?$";
94	93	QTest::newRow("OMNIKEY 5321 v2") << UsbId(0x076B, 0x5321) << "OOMNIKEY CardMan 5x21-CL 0" << "OMNIKEY 5321 v2" << "img_HID_Global_OMNIKEY_5321_V2" << R"(OMNIKEY CardMan 5x21-CL 0\|OMNIKEY CardMan $076B:5321$ 5321($1$\|$2$))";
95	94	QTest::newRow("OMNIKEY 5421") << UsbId(0x076B, 0x5421) << "OMNIKEY CardMan 5x21-CL 0" << "OMNIKEY 5421" << "img_HID_Omnikey_542x" << R"(OMNIKEY CardMan 5x21-CL 0\|OMNIKEY Smart Card Reader USB 0\|OMNIKEY CardMan $076B:5421$ 5421($1$\|$2$))";
96	95	QTest::newRow("OMNIKEY 5422") << UsbId(0x076B, 0x5422) << "HID Global OMNIKEY 5422CL Smartcard Reader 0" << "OMNIKEY 5422" << "img_HID_Omnikey_542x" << R"(HID Global OMNIKEY 5422CL Smartcard Reader 0\|HID Global OMNIKEY Smartcard Reader ($1$\|$2$))";

100	99	QTest::newRow("Gemalto-Prox-DU") << UsbId(0x08E6, 0x5503) << "Gemalto Prox-DU Contactless_" << "Prox-DU HID" << "img_Gemalto_Prox_DU" << R"(Gemalto .*Prox(-DU\| Dual)( Contactless_\| USB PC Link(Reader\| Reader)($2$\|$1$)))";
101	100	QTest::newRow("Gemalto-Prox-SU") << UsbId(0x08E6, 0x5504) << "Gemalto Prox-SU Contactless_" << "Gemalto Prox-SU Contactless" << "img_Gemalto_Prox_SU" << R"(Gemalto Prox( \|-)SU( Contactless_\| USB PC LinkReader($1$\|$2$)))";
102	101
103		QTest::newRow("Identiv-SCL-3711") << UsbId(0x04E6, 0x5591) << "SCM Microsystems SCL3711 reader & NFC device 0" << "Identiv SCL3711" << "img_Identive_SCL3711" << "(SCM Microsystems SCL3711 reader & NFC device 0\|SCL3711 reader and NFC device)";
	102	QTest::newRow("Identiv-SCL-3711") << UsbId(0x04E6, 0x5591) << "SCM Microsystems SCL3711 reader & NFC device 0" << "Identiv SCL3711" << "img_Identive_SCL3711" << "(SCM Microsystems SCL3711 reader & NFC device 0\|SCL3711 Reader and NFC device)";
104	103	QTest::newRow("Identiv-Cloud-3700-F") << UsbId(0x04E6, 0x5790) << "Identiv CLOUD 3700 F Contactless Reader 0" << "Identiv Cloud 3700 F" << "img_Identive_Cloud_3700_F" << "(Identiv CLOUD 3700 F Contactless Reader 0\|Identiv uTrust 3700 F CL Reader)";
105	104	QTest::newRow("Identiv-Cloud-4700-F") << UsbId(0x04E6, 0x5720) << "Identive CLOUD 4700 F Contactless Reader 1" << "Identiv Cloud 4700 F" << "img_Identive_Cloud_4700_F" << "(Identive CLOUD 4700 F Contactless Reader( 0\| 1)\|Identiv uTrust 4700 F Dual Interface Reader\$2\$)";
106	105	QTest::newRow("Identiv-Cloud-4701-F") << UsbId(0x04E6, 0x5724) << "Identiv CLOUD 4701 F Contactless Reader 0" << "Identiv Cloud 4701 F" << "img_Identive_Cloud_4701_F" << "(Identiv CLOUD 4701 F Contactless Reader( 0\| 1)\|Identiv uTrust 4701 F Dual Interface Reader)";

146	145	QTest::newRow("PersoSim native") << UsbId(0x0000, 0x0001) << "PersoSim Virtual Card Reader 0" << QStringLiteral("PersoSim");
147	146
148	147	QTest::newRow("REINER SCT cyberJack RFID komfort-windows-7-10") << UsbId(0x0C4B, 0x0501) << "REINER SCT cyberJack RFID komfort USB 1" << "REINER SCT cyberJack RFID komfort";
149		QTest::newRow("REINER SCT cyberJack RFID komfort-macosx-10.11-10.14") << UsbId(0x0C4B, 0x0501) << "REINER SCT cyberJack RFID komfort" << "REINER SCT cyberJack RFID komfort";
	148	QTest::newRow("REINER SCT cyberJack RFID komfort-macosx-10.12-10.15") << UsbId(0x0C4B, 0x0501) << "REINER SCT cyberJack RFID komfort" << "REINER SCT cyberJack RFID komfort";
150	149
151	150	QTest::newRow("REINER SCT cyberJack RFID standard-windows-7-10") << UsbId(0x0C4B, 0x0500) << "REINER SCT cyberJack RFID standard USB 1" << "REINER SCT cyberJack RFID standard";
152		QTest::newRow("REINER SCT cyberJack RFID standard-macosx-10.11-10.14") << UsbId(0x0C4B, 0x0500) << "REINER SCT cyberJack RFID standard" << "REINER SCT cyberJack RFID standard";
	151	QTest::newRow("REINER SCT cyberJack RFID standard-macosx-10.12-10.15") << UsbId(0x0C4B, 0x0500) << "REINER SCT cyberJack RFID standard" << "REINER SCT cyberJack RFID standard";
153	152
154	153	QTest::newRow("REINER SCT cyberJack RFID basis-windows-7-10") << UsbId(0x0C4B, 0x9102) << "REINER SCT cyberJack RFID basis 0" << "REINER SCT cyberJack RFID basis";
155		QTest::newRow("REINER SCT cyberJack RFID basis-macosx-10.11-10.14") << UsbId(0x0C4B, 0x9102) << "REINER SCT cyberJack RFID basis" << "REINER SCT cyberJack RFID basis";
156
157		QTest::newRow("REINER SCT cyberJack wave-windows-7-10-1") << UsbId(0x0C4B, 0x0505) << "REINER SCT cyberJack wave 0" << "REINER SCT cyberJack wave";
	154	QTest::newRow("REINER SCT cyberJack RFID basis-macosx-10.12-10.15") << UsbId(0x0C4B, 0x9102) << "REINER SCT cyberJack RFID basis" << "REINER SCT cyberJack RFID basis";
	155
	156	QTest::newRow("REINER SCT cyberJack wave-windows-7-10-1") << UsbId(0x0C4B, 0x0505) << "REINER SCT cyberJack wave 0" << "REINER SCT cyberJack wave 0";
158	157	QTest::newRow("REINER SCT cyberJack wave-windows-7-10-2") << UsbId(0x0C4B, 0x0505) << "REINER SCT cyberJack wave USB 1" << "REINER SCT cyberJack wave";
159		QTest::newRow("REINER SCT cyberJack wave-macosx-10.11-10.14") << UsbId(0x0C4B, 0x0505) << "REINER SCT cyberJack wave" << "REINER SCT cyberJack wave";
	158	QTest::newRow("REINER SCT cyberJack wave-macosx-10.12-10.15") << UsbId(0x0C4B, 0x0505) << "REINER SCT cyberJack wave" << "REINER SCT cyberJack wave";
160	159
161	160	QTest::newRow("KOBIL IDToken-windows-7-10") << UsbId(0x0D46, 0x301D) << "KOBIL IDToken 0" << "KOBIL IDToken";
162		QTest::newRow("KOBIL IDToken-macosx-10.11-10.14") << UsbId(0x0D46, 0x301D) << "KOBIL Systems IDToken" << "KOBIL IDToken";
	161	QTest::newRow("KOBIL IDToken-macosx-10.12-10.14") << UsbId(0x0D46, 0x301D) << "KOBIL Systems IDToken" << "KOBIL IDToken";
163	162
164	163	QTest::newRow("SCM SDI011-windows-7-10-1") << UsbId(0x04E6, 0x512B) << "SCM Microsystems Inc. SDI011 Contactless Reader 0" << "SDI011 Contactless Reader";
165	164	QTest::newRow("SCM SDI011-windows-7-10-2") << UsbId(0x04E6, 0x512B) << "SCM Microsystems Inc. SDI011 Smart Card Reader 0" << "SCM Microsystems Inc. SDI011 Smart Card Reader 0";
166	165	QTest::newRow("SCM SDI011-windows-7-10-3") << UsbId(0x04E6, 0x512B) << "SDI011 Contactless Reader" << "SDI011 Contactless Reader";
167		QTest::newRow("SCM SDI011-macosx-10.11-10.14-1") << UsbId(0x04E6, 0x512B) << "SDI011 USB Smart Card Reader(1)" << "SDI011 Contactless Reader";
168		QTest::newRow("SCM SDI011-macosx-10.11-10.14-2") << UsbId(0x04E6, 0x512B) << "SDI011 USB Smart Card Reader(2)" << "SDI011 Contactless Reader";
169		QTest::newRow("SCM SDI011-macosx-10.10-10:14-3") << UsbId(0x04E6, 0x512B) << "SCM Microsystems Inc. SDI011 Contactless Reader(1)" << "SDI011 Contactless Reader";
	166	QTest::newRow("SCM SDI011-windows-7-10-4") << UsbId(0x04E6, 0x512B) << "SCM Microsystems Inc. SDI011G Contactless Reader 0" << "SDI011 Contactless Reader";
	167	QTest::newRow("SCM SDI011-windows-7-10-5") << UsbId(0x04E6, 0x512B) << "SCM Microsystems Inc. SDI011G Smart Card Reader 0" << "SCM Microsystems Inc. SDI011G Smart Card Reader 0";
	168	QTest::newRow("SCM SDI011-macosx-10.12-10.14-1") << UsbId(0x04E6, 0x512B) << "SDI011 USB Smart Card Reader(1)" << "SDI011 Contactless Reader";
	169	QTest::newRow("SCM SDI011-macosx-10.12-10.14-2") << UsbId(0x04E6, 0x512B) << "SDI011 USB Smart Card Reader(2)" << "SDI011 Contactless Reader";
	170	QTest::newRow("SCM SDI011-macosx-10.12-10.15-1") << UsbId(0x04E6, 0x512B) << "SCM Microsystems Inc. SDI011 Contactless Reader(1)" << "SDI011 Contactless Reader";
	171	QTest::newRow("SCM SDI011-macosx-10.12-10.15-2") << UsbId(0x04E6, 0x512B) << "SCM Microsystems Inc. SDI011 Contactless Reader(2)" << "SDI011 Contactless Reader";
170	172
171	173	QTest::newRow("SCM SCL011-windows-7-10-1") << UsbId(0x04E6, 0x5292) << "SCL011 Contactless Reader" << "SCL01x Contactless Reader";
172	174	QTest::newRow("SCM SCL011-windows-7-10-2") << UsbId(0x04E6, 0x5292) << "SCM Microsystems Inc. SCL011 Contactless Reader 0" << "SCL01x Contactless Reader";
173		QTest::newRow("SCM SCL011-macosx-10.11-10.14-1") << UsbId(0x04E6, 0x5292) << "SCL011 Contactless Reader" << "SCL01x Contactless Reader";
174		QTest::newRow("SCM SCL011-macosx-10.11-10-14-2") << UsbId(0x04E6, 0x5292) << "SCM Microsystems Inc. SCL011 Contactless Reader" << "SCL01x Contactless Reader";
	175	QTest::newRow("SCM SCL011-macosx-10.12-10.14-1") << UsbId(0x04E6, 0x5292) << "SCL011 Contactless Reader" << "SCL01x Contactless Reader";
	176	QTest::newRow("SCM SCL011-macosx-10.12-10-14-2") << UsbId(0x04E6, 0x5292) << "SCM Microsystems Inc. SCL011 Contactless Reader" << "SCL01x Contactless Reader";
175	177
176	178	QTest::newRow("ACS-ACR1281U-windows-7-10") << UsbId(0x072F, 0x0901) << "ACS ACR1281 PICC Reader 0" << "ACS ACR1281U";
177		QTest::newRow("ACS-ACR1281U-macosx-10.11-10.14") << UsbId(0x072F, 0x0901) << "ACS ACR1281 PICC Reader" << "ACS ACR1281U";
	179	QTest::newRow("ACS-ACR1281U-macosx-10.12-10.15") << UsbId(0x072F, 0x0901) << "ACS ACR1281 PICC Reader" << "ACS ACR1281U";
178	180
179	181	QTest::newRow("ACS-ACR1252U-windows-7-10-1") << UsbId(0x072F, 0x223B) << "ACS ACR1252 1S CL Reader PICC 0" << "ACS ACR1252U";
180	182	QTest::newRow("ACS-ACR1252U-windows-7-10-2") << UsbId(0x072F, 0x223B) << "ACS ACR1252 1S CL Reader SAM 0" << "ACS ACR1252 1S CL Reader SAM 0";
181		QTest::newRow("ACS-ACR1252U-macosx-10.11-10.14-1") << UsbId(0x072F, 0x223B) << "ACS ACR1252 Dual Reader(1)" << "ACS ACR1252 Dual Reader(1)";
182		QTest::newRow("ACS-ACR1252U-macosx-10.11-10.14-2") << UsbId(0x072F, 0x223B) << "ACS ACR1252 Dual Reader(2)" << "ACS ACR1252U";
	183	QTest::newRow("ACS-ACR1252U-windows-7-10-3") << UsbId(0x072F, 0x223B) << "ACS ACR1252 Dual Reader PICC 0" << "ACS ACR1252U";
	184	QTest::newRow("ACS-ACR1252U-windows-7-10-4") << UsbId(0x072F, 0x223B) << "ACS ACR1252 Dual Reader SAM 0" << "ACS ACR1252 Dual Reader SAM 0";
	185	QTest::newRow("ACS-ACR1252U-macosx-10.12-10.15-1") << UsbId(0x072F, 0x223B) << "ACS ACR1252 Dual Reader(1)" << "ACS ACR1252 Dual Reader(1)";
	186	QTest::newRow("ACS-ACR1252U-macosx-10.12-10.15-2") << UsbId(0x072F, 0x223B) << "ACS ACR1252 Dual Reader(2)" << "ACS ACR1252U";
183	187
184	188	QTest::newRow("OMNIKEY 5021-windows-7-10") << UsbId(0x076B, 0x5340) << "OMNIKEY CardMan 5x21-CL 0" << "OMNIKEY 5021-CL";
185		QTest::newRow("OMNIKEY 5021-macosx-10.11-10.14") << UsbId(0x076B, 0x5340) << "OMNIKEY CardMan (076B:5340) 5021 CL" << "OMNIKEY 5021-CL";
	189	QTest::newRow("OMNIKEY 5021-macosx-10.12-10.15") << UsbId(0x076B, 0x5340) << "OMNIKEY CardMan (076B:5340) 5021 CL" << "OMNIKEY 5021-CL";
186	190
187	191	QTest::newRow("OMNIKEY 5022-windows-7-10") << UsbId(0x076B, 0x5022) << "HID Global OMNIKEY 5022 Smart Card Reader 0" << "OMNIKEY 5022-CL";
188		QTest::newRow("OMNIKEY 5022-macosx-10.11-10.14") << UsbId(0x076B, 0x5022) << "HID Global OMNIKEY 5022 Smart Card Reader" << "OMNIKEY 5022-CL";
	192	QTest::newRow("OMNIKEY 5022-macosx-10.12-10.15") << UsbId(0x076B, 0x5022) << "HID Global OMNIKEY 5022 Smart Card Reader" << "OMNIKEY 5022-CL";
189	193
190	194	QTest::newRow("OMNIKEY 5321 v2-windows-7-10-1") << UsbId(0x076B, 0x5321) << "OMNIKEY CardMan 5x21 0" << "OMNIKEY CardMan 5x21 0";
191	195	QTest::newRow("OMNIKEY 5321 v2-windows-7-10-2") << UsbId(0x076B, 0x5321) << "OMNIKEY CardMan 5x21-CL 0" << "OMNIKEY 5321 v2";
192		QTest::newRow("OMNIKEY 5321 v2-macosx-10.11-10.11-1") << UsbId(0x076B, 0x5321) << "OMNIKEY CardMan (076B:5321) 5321(1)" << "OMNIKEY 5321 v2";
193		QTest::newRow("OMNIKEY 5321 v2-macosx-10.11-10.14-2") << UsbId(0x076B, 0x5321) << "OMNIKEY CardMan (076B:5321) 5321(2)" << "OMNIKEY 5321 v2";
	196	QTest::newRow("OMNIKEY 5321 v2-macosx-10.12-10.15-1") << UsbId(0x076B, 0x5321) << "OMNIKEY CardMan (076B:5321) 5321(1)" << "OMNIKEY 5321 v2";
	197	QTest::newRow("OMNIKEY 5321 v2-macosx-10.12-10.15-2") << UsbId(0x076B, 0x5321) << "OMNIKEY CardMan (076B:5321) 5321(2)" << "OMNIKEY 5321 v2";
194	198
195	199	QTest::newRow("OMNIKEY 5421-windows-7-10-1") << UsbId(0x076B, 0x5421) << "OMNIKEY CardMan 5x21 0" << "OMNIKEY CardMan 5x21 0";
196	200	QTest::newRow("OMNIKEY 5421-windows-7-10-2") << UsbId(0x076B, 0x5421) << "OMNIKEY CardMan 5x21-CL 0" << "OMNIKEY 5421";
197	201	QTest::newRow("OMNIKEY 5421-windows-7-10-3") << UsbId(0x076B, 0x5421) << "OMNIKEY Smart Card Reader USB 0" << "OMNIKEY 5421";
198		QTest::newRow("OMNIKEY 5421-macosx-10.11-10.14-1") << UsbId(0x076B, 0x5421) << "OMNIKEY CardMan (076B:5421) 5421(1)" << "OMNIKEY 5421";
199		QTest::newRow("OMNIKEY 5421-macosx-10.11-10.14-2") << UsbId(0x076B, 0x5421) << "OMNIKEY CardMan (076B:5421) 5421(2)" << "OMNIKEY 5421";
	202	QTest::newRow("OMNIKEY 5421-macosx-10.12-10.15-1") << UsbId(0x076B, 0x5421) << "OMNIKEY CardMan (076B:5421) 5421(1)" << "OMNIKEY 5421";
	203	QTest::newRow("OMNIKEY 5421-macosx-10.12-10.15-2") << UsbId(0x076B, 0x5421) << "OMNIKEY CardMan (076B:5421) 5421(2)" << "OMNIKEY 5421";
200	204
201	205	QTest::newRow("OMNIKEY 5422-windows-7-10-1") << UsbId(0x076B, 0x5422) << "HID Global OMNIKEY 5422 Smartcard Reader 0" << "HID Global OMNIKEY 5422 Smartcard Reader 0";
202	206	QTest::newRow("OMNIKEY 5422-windows-7-10-2") << UsbId(0x076B, 0x5422) << "HID Global OMNIKEY 5422CL Smartcard Reader 0" << "OMNIKEY 5422";
203		QTest::newRow("OMNIKEY 5421-macosx-10.13-10.14-1") << UsbId(0x076B, 0x5422) << "HID Global OMNIKEY Smartcard Reader (1)" << "OMNIKEY 5422";
204		QTest::newRow("OMNIKEY 5421-macosx-10.13-10.14-2") << UsbId(0x076B, 0x5422) << "HID Global OMNIKEY Smartcard Reader (2)" << "OMNIKEY 5422";
	207	QTest::newRow("OMNIKEY 5422-macosx-10.13-10.15-1") << UsbId(0x076B, 0x5422) << "HID Global OMNIKEY Smartcard Reader (1)" << "OMNIKEY 5422";
	208	QTest::newRow("OMNIKEY 5422-macosx-10.13-10.15-2") << UsbId(0x076B, 0x5422) << "HID Global OMNIKEY Smartcard Reader (2)" << "OMNIKEY 5422";
205	209
206	210	QTest::newRow("FEIG OBID myAXXESS RFID-Reader-windows-7-10") << UsbId(0x0AB1, 0x0003) << "FEIG ELECTRONIC GmbH OBID myAXXESS basic Slot:CL 358334430" << "OBID RFID-Reader";
207	211
208	212	QTest::newRow("Gemalto-Prox-DU-windows-7-10-1") << UsbId(0x08E6, 0x5503) << "Gemalto Prox-DU Contactless_10900383 0" << "Prox-DU HID";
209	213	QTest::newRow("Gemalto-Prox-DU-windows-7-10-2") << UsbId(0x08E6, 0x5503) << "Gemalto Prox-DU Contact_10900383 0" << "Gemalto Prox-DU Contact_10900383 0";
210		QTest::newRow("Gemalto-Prox-DU-windows-macosx-10.11-10.14-1") << UsbId(0x08E6, 0x5503) << "Gemalto Prox Dual USB PC Link Reader(1)" << "Prox-DU HID";
211		QTest::newRow("Gemalto-Prox-DU-windows-macosx-10.11-10.14-2") << UsbId(0x08E6, 0x5503) << "Gemalto Prox Dual USB PC Link Reader(2)" << "Prox-DU HID";
	214	QTest::newRow("Gemalto-Prox-DU-windows-macosx-10.12-10.15-1") << UsbId(0x08E6, 0x5503) << "Gemalto Prox Dual USB PC Link Reader(1)" << "Prox-DU HID";
	215	QTest::newRow("Gemalto-Prox-DU-windows-macosx-10.12-10.15-2") << UsbId(0x08E6, 0x5503) << "Gemalto Prox Dual USB PC Link Reader(2)" << "Prox-DU HID";
212	216
213	217	QTest::newRow("Gemalto-Prox-SU-windows-7-10-1") << UsbId(0x08E6, 0x5504) << "Gemalto Prox-SU Contactless_10800004 0" << "Gemalto Prox-SU Contactless";
214	218	QTest::newRow("Gemalto-Prox-SU-windows-7-10-2") << UsbId(0x08E6, 0x5504) << "Gemalto Prox-SU Contact_10800004 0" << "Gemalto Prox-SU Contact_10800004 0";
215		QTest::newRow("Gemalto-Prox-SU-windows-macosx-10.11-10.14-1") << UsbId(0x08E6, 0x5504) << "Gemalto Prox SU USB PC LinkReader(1)" << "Gemalto Prox-SU Contactless";
216		QTest::newRow("Gemalto-Prox-SU-windows-macosx-10.11-10.14-2") << UsbId(0x08E6, 0x5504) << "Gemalto Prox SU USB PC LinkReader(2)" << "Gemalto Prox-SU Contactless";
	219	QTest::newRow("Gemalto-Prox-SU-windows-macosx-10.12-10.15-1") << UsbId(0x08E6, 0x5504) << "Gemalto Prox SU USB PC LinkReader(1)" << "Gemalto Prox-SU Contactless";
	220	QTest::newRow("Gemalto-Prox-SU-windows-macosx-10.12-10.15-2") << UsbId(0x08E6, 0x5504) << "Gemalto Prox SU USB PC LinkReader(2)" << "Gemalto Prox-SU Contactless";
217	221
218	222	QTest::newRow("Identiv-SCL-3711-windows-7-10") << UsbId(0x04E6, 0x5591) << "SCM Microsystems SCL3711 reader & NFC device 0" << "Identiv SCL3711";
	223	QTest::newRow("Identiv-SCL-3711--F-macosx-10.12") << UsbId(0x04E6, 0x5591) << "SCL3711 Reader and NFC device" << "Identiv SCL3711";
	224	QTest::newRow("Identiv-SCL-3711--F-macosx-10.14-10.15") << UsbId(0x04E6, 0x5591) << "SCL3711 Reader and NFC device" << "Identiv SCL3711";
219	225
220	226	QTest::newRow("Identiv-Cloud-3700-F-windows-7-10") << UsbId(0x04E6, 0x5790) << "Identiv CLOUD 3700 F Contactless Reader 0" << "Identiv Cloud 3700 F";
221		QTest::newRow("Identiv-Cloud-3700-F-macosx-10.11-10.14") << UsbId(0x04E6, 0x5790) << "Identiv uTrust 3700 F CL Reader" << "Identiv Cloud 3700 F";
	227	QTest::newRow("Identiv-Cloud-3700-F-macosx-10.12-10.15") << UsbId(0x04E6, 0x5790) << "Identiv uTrust 3700 F CL Reader" << "Identiv Cloud 3700 F";
222	228
223	229	QTest::newRow("Identiv-Cloud-4700-F-windows-7-10-1") << UsbId(0x04E6, 0x5720) << "Identive CLOUD 4700 F Contact Reader 0" << "Identive CLOUD 4700 F Contact Reader 0";
224	230	QTest::newRow("Identiv-Cloud-4700-F-windows-7-10-2") << UsbId(0x04E6, 0x5720) << "Identive CLOUD 4700 F Contactless Reader 0" << "Identiv Cloud 4700 F";
225	231	QTest::newRow("Identiv-Cloud-4700-F-windows-7-10-3") << UsbId(0x04E6, 0x5720) << "Identive CLOUD 4700 F Contactless Reader 1" << "Identiv Cloud 4700 F";
226		QTest::newRow("Identiv-Cloud-4700-F-macosx-10.11-10.14-1") << UsbId(0x04E6, 0x5720) << "Identiv uTrust 4700 F Dual Interface Reader(2)" << "Identiv Cloud 4700 F";
227		QTest::newRow("Identiv-Cloud-4700-F-macosx-10.11-10.14-2") << UsbId(0x04E6, 0x5720) << "Identiv uTrust 4700 F Dual Interface Reader(1)" << "Identiv uTrust 4700 F Dual Interface Reader(1)";
	232	QTest::newRow("Identiv-Cloud-4700-F-macosx-10.12-10.15-1") << UsbId(0x04E6, 0x5720) << "Identiv uTrust 4700 F Dual Interface Reader(2)" << "Identiv Cloud 4700 F";
	233	QTest::newRow("Identiv-Cloud-4700-F-macosx-10.12-10.15-2") << UsbId(0x04E6, 0x5720) << "Identiv uTrust 4700 F Dual Interface Reader(1)" << "Identiv uTrust 4700 F Dual Interface Reader(1)";
228	234
229	235	QTest::newRow("Identiv-Cloud-4701-F-windows-7-10-1") << UsbId(0x04E6, 0x5724) << "Identiv CLOUD 4701 F Contact Reader 0" << "Identiv CLOUD 4701 F Contact Reader 0";
230	236	QTest::newRow("Identiv-Cloud-4701-F-windows-7-10-2") << UsbId(0x04E6, 0x5724) << "Identiv CLOUD 4701 F Contactless Reader 1" << "Identiv Cloud 4701 F";
231	237	QTest::newRow("Identiv-Cloud-4701-F-windows-7-10-3") << UsbId(0x04E6, 0x5724) << "Identiv CLOUD 4701 F Contactless Reader 0" << "Identiv Cloud 4701 F";
232		QTest::newRow("Identiv-Cloud-4701-F-macosx-10.11-10.14-1") << UsbId(0x04E6, 0x5724) << "Identiv uTrust 4701 F Dual Interface Reader(1)" << "Identiv Cloud 4701 F";
233		QTest::newRow("Identiv-Cloud-4701-F-macosx-10.11-10.14-2") << UsbId(0x04E6, 0x5724) << "Identiv uTrust 4701 F Dual Interface Reader(2)" << "Identiv Cloud 4701 F";
	238	QTest::newRow("Identiv-Cloud-4701-F-macosx-10.12-10.15-1") << UsbId(0x04E6, 0x5724) << "Identiv uTrust 4701 F Dual Interface Reader(1)" << "Identiv Cloud 4701 F";
	239	QTest::newRow("Identiv-Cloud-4701-F-macosx-10.12-10.15-2") << UsbId(0x04E6, 0x5724) << "Identiv uTrust 4701 F Dual Interface Reader(2)" << "Identiv Cloud 4701 F";
234	240
235	241	QTest::newRow("Cherry-TC-1200-windows-7-10-1") << UsbId(0x046A, 0x0091) << "Cherry Smartcard Terminal TC 12xx-CL 0" << "Cherry TC-1200";
236	242	QTest::newRow("Cherry-TC-1200-windows-10") << UsbId(0x046A, 0x0091) << "Cherry Smartcard Terminal TC 12xx 0" << "Cherry Smartcard Terminal TC 12xx 0";
237		QTest::newRow("Cherry-TC-1200-macosx-10.13-10.14") << UsbId(0x046A, 0x0091) << "Cherry SC Reader (046A:0091)" << "Cherry TC-1200";
	243	QTest::newRow("Cherry-TC-1200-macosx-10.12-10.15") << UsbId(0x046A, 0x0091) << "Cherry SC Reader (046A:0091)" << "Cherry TC-1200";
238	244	QTest::newRow("Cherry-TC-1200-linux") << UsbId(0x046A, 0x0091) << "Cherry TC 1200" << "Cherry TC-1200";
239	245
240	246	QTest::newRow("Cherry-TC-1300-windows-7-10-1") << UsbId(0x046A, 0x0092) << "Cherry Smartcard Terminal TC 13xx-CL 0" << "Cherry TC-1300";
241	247	QTest::newRow("Cherry-TC-1300-windows-7-10-2") << UsbId(0x046A, 0x0092) << "Cherry Smartcard Terminal TC 13xx 0" << "Cherry Smartcard Terminal TC 13xx 0";
242		QTest::newRow("Cherry-TC-1300-macosx-10.11-10.14-1") << UsbId(0x046A, 0x0092) << "Cherry SC Reader (046A:0092)(1)" << "Cherry TC-1300";
243		QTest::newRow("Cherry-TC-1300-macosx-10.11-10.14-2") << UsbId(0x046A, 0x0092) << "Cherry SC Reader (046A:0092)(2)" << "Cherry TC-1300";
	248	QTest::newRow("Cherry-TC-1300-macosx-10.12-10.15-1") << UsbId(0x046A, 0x0092) << "Cherry SC Reader (046A:0092)(1)" << "Cherry TC-1300";
	249	QTest::newRow("Cherry-TC-1300-macosx-10.12-10.15-2") << UsbId(0x046A, 0x0092) << "Cherry SC Reader (046A:0092)(2)" << "Cherry TC-1300";
244	250	QTest::newRow("Cherry-TC-1300-linux") << UsbId(0x046A, 0x0092) << "Cherry TC 1300" << "Cherry TC-1300";
245	251
246	252	QTest::newRow("Cherry-ST-1275-windows-7-10-1") << UsbId(0x046A, 0x0072) << "Cherry SmartTerminal XX7X 0" << "Cherry SmartTerminal XX7X 0";
247	253	QTest::newRow("Cherry-ST-1275-windows-7-10-2") << UsbId(0x046A, 0x0072) << "Cherry SmartTerminal XX7X-RF 0" << "Cherry ST-1275";
248	254
249	255	QTest::newRow("Signotec Omega Pad-windows-7-10") << UsbId(0x2133, 0x010B) << "NXP PR533 0" << "Signotec Omega Pad";
250		QTest::newRow("Signotec Omega Pad-macosx-10.11-10.14") << UsbId(0x2133, 0x010B) << "NXP PR533" << "Signotec Omega Pad";
	256	QTest::newRow("Signotec Omega Pad-macosx-10.12-10.15") << UsbId(0x2133, 0x010B) << "NXP PR533" << "Signotec Omega Pad";
251	257	}
252	258
253	259

+0

-1

test/qt/configuration/test_ReaderConfigurationParser.cpp less more

94	94	return QStringLiteral("{ %1\n}").arg(pDevices);
95	95	}
96	96
97
98	97	private Q_SLOTS:
99	98	void invalidJsonDocument_parseReturnsNullDeviceInfo()
100	99	{

+12

-1

test/qt/core/context/test_AuthContext.cpp less more

58	58
59	59	clearSignals();
60	60	}
61
62	61
63	62	private Q_SLOTS:
64	63	void init()

356	355	}
357	356
358	357
	358	void test_MultiCertificatesUrl()
	359	{
	360	AuthContext context(nullptr);
	361
	362	QCOMPARE(context.getCertificateList().size(), 0);
	363	context.addCertificateData(QUrl("https://governikus.de"), QSslCertificate());
	364	QCOMPARE(context.getCertificateList().size(), 1);
	365	context.addCertificateData(QUrl("https://governikus.de"), QSslCertificate());
	366	QCOMPARE(context.getCertificateList().size(), 2);
	367	}
	368
	369
359	370	};
360	371
361	372	QTEST_GUILESS_MAIN(test_AuthContext)

+0

-2

test/qt/core/controller/test_ChangePinController.cpp less more

64	64
65	65	mChangePinContext->setStateApproved();
66	66	}
67
68	67
69	68	private Q_SLOTS:
70	69	void initTestCase()

150	149	QCOMPARE(mChangePinContext->getStatus().getStatusCode(), GlobalStatus::Code::Workflow_Cancellation_By_User);
151	150	}
152	151
153
154	152	Q_SIGNALS:
155	153	void fireEidCardInserted();
156	154	};

+0

-1

test/qt/core/paos/invoke/test_DidAuthenticateResponseEAC1.cpp less more

22	22	{
23	23	return TestFileHelper::readFile(QString(":/card/").append(pFileName));
24	24	}
25
26	25
27	26	private Q_SLOTS:
28	27	void type()

+1

-1

test/qt/core/paos/invoke/test_TransmitResponse.cpp less more

36	36
37	37	TransmitResponse responseWithApdu;
38	38	responseWithApdu.setMessageId("dummy");
39		responseWithApdu.setOutputApdus(QByteArrayList {"bla"});
	39	responseWithApdu.setOutputApdus(QByteArrayList{"bla"});
40	40	elem = responseWithApdu.marshall();
41	41
42	42	QVERIFY(elem.contains("<OutputAPDU>bla</OutputAPDU>"));

+8

-8

test/qt/core/paos/retrieve/test_transmit.cpp less more

50	50
51	51	QCOMPARE(inputApdusInfos[0].getAcceptableStatusCodes(), QByteArrayList());
52	52	QCOMPARE(inputApdusInfos[1].getAcceptableStatusCodes(), QByteArrayList());
53		QCOMPARE(inputApdusInfos[2].getAcceptableStatusCodes(), QByteArrayList {"9000"});
54		QCOMPARE(inputApdusInfos[3].getAcceptableStatusCodes(), QByteArrayList {"9001"});
	53	QCOMPARE(inputApdusInfos[2].getAcceptableStatusCodes(), QByteArrayList{"9000"});
	54	QCOMPARE(inputApdusInfos[3].getAcceptableStatusCodes(), QByteArrayList{"9001"});
55	55	QCOMPARE(inputApdusInfos[4].getAcceptableStatusCodes(), QByteArrayList());
56		QCOMPARE(inputApdusInfos[5].getAcceptableStatusCodes(), QByteArrayList {"9002"});
57		QCOMPARE(inputApdusInfos[6].getAcceptableStatusCodes(), QByteArrayList {"9003"});
	56	QCOMPARE(inputApdusInfos[5].getAcceptableStatusCodes(), QByteArrayList{"9002"});
	57	QCOMPARE(inputApdusInfos[6].getAcceptableStatusCodes(), QByteArrayList{"9003"});
58	58	}
59	59
60	60

87	87
88	88	QCOMPARE(inputApdusInfos[0].getAcceptableStatusCodes(), QByteArrayList());
89	89	QCOMPARE(inputApdusInfos[1].getAcceptableStatusCodes(), QByteArrayList());
90		QCOMPARE(inputApdusInfos[2].getAcceptableStatusCodes(), QByteArrayList {"9000"});
91		QCOMPARE(inputApdusInfos[3].getAcceptableStatusCodes(), QByteArrayList {"9001"});
	90	QCOMPARE(inputApdusInfos[2].getAcceptableStatusCodes(), QByteArrayList{"9000"});
	91	QCOMPARE(inputApdusInfos[3].getAcceptableStatusCodes(), QByteArrayList{"9001"});
92	92	QCOMPARE(inputApdusInfos[4].getAcceptableStatusCodes(), QByteArrayList());
93		QCOMPARE(inputApdusInfos[5].getAcceptableStatusCodes(), QByteArrayList {"9002"});
94		QCOMPARE(inputApdusInfos[6].getAcceptableStatusCodes(), QByteArrayList {"9003"});
	93	QCOMPARE(inputApdusInfos[5].getAcceptableStatusCodes(), QByteArrayList{"9002"});
	94	QCOMPARE(inputApdusInfos[6].getAcceptableStatusCodes(), QByteArrayList{"9003"});
95	95	}
96	96
97	97

+0

-1

test/qt/core/states/test_StateCheckRefreshAddress.cpp less more

47	47	return QSharedPointer<TcToken>(new TcToken(data));
48	48	}
49	49
50
51	50	private Q_SLOTS:
52	51	void init()
53	52	{

+1

-1

test/qt/core/states/test_StatePreVerification.cpp less more

79	79	BIGNUM* signaturePart = signature->r;
80	80	#else
81	81	const BIGNUM* signaturePart = nullptr;
82		ECDSA_SIG_get0(signature.data(), &signaturePart, nullptr);
	82	ECDSA_SIG_get0(signature, &signaturePart, nullptr);
83	83	#endif
84	84	BN_pseudo_rand(const_cast<BIGNUM*>(signaturePart), BN_num_bits(signaturePart), 0, 0);
85	85

+0

-1

test/qt/core/states/test_StatePreparePaceRemote.cpp less more

27	27	const auto& buffer = command.getBuffer();
28	28	return QSharedPointer<const IfdEstablishPaceChannel>(new IfdEstablishPaceChannel("slot", buffer));
29	29	}
30
31	30
32	31	private Q_SLOTS:
33	32	void init()

+0

-47

~~test/qt/core/states/test_StateSelectPasswordId.cpp~~ less more

0		/*!
1		* \brief Tests the StateSelectPasswordId
2		*
3		* \copyright Copyright (c) 2018-2020 Governikus GmbH & Co. KG, Germany
4		*/
5
6		#include "states/StateSelectPasswordId.h"
7
8		#include "states/StateBuilder.h"
9
10		#include <QtTest>
11
12		using namespace governikus;
13
14
15		class test_StateSelectPasswordId
16		: public QObject
17		{
18		Q_OBJECT
19
20		private Q_SLOTS:
21		void test_Run()
22		{
23		QSharedPointer<WorkflowContext> context(new WorkflowContext());
24		const auto& state = StateBuilder::createState<StateSelectPasswordId>(context);
25		QSignalSpy spyPasswordIdCAN(state, &StateSelectPasswordId::firePasswordIdCAN);
26		QSignalSpy spyContinue(state, &StateSelectPasswordId::fireContinue);
27
28		context->setCanAllowedMode(true);
29		context->setStateApproved();
30		QTest::ignoreMessage(QtDebugMsg, "CAN allowed: true");
31		QTest::ignoreMessage(QtDebugMsg, "Running state \"StateSelectPasswordId\"");
32		state->onStateApprovedChanged();
33		QCOMPARE(spyPasswordIdCAN.count(), 1);
34
35		context->setCanAllowedMode(false);
36		QTest::ignoreMessage(QtDebugMsg, "CAN allowed: false");
37		QTest::ignoreMessage(QtDebugMsg, "Running state \"StateSelectPasswordId\"");
38		state->onStateApprovedChanged();
39		QCOMPARE(spyContinue.count(), 1);
40		}
41
42
43		};
44
45		QTEST_GUILESS_MAIN(test_StateSelectPasswordId)
46		#include "test_StateSelectPasswordId.moc"

+0

-1

test/qt/core/test_DiagnosisAntivirusDetection.cpp less more

25	25	QByteArray rawData = TestFileHelper::readFile(filePath);
26	26	return QString::fromUtf8(rawData);
27	27	}
28
29	28
30	29	private Q_SLOTS:
31	30	void init()

+0

-1

test/qt/core/test_DiagnosisModel.cpp less more

56	56
57	57	return offset == pSection.size();
58	58	}
59
60	59
61	60	private Q_SLOTS:
62	61	void init()

+0

-1

test/qt/core/test_DiagnosisTreeModel.cpp less more

25	25	QByteArray rawData = TestFileHelper::readFile(filePath);
26	26	return QString::fromUtf8(rawData);
27	27	}
28
29	28
30	29	private Q_SLOTS:
31	30	void init()

+0

-2

test/qt/core/test_TcToken.cpp less more

24	24	QVERIFY(file.open(QIODevice::ReadOnly \| QIODevice::Text));
25	25	}
26	26
27
28	27	public:
29	28	test_TcToken()
30	29	: tokenXmlOk(":/tctoken/ok.xml")

33	32	checkAndOpenFile(tokenXmlOk);
34	33	checkAndOpenFile(tokenXmlBroken);
35	34	}
36
37	35
38	36	private Q_SLOTS:
39	37	void parsedValues()

+20

-1

test/qt/file_provider/test_Downloader.cpp less more

68	68	QCOMPARE(url, pUrl);
69	69	}
70	70
71
72	71	private Q_SLOTS:
73	72	void initTestCase()
74	73	{

105	104	mMockNetworkManager.fireFinished();
106	105
107	106	verifySuccessReply(spy, url, timestampOnServer, fileContent);
	107	}
	108
	109
	110	void downloadEmptyFile()
	111	{
	112	const QByteArray fileContent;
	113	const QDateTime timestampOnServer(QDate(2017, 6, 1), QTime(12, 00, 0, 0));
	114	auto* const reply = new MockNetworkReply(fileContent, HTTP_STATUS_OK);
	115	reply->setFileModificationTimestamp(timestampOnServer);
	116	mMockNetworkManager.setNextReply(reply);
	117
	118	auto* const downloader = Env::getSingleton<Downloader>();
	119	QSignalSpy spy(downloader, &Downloader::fireDownloadFailed);
	120
	121	const QUrl url("http://server/reader/icons/icon.png");
	122	downloader->download(url);
	123
	124	mMockNetworkManager.fireFinished();
	125
	126	verifyFailedReply(spy, url, GlobalStatus::Code::Network_Other_Error);
108	127	}
109	128
110	129

+0

-1

test/qt/file_provider/test_FileProvider.cpp less more

47	47	QVERIFY(updatableFile11.data() != updatableFile2.data());
48	48	}
49	49
50
51	50	public:
52	51	test_FileProvider()
53	52	: mSection("reader")

+0

-2

test/qt/file_provider/test_UpdatableFile.cpp less more

51	51	QVERIFY(file.remove());
52	52	QVERIFY(!file.exists());
53	53	}
54
55	54
56	55	private Q_SLOTS:
57	56	void cleanup()

275	274	QVERIFY(!testfile.exists());
276	275	}
277	276
278
279	277	public:
280	278	test_UpdatableFile()
281	279	: mSection("reader")

+2

-2

test/qt/global/test_CardReturnCode.cpp less more

22	22	void check_errorCodeToMessage()
23	23	{
24	24	QCOMPARE(CardReturnCodeUtil::toGlobalStatus(CardReturnCode::CANCELLATION_BY_USER).toErrorDescription(),
25		QString("The process has been cancelled."));
	25	QString("The process has been cancelled by the card reader."));
26	26	}
27	27
28	28

36	36	{
37	37	const ECardApiResult& result = ECardApiResult(CardReturnCodeUtil::toGlobalStatus(CardReturnCode::CANCELLATION_BY_USER));
38	38	QCOMPARE(result.getMinor(), ECardApiResult::Minor::SAL_Cancellation_by_User);
39		QCOMPARE(result.getMessage(), QString("The process has been cancelled."));
	39	QCOMPARE(result.getMessage(), QString("The process has been cancelled by the card reader."));
40	40	}
41	41
42	42

+2

-3

test/qt/global/test_ECardApiResult.cpp less more

19	19	{
20	20	return QJsonDocument(pObj).toJson(QJsonDocument::Compact);
21	21	}
22
23	22
24	23	private Q_SLOTS:
25	24	void initTestCase()

96	95	qDebug() << ECardApiResult(CardReturnCodeUtil::toGlobalStatus(CardReturnCode::CANCELLATION_BY_USER));
97	96	QCOMPARE(spy.count(), 1);
98	97	param = spy.takeFirst();
99		QVERIFY(param.at(0).toString().contains("Result: \"http://www.bsi.bund.de/ecard/api/1.1/resultmajor#error \| http://www.bsi.bund.de/ecard/api/1.1/resultminor/sal#cancellationByUser \| The process has been cancelled.\""));
	98	QVERIFY(param.at(0).toString().contains("Result: \"http://www.bsi.bund.de/ecard/api/1.1/resultmajor#error \| http://www.bsi.bund.de/ecard/api/1.1/resultminor/sal#cancellationByUser \| The process has been cancelled by the card reader.\""));
100	99
101	100	spy.clear();
102	101

123	122
124	123	expected = "{\"description\":\"The process has been cancelled.\","
125	124	"\"language\":\"en\",\"major\":\"http://www.bsi.bund.de/ecard/api/1.1/resultmajor#error\","
126		"\"message\":\"The process has been cancelled.\","
	125	"\"message\":\"The process has been cancelled by the card reader.\","
127	126	"\"minor\":\"http://www.bsi.bund.de/ecard/api/1.1/resultminor/sal#cancellationByUser\"}";
128	127	QCOMPARE(bytes(ECardApiResult(CardReturnCodeUtil::toGlobalStatus(CardReturnCode::CANCELLATION_BY_USER)).toJson()), expected);
129	128

+0

-1

test/qt/global/test_EnumHelper.cpp less more

44	44	auto result = spy.takeFirst();
45	45	QVERIFY(result.at(0).toString().endsWith(pExpectedOutput));
46	46	}
47
48	47
49	48	private Q_SLOTS:
50	49	void initTestCase()

+0

-1

test/qt/global/test_Env.cpp less more

80	80	virtual ~TestInstance()
81	81	{
82	82	}
83
84	83
85	84	public:
86	85	static TestInstance& getInstance()

+4

-4

test/qt/global/test_GlobalStatus.cpp less more

28	28	void test_IsCancellationByUser()
29	29	{
30	30	GlobalStatus status1;
31		GlobalStatus status2(GlobalStatus::Code::Workflow_Cancellation_By_User, QStringList(), Origin::Client);
32		GlobalStatus status3(GlobalStatus::Code::Card_Cancellation_By_User, QStringList(), Origin::Client);
33		GlobalStatus status4(GlobalStatus::Code::Paos_Error_SAL_Cancellation_by_User, QStringList(), Origin::Client);
	31	GlobalStatus status2(GlobalStatus::Code::Workflow_Cancellation_By_User, Origin::Client);
	32	GlobalStatus status3(GlobalStatus::Code::Card_Cancellation_By_User, Origin::Client);
	33	GlobalStatus status4(GlobalStatus::Code::Paos_Error_SAL_Cancellation_by_User, Origin::Client);
34	34
35	35	QVERIFY(!status1.isCancellationByUser());
36	36	QVERIFY(status2.isCancellationByUser());

76	76	QFETCH(GlobalStatus::Code, code);
77	77	QFETCH(QString, message);
78	78
79		GlobalStatus status(code, QStringList(), Origin::Client);
	79	GlobalStatus status(code, Origin::Client);
80	80
81	81	QCOMPARE(status.toErrorDescription(false), message);
82	82	}

+1

-1

test/qt/global/test_LanguageLoader.cpp less more

40	40
41	41	void benchmark()
42	42	{
43		QBENCHMARK {
	43	QBENCHMARK{
44	44	QCOMPARE(LanguageLoader::getInstance().getAvailableLocales().size(), 6);
45	45	}
46	46	}

+60

-2

test/qt/global/test_LogHandler.cpp less more

5	5
6	6	#include "LogHandler.h"
7	7
	8	#include <QDir>
	9	#include <QFile>
8	10	#include <QtTest>
9	11
10	12	#ifndef Q_OS_WIN

44	46	}
45	47
46	48
	49	QString randomLogFileName(bool pAutoRemove = true)
	50	{
	51	QTemporaryFile tmp(LogHandler::getLogFileTemplate());
	52	tmp.open();
	53	tmp.setAutoRemove(pAutoRemove);
	54	return tmp.fileName();
	55	}
	56
47	57	private Q_SLOTS:
48	58	void initTestCase()
49	59	{

61	71
62	72	void benchmark()
63	73	{
64		QBENCHMARK {
	74	QBENCHMARK{
65	75	qDebug() << "Add some dummy" << "messages" << "in different" << "strings";
66	76	}
67	77	}

114	124
115	125	void otherLogFilesWithoutCurrent()
116	126	{
	127	Env::getSingleton<LogHandler>()->setLogfile(true);
	128
117	129	auto list = Env::getSingleton<LogHandler>()->getOtherLogfiles();
118	130	QVERIFY(!list.contains(Env::getSingleton<LogHandler>()->mLogFile));
	131
	132	Env::getSingleton<LogHandler>()->setLogfile(false);
	133	auto nextList = Env::getSingleton<LogHandler>()->getOtherLogfiles();
	134	QCOMPARE(list, nextList);
119	135	}
120	136
121	137

130	146	}
131	147
132	148
133		void copyFile()
	149	void copyFileFail()
134	150	{
135	151	qDebug() << "dummy";
136	152	QVERIFY(!Env::getSingleton<LogHandler>()->copy(QString()));
137	153	QVERIFY(!Env::getSingleton<LogHandler>()->copy(QStringLiteral(" ")));
	154	}
	155
	156
	157	void copyFileOverwrite()
	158	{
	159	qDebug() << "dummy";
	160	const QString fileName = randomLogFileName();
	161	QVERIFY(Env::getSingleton<LogHandler>()->copy(fileName));
	162	QVERIFY(QFile::exists(fileName));
	163	QVERIFY(Env::getSingleton<LogHandler>()->copy(fileName));
	164	QVERIFY(QFile::exists(fileName));
	165
	166	Env::getSingleton<LogHandler>()->setLogfile(false);
	167	QVERIFY(!Env::getSingleton<LogHandler>()->copy(fileName));
	168	QVERIFY(QFile::exists(fileName));
	169	}
	170
	171
	172	void copyOther_data()
	173	{
	174	QTest::addColumn<bool>("withLogFile");
	175
	176	QTest::newRow("true") << true;
	177	QTest::newRow("false") << false;
	178	}
	179
	180
	181	void copyOther()
	182	{
	183	QFETCH(bool, withLogFile);
	184
	185	Env::getSingleton<LogHandler>()->setLogfile(withLogFile);
	186
	187	const QString logFileName = randomLogFileName(false);
	188	QVERIFY(QFile::exists(logFileName));
	189	const QString targetFileName = randomLogFileName();
	190	QVERIFY(Env::getSingleton<LogHandler>()->copyOther(logFileName, targetFileName));
	191	QVERIFY(QFile::exists(targetFileName));
	192	QVERIFY(QFile::remove(targetFileName));
	193	QVERIFY(QFile::remove(logFileName));
	194	QVERIFY(!Env::getSingleton<LogHandler>()->copyOther(QStringLiteral("foo.log"), targetFileName));
	195	QVERIFY(!QFile::exists(targetFileName));
138	196	}
139	197
140	198

+0

-6

test/qt/network/test_DatagramHandlerImpl.cpp less more

92	92
93	93	QSignalSpy spy(Env::getSingleton<LogHandler>(), &LogHandler::fireLog);
94	94	QUdpSocket clientSocket;
95		#ifndef QT_NO_NETWORKPROXY
96	95	clientSocket.setProxy(QNetworkProxy::NoProxy);
97		#endif
98	96
99	97	auto written = clientSocket.writeDatagram("dummy", QHostAddress::LocalHost, socket.staticCast<DatagramHandlerImpl>()->mSocket->localPort());
100	98	QTRY_COMPARE(spySocket.count(), 1);

130	128	QSignalSpy spySocket(socket.data(), &DatagramHandler::fireNewMessage);
131	129
132	130	QUdpSocket clientSocket;
133		#ifndef QT_NO_NETWORKPROXY
134	131	clientSocket.setProxy(QNetworkProxy::NoProxy);
135		#endif
136	132
137	133	QByteArray data("{\"key\":\"value\"}");
138	134	auto written = clientSocket.writeDatagram(data, broadcast ? QHostAddress::Broadcast : QHostAddress::LocalHost, socket.staticCast<DatagramHandlerImpl>()->mSocket->localPort());

158	154	QFETCH(bool, broadcast);
159	155
160	156	QUdpSocket receiver;
161		#ifndef QT_NO_NETWORKPROXY
162	157	receiver.setProxy(QNetworkProxy::NoProxy);
163		#endif
164	158
165	159	QVERIFY(receiver.bind());
166	160	QSignalSpy spyReceiver(&receiver, &QUdpSocket::readyRead);

+3

-3

test/qt/network/test_NetworkManager.cpp less more

78	78	reply.setNetworkError(QNetworkReply::ServiceUnavailableError, "dummy error msg");
79	79
80	80	QCOMPARE(NetworkManager::toNetworkError(&reply), NetworkManager::NetworkError::ServiceUnavailable);
81		QCOMPARE(NetworkManager::toTrustedChannelStatus(&reply), GlobalStatus(GlobalStatus::Code::Workflow_TrustedChannel_ServiceUnavailable));
82		QCOMPARE(NetworkManager::toStatus(&reply), GlobalStatus(GlobalStatus::Code::Network_ServiceUnavailable));
	81	QCOMPARE(NetworkManager::toTrustedChannelStatus(&reply), GlobalStatus(GlobalStatus::Code::Workflow_TrustedChannel_ServiceUnavailable, {GlobalStatus::ExternalInformation::LAST_URL, reply.url().toString()}));
	82	QCOMPARE(NetworkManager::toStatus(&reply), GlobalStatus(GlobalStatus::Code::Network_ServiceUnavailable, {GlobalStatus::ExternalInformation::LAST_URL, reply.url().toString()}));
83	83	}
84	84
85	85

134	134	controller.run();
135	135
136	136	QTRY_COMPARE(spy.count(), 1);
137		QCOMPARE(context->getStatus(), GlobalStatus(GlobalStatus::Code::Workflow_TrustedChannel_ServiceUnavailable));
	137	QCOMPARE(context->getStatus(), GlobalStatus(GlobalStatus::Code::Workflow_TrustedChannel_ServiceUnavailable, {GlobalStatus::ExternalInformation::LAST_URL, reply->url().toString()}));
138	138	}
139	139
140	140

+0

-1

test/qt/network/test_TlsChecker.cpp less more

35	35	BIO_free(bio);
36	36	return key;
37	37	}
38
39	38
40	39	private Q_SLOTS:
41	40	void initTestCase()

+54

-3

test/qt/remote_device/messages/test_Discovery.cpp less more

155	155	QVERIFY(discovery.isIncomplete());
156	156	QCOMPARE(discovery.getType(), RemoteCardMessageType::UNDEFINED);
157	157
158		QCOMPARE(logSpy.count(), 1);
	158	QCOMPARE(logSpy.count(), 2);
159	159	QVERIFY(logSpy.at(0).at(0).toString().contains("The value of msg should be REMOTE_IFD"));
	160	QVERIFY(logSpy.at(1).at(0).toString().contains("Received ifdId is not a fingerprint. Interpretion as a certificate to create our own fingerprint failed"));
160	161	}
161	162
162	163

181	182	QVERIFY(!discovery.isIncomplete());
182	183	QCOMPARE(discovery.getContextHandle(), QString());
183	184
184		QCOMPARE(logSpy.count(), 0);
	185	QCOMPARE(logSpy.count(), 1);
	186	QVERIFY(logSpy.at(0).at(0).toString().contains("Received ifdId is not a fingerprint. Interpretion as a certificate to create our own fingerprint failed"));
185	187	}
186	188
187	189

234	236	QVERIFY(discovery.isIncomplete());
235	237	QCOMPARE(discovery.getSupportedApis(), QVector<IfdVersion::Version>({IfdVersion::Version::v_test}));
236	238
	239	QCOMPARE(logSpy.count(), 2);
	240	QVERIFY(logSpy.at(0).at(0).toString().contains("Received ifdId is not a fingerprint. Interpretion as a certificate to create our own fingerprint failed"));
	241	QVERIFY(logSpy.at(1).at(0).toString().contains("The value of \"SupportedAPI\" should be of type \"string array\""));
	242	}
	243
	244
	245	void sameIfdId()
	246	{
	247	QSignalSpy logSpy(Env::getSingleton<LogHandler>(), &LogHandler::fireLog);
	248
	249	const QByteArray messageHash(R"({
	250	"IFDID": "0575e99867361c26442ece18bed6f955ab7dd269ae8f42d3a21af0e734c3d8d9",
	251	"IFDName": "Sony Xperia Z5 compact",
	252	"SupportedAPI": ["IFDInterface_WebSocket_v0", "IFDInterface_WebSocket_v_test"],
	253	"msg": "REMOTE_IFD",
	254	"port": 24728
	255	})");
	256	const QJsonObject& objHash = QJsonDocument::fromJson(messageHash).object();
	257	const Discovery discoveryHash(objHash);
	258	QCOMPARE(logSpy.count(), 0);
	259
	260	const QByteArray messageCert(R"({
	261	"IFDID": "-----BEGIN CERTIFICATE-----
	262	MIIC4zCCAcsCBEQvMpowDQYJKoZIhvcNAQELBQAwNDEUMBIGA1UEAwwLQXVzd2Vp
	263	c0FwcDIxHDAaBgNVBAUTEzY0MTgwMjY3MTE5MTA5MjY2MzQwIhgPMTk3MDAxMDEw
	264	MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowNDEUMBIGA1UEAwwLQXVzd2Vpc0FwcDIx
	265	HDAaBgNVBAUTEzY0MTgwMjY3MTE5MTA5MjY2MzQwggEiMA0GCSqGSIb3DQEBAQUA
	266	A4IBDwAwggEKAoIBAQDGJ9C76Cb8iHuaZJxcFY0NpNllcAK5JKcrigKBki7EvF9z
	267	5Q/MNek2pxwTMp5SilUDJOkwgcTdm7liC/Zx+lPX8MZjhWxV73DGt9DDyJh91ypl
	268	6B8vZbpJlL83Vo4C4BLBG6ZaElPpyTitWWKQ4BFUoH0h2utsNFV7FHz+1oZcvhv0
	269	gQuzd7gQaVV6mzCePRn+4qgxYSXSJ8Ix21udgT3LoHDOBrOWSIt0g/Q1mkzJcnaC
	270	EnS2s6Ib0xPY5PsL1YN/dZn88/gs9Za4rZSBGIIDrpCt5WCkYbkg45LwXLmaPUrg
	271	uuFIFIR0HH4pxgajLHpMgYaszxkg4SkdxwJ8vIytAgMBAAEwDQYJKoZIhvcNAQEL
	272	BQADggEBAB4grwHZ8NMrs3vRInJQc3ftYDCAjDPjjTg/G4BVz07DmlQZpFyPfInb
	273	UaKfpMlaEd1EoRuNIxC796+rZhy+j97DoLkT1qnPP30GLwlZaVZeOCKIIQ+tGjUU
	274	cWhhIC6kRCPIQAKxKDNGIUwBAkwludieGa7Ytl7qmnnJDMNe+Ox7Sf+UOa12bJKH
	275	d27MYoWMfecJdTmF8xXQ7EEYjMwWHd5t5tJG9AVgzhO8zC+iJTqc9I34sIa8+9WE
	276	oQu+/VZgDkJaSdDJ4LqVFIvUy3CFGh6ahDVsHGC5kTDm5EQWh3puWR0AkIjUWMPi
	277	xU/nr0Jsab99VgX4/nnCW92v/DIRc1c=
	278	-----END CERTIFICATE-----",
	279	"IFDName": "Sony Xperia Z5 compact",
	280	"SupportedAPI": ["IFDInterface_WebSocket_v0", "IFDInterface_WebSocket_v_test"],
	281	"msg": "REMOTE_IFD",
	282	"port": 24728
	283	})");
	284	const QJsonObject& objCert = QJsonDocument::fromJson(messageCert).object();
	285	const Discovery discoveryCert(objCert);
237	286	QCOMPARE(logSpy.count(), 1);
238		QVERIFY(logSpy.at(0).at(0).toString().contains("The value of \"SupportedAPI\" should be of type \"string array\""));
	287	QVERIFY(logSpy.at(0).at(0).toString().contains("Received ifdId is not a fingerprint. Interpretion as a certificate to create our own fingerprint succeeded"));
	288
	289	QCOMPARE(discoveryHash.getIfdId(), discoveryCert.getIfdId());
239	290	}
240	291
241	292

+0

-1

test/qt/remote_device/messages/test_RemoteMessage.cpp less more

116	116	QCOMPARE(logSpy.count(), 1);
117	117	QVERIFY(logSpy.at(0).at(0).toString().contains(QString("Invalid messageType received: \"")));
118	118	}
119
120	119
121	120	private Q_SLOTS:
122	121	void initTestCase()

+0

-5

test/qt/remote_device/test_RemoteConnector.cpp less more

122	122	QVERIFY(signalFound);
123	123	}
124	124
125
126	125	private Q_SLOTS:
127	126	void initTestCase()
128	127	{

303	302	settings.setTrustedCertificates(trustedCertificates);
304	303	webSocketServer.setSslConfiguration(sslConfigServer);
305	304
306		#ifndef QT_NO_NETWORKPROXY
307	305	// Listening with proxy leads to socket error QNativeSocketEnginePrivate::InvalidProxyTypeString
308	306	webSocketServer.setProxy(QNetworkProxy(QNetworkProxy::NoProxy));
309		#endif
310	307	webSocketServer.listen(QHostAddress(QHostAddress::LocalHost));
311	308	const quint16 serverPort = webSocketServer.serverPort();
312	309

368	365	config.setLocalCertificate(pair.getCertificate());
369	366	webSocketServer.setSslConfiguration(config);
370	367
371		#ifndef QT_NO_NETWORKPROXY
372	368	// Listening with proxy leads to socket error QNativeSocketEnginePrivate::InvalidProxyTypeString
373	369	webSocketServer.setProxy(QNetworkProxy(QNetworkProxy::NoProxy));
374		#endif
375	370	webSocketServer.listen(QHostAddress(QHostAddress::LocalHost));
376	371	const quint16 serverPort = webSocketServer.serverPort();
377	372

+6

-6

test/qt/remote_device/test_RemoteDeviceModel.cpp less more

20	20	private Q_SLOTS:
21	21	void init()
22	22	{
23		mName = QStringLiteral("name");
	23	mName = QStringLiteral("name<");
24	24	mModel.reset(new RemoteDeviceModel());
25		mEntry.reset(new RemoteDeviceModelEntry(mName));
	25	mEntry = QSharedPointer<RemoteDeviceModelEntry>::create(mName);
26	26	}
27	27
28	28

41	41	}
42	42
43	43
44		void test_DeviceName()
45		{
46		QCOMPARE(mEntry->getDeviceName(), mName);
	44	void test_DeviceNameEscaped()
	45	{
	46	QCOMPARE(mEntry->getDeviceNameEscaped(), mName);
47	47	}
48	48
49	49

181	181	void test_GetRemoteDeviceListEntryModelIndex()
182	182	{
183	183	QSharedPointer<RemoteDeviceListEntry> listEntry(new RemoteDeviceListEntry(RemoteDeviceDescriptor()));
184		RemoteDeviceModelEntry entry1(QString("entry 1"), QString("01"), listEntry);
	184	RemoteDeviceModelEntry entry1(QString("entry 1"), QStringLiteral("01"), listEntry);
185	185	RemoteDeviceModelEntry entry2(QString("entry 2"));
186	186	mModel->mAllRemoteReaders << entry1 << entry2;
187	187

+0

-1

test/qt/remote_device/test_RemoteReaderAdvertiser.cpp less more

28	28	Q_EMIT fireSend(pData);
29	29	return true;
30	30	}
31
32	31
33	32	Q_SIGNALS:
34	33	void fireSend(const QByteArray& pData);

+4

-0

test/qt/remote_device/test_RemoteTlsServer.cpp less more

58	58	qRegisterMetaType<QSslPreSharedKeyAuthenticator>("QSslPreSharedKeyAuthenticator*");
59	59	QSignalSpy clientPsk(&client, &QSslSocket::preSharedKeyAuthenticationRequired);
60	60	QSignalSpy clientEncrypted(&client, &QSslSocket::encrypted);
	61	#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
	62	QSignalSpy clientErrors(&client, &QAbstractSocket::errorOccurred);
	63	#else
61	64	QSignalSpy clientErrors(&client, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error));
	65	#endif
62	66	client.connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
63	67
64	68	QTRY_COMPARE(clientErrors.count(), 1);

+0

-1

test/qt/remote_device/test_RemoteWebSocketServer.cpp less more

42	42	}
43	43	}
44	44
45
46	45	private Q_SLOTS:
47	46	void onPreSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator* pAuthenticator)
48	47	{

+0

-1

test/qt/remote_device/test_ServerMessageHandler.cpp less more

107	107	QVERIFY(!pContextHandle.isEmpty());
108	108	}
109	109
110
111	110	private Q_SLOTS:
112	111	void initTestCase()
113	112	{

+13

-5

test/qt/secure_storage/test_SecureStorage.cpp less more

5	5
6	6	#include <QCoreApplication>
7	7	#include <QFile>
	8	#include <QSslKey>
8	9	#include <QtTest>
9	10
10	11	#include "FileDestination.h"

16	17
17	18	Q_DECLARE_METATYPE(SecureStorage::TlsSuite)
18	19	Q_DECLARE_METATYPE(QSsl::SslProtocol)
	20	Q_DECLARE_METATYPE(QSsl::KeyAlgorithm)
19	21
20	22	class test_SecureStorage
21	23	: public QObject

73	75	return comments;
74	76	}
75	77
76
77	78	private Q_SLOTS:
78	79	void testGetCVRootCertificatesUnique()
79	80	{

166	167	QTest::addColumn<QString>("subjectInfo");
167	168	QTest::addColumn<QString>("issuerInfo");
168	169	QTest::addColumn<QString>("expiryDate");
169
170		QTest::newRow("production") << 0 << "appl.governikus-asp.de" << "TeleSec ServerPass Class 2 CA" << "2020-12-06T23:59:59Z";
171		QTest::newRow("ci") << 1 << "*.govkg.de" << "TeleSec ServerPass Class 2 CA" << "2021-03-12T23:59:59Z";
	170	QTest::addColumn<int>("length");
	171	QTest::addColumn<QSsl::KeyAlgorithm>("algorithm");
	172
	173	QTest::newRow("production") << 0 << "appl.governikus-asp.de" << "TeleSec ServerPass Class 2 CA" << "2020-12-06T23:59:59Z" << 4096 << QSsl::Rsa;
	174	QTest::newRow("production_next") << 1 << "appl.governikus-asp.de" << "TeleSec ServerPass Class 2 CA" << "2022-06-22T23:59:59Z" << 4096 << QSsl::Rsa;
	175	QTest::newRow("ci") << 2 << "*.govkg.de" << "TeleSec ServerPass Class 2 CA" << "2021-03-12T23:59:59Z" << 4096 << QSsl::Rsa;
172	176	}
173	177
174	178

176	180	{
177	181	const auto secureStorage = Env::getSingleton<SecureStorage>();
178	182	const auto& certificates = secureStorage->getUpdateCertificates();
179		QCOMPARE(certificates.count(), 2);
	183	QCOMPARE(certificates.count(), 3);
180	184
181	185	QFETCH(int, index);
182	186	QFETCH(QString, subjectInfo);
183	187	QFETCH(QString, issuerInfo);
184	188	QFETCH(QString, expiryDate);
	189	QFETCH(int, length);
	190	QFETCH(QSsl::KeyAlgorithm, algorithm);
185	191
186	192	QVERIFY(certificates.count() - index > 0);
187	193

189	195	QCOMPARE(cert.subjectInfo(QSslCertificate::CommonName).at(0), subjectInfo);
190	196	QCOMPARE(cert.issuerInfo(QSslCertificate::CommonName).at(0), issuerInfo);
191	197	QCOMPARE(cert.expiryDate(), QDateTime::fromString(expiryDate, Qt::ISODate));
	198	QCOMPARE(cert.publicKey().length(), length);
	199	QCOMPARE(cert.publicKey().algorithm(), algorithm);
192	200	}
193	201
194	202

+0

-1

test/qt/services/test_AppUpdatr.cpp less more

126	126	return QString("NO_INFO");
127	127	}
128	128
129
130	129	private Q_SLOTS:
131	130	void initTestCase()
132	131	{

+29

-1

test/qt/settings/test_GeneralSettings.cpp less more

35	35	#endif
36	36	}
37	37
38
39	38	private Q_SLOTS:
40	39	void init()
41	40	{

135	134
136	135	settings.setShuffleScreenKeyboard(initial);
137	136	QCOMPARE(settings.isShuffleScreenKeyboard(), initial);
	137	settings.save();
	138	}
	139
	140
	141	void testCanAllowed()
	142	{
	143	auto& settings = Env::getSingleton<AppSettings>()->getGeneralSettings();
	144
	145	settings.setEnableCanAllowed(true);
	146	QVERIFY(settings.isEnableCanAllowed());
	147	QVERIFY(!settings.isSkipRightsOnCanAllowed());
	148
	149	settings.setSkipRightsOnCanAllowed(true);
	150	QVERIFY(settings.isSkipRightsOnCanAllowed());
	151
	152	settings.setEnableCanAllowed(false);
	153	QVERIFY(!settings.isEnableCanAllowed());
	154	QVERIFY(!settings.isSkipRightsOnCanAllowed());
	155
	156	settings.setEnableCanAllowed(true);
	157	QVERIFY(settings.isEnableCanAllowed());
	158	QVERIFY(settings.isSkipRightsOnCanAllowed());
	159
	160	settings.setEnableCanAllowed(false);
	161	settings.setSkipRightsOnCanAllowed(false);
	162	QVERIFY(!settings.isEnableCanAllowed());
	163	QVERIFY(!settings.isSkipRightsOnCanAllowed());
138	164	settings.save();
139	165	}
140	166

155	181	QCOMPARE(settings.isDeveloperMode(), false);
156	182	QCOMPARE(settings.useSelfAuthTestUri(), false);
157	183	QCOMPARE(settings.isUseScreenKeyboard(), false);
	184	QCOMPARE(settings.isEnableCanAllowed(), false);
	185	QCOMPARE(settings.isSkipRightsOnCanAllowed(), false);
158	186	QCOMPARE(settings.isShowSetupAssistant(), true);
159	187	QCOMPARE(settings.isShowNewUiHint(), true);
160	188	QCOMPARE(settings.isShowInAppNotifications(), getNotificationsOsDefault());

+16

-14

test/qt/settings/test_RemoteServiceSettings.cpp less more

81	81	RemoteServiceSettings settings;
82	82	QVERIFY(settings.getTrustedCertificates().isEmpty());
83	83
84		const QList<QSslCertificate> certs{
	84	const QList<QSslCertificate> certs {
85	85	pair1.getCertificate(), pair1.getCertificate(), pair2.getCertificate()
86	86	};
87	87	settings.setTrustedCertificates(certs);

221	221	QCOMPARE(settings.getRemoteInfos().size(), 0);
222	222
223	223	const auto& current = QDateTime::currentDateTime();
224		RemoteServiceSettings::RemoteInfo a(QString("a"), current, QString("dummy for A"));
225		RemoteServiceSettings::RemoteInfo b(QString("b"), current, QString("dummy for B"));
	224	RemoteServiceSettings::RemoteInfo a(QStringLiteral("a"), current);
	225	a.setNameUnescaped(QStringLiteral("dummy for A"));
	226	RemoteServiceSettings::RemoteInfo b(QStringLiteral("b"), current);
	227	b.setNameUnescaped(QStringLiteral("dummy for B"));
226	228
227	229	QVERIFY(a == a);
228	230	QVERIFY(b == b);

235	237	QCOMPARE(first, a);
236	238	QCOMPARE(second, b);
237	239	QCOMPARE(first.getFingerprint(), QString("a"));
238		QCOMPARE(first.getName(), QString("dummy for A"));
	240	QCOMPARE(first.getNameEscaped(), QStringLiteral("dummy for A"));
239	241	QCOMPARE(first.getLastConnected(), current);
240	242	QCOMPARE(second.getFingerprint(), QString("b"));
241		QCOMPARE(second.getName(), QString("dummy for B"));
	243	QCOMPARE(second.getNameEscaped(), QStringLiteral("dummy for B"));
242	244	QCOMPARE(second.getLastConnected(), current);
243	245
244	246	settings.setRemoteInfos({});

260	262	settings.addTrustedCertificate(a);
261	263	settings.addTrustedCertificate(b);
262	264	QCOMPARE(settings.getRemoteInfos().size(), 2);
263		QCOMPARE(settings.getRemoteInfos().at(0).getName(), QString());
	265	QCOMPARE(settings.getRemoteInfos().at(0).getNameEscaped(), QString());
264	266
265	267	auto aInfo = settings.getRemoteInfo(a);
266		aInfo.setName(QString("dummy"));
	268	aInfo.setNameUnescaped(QString("dummy"));
267	269	QVERIFY(settings.updateRemoteInfo(aInfo));
268		QCOMPARE(settings.getRemoteInfos().at(0).getName(), QString("dummy"));
	270	QCOMPARE(settings.getRemoteInfos().at(0).getNameEscaped(), QString("dummy"));
269	271	QCOMPARE(settings.getRemoteInfos().size(), 2);
270	272
271	273	auto c = KeyPair::generate().getCertificate();

275	277
276	278	settings.addTrustedCertificate(c);
277	279	cInfo = settings.getRemoteInfo(c);
278		cInfo.setName("c");
	280	cInfo.setNameUnescaped("c");
279	281	settings.updateRemoteInfo(cInfo);
280	282	QCOMPARE(settings.getRemoteInfos().size(), 3);
281		QCOMPARE(settings.getRemoteInfos().at(0).getName(), QString("dummy"));
282		QCOMPARE(settings.getRemoteInfos().at(1).getName(), QString());
283		QCOMPARE(settings.getRemoteInfos().at(2).getName(), QString("c"));
	283	QCOMPARE(settings.getRemoteInfos().at(0).getNameEscaped(), QString("dummy"));
	284	QCOMPARE(settings.getRemoteInfos().at(1).getNameEscaped(), QString());
	285	QCOMPARE(settings.getRemoteInfos().at(2).getNameEscaped(), QString("c"));
284	286	QCOMPARE(settings.getRemoteInfos().at(2).getFingerprint(),
285	287	QString::fromLatin1(c.digest(QCryptographicHash::Sha256).toHex()));
286	288	}

296	298	settings.addTrustedCertificate(a);
297	299
298	300	auto aInfo = settings.getRemoteInfo(a);
299		aInfo.setName("hallo");
	301	aInfo.setNameUnescaped("<b>hallo</b>");
300	302	QVERIFY(settings.updateRemoteInfo(aInfo));
301	303
302	304	QCOMPARE(settings.getRemoteInfos().size(), 1);
303		QCOMPARE(settings.getRemoteInfos().at(0).getName(), QString("hallo"));
	305	QCOMPARE(settings.getRemoteInfos().at(0).getNameEscaped(), QStringLiteral("<b>hallo</b>"));
304	306	}
305	307
306	308

+0

-1

test/qt/ui/json/test_MsgHandlerAccessRights.cpp less more

51	51	return aux;
52	52	}
53	53
54
55	54	private Q_SLOTS:
56	55	void nonExistingTransactionInfo()
57	56	{

+0

-1

test/qt/ui/json/test_MsgHandlerCertificate.cpp less more

25	25	context->setOptionalAccessRights({AccessRight::AGE_VERIFICATION});
26	26	return context;
27	27	}
28
29	28
30	29	private Q_SLOTS:
31	30	void getCertificateBadState()

+0

-1

test/qt/ui/json/test_MsgHandlerEnterCan.cpp less more

31	31	{
32	32	setValidState(pDispatcher, pSelectReader, pBasicReader, pPasswordID);
33	33	}
34
35	34
36	35	private Q_SLOTS:
37	36	void initTestCase()

+0

-1

test/qt/ui/json/test_MsgHandlerEnterPin.cpp less more

31	31	{
32	32	setValidState(pDispatcher, pSelectReader, pBasicReader, pPasswordID);
33	33	}
34
35	34
36	35	private Q_SLOTS:
37	36	void initTestCase()

+0

-1

test/qt/ui/json/test_MsgHandlerEnterPuk.cpp less more

31	31	{
32	32	setValidState(pDispatcher, pSelectReader, pBasicReader, pPasswordID);
33	33	}
34
35	34
36	35	private Q_SLOTS:
37	36	void initTestCase()

+0

-1

test/qt/ui/json/test_MsgHandlerInsertCard.cpp less more

26	26	QSharedPointer<WorkflowContext> context(new WorkflowContext());
27	27	pDispatcher.init(context);
28	28	}
29
30	29
31	30	private Q_SLOTS:
32	31	void initTestCase()

+0

-1

test/qt/ui/json/test_UIPlugInJson.cpp less more

29	29
30	30	return QJsonObject();
31	31	}
32
33	32
34	33	private Q_SLOTS:
35	34	void cleanup()

+0

-1

test/qt/ui/qml/test_HistoryModel.cpp less more

72	72	return infos;
73	73	}
74	74
75
76	75	private Q_SLOTS:
77	76	void init()
78	77	{

+24

-0

test/qt/ui/qml/test_LogModel.cpp less more

4	4	*/
5	5
6	6	#include "LogModel.h"
	7
	8	#include "LogHandler.h"
7	9
8	10	#include <QDebug>
9	11	#include <QtTest>

131	133	}
132	134
133	135
	136	void test_RemoveOldLogfile()
	137	{
	138	{
	139	QTemporaryFile oldLogfile(LogHandler::getLogFileTemplate());
	140	oldLogfile.setAutoRemove(false);
	141	QVERIFY(oldLogfile.open());
	142	QVERIFY(!oldLogfile.fileName().isNull());
	143	}
	144
	145	// We need to reset() the model since the list of "old" logfiles
	146	// is only populated in the ctor of LogModel.
	147	mModel.reset(new LogModel());
	148
	149	QCOMPARE(mModel->getLogfiles().size(), 2);
	150	mModel->removeCurrentLogfile();
	151	QCOMPARE(mModel->getLogfiles().size(), 2);
	152	mModel->setLogfile(1);
	153	mModel->removeCurrentLogfile();
	154	QCOMPARE(mModel->getLogfiles().size(), 1);
	155	}
	156
	157
134	158	};
135	159
136	160	QTEST_GUILESS_MAIN(test_LogModel)

+17

-5

test/qt/ui/qml/test_NumberModel.cpp less more

244	244	context->setCardConnection(connection);
245	245
246	246	context->setLastPaceResult(CardReturnCode::INVALID_PIN);
247		QCOMPARE(mModel->getInputError(), tr("The given PIN is not correct. You have 2 tries to enter the correct PIN."));
	247	QCOMPARE(mModel->getInputError(), tr("The given PIN is not correct. You have two attempts to enter the correct PIN."));
248	248	QVERIFY(mModel->hasError());
249	249
250	250	context->setLastPaceResult(CardReturnCode::INVALID_PIN_2);
251	251	QCOMPARE(mModel->getInputError(), tr("A wrong PIN has been entered twice on your ID card. "
252		"Prior to a third attempt, you have to enter your 6-digit card access number (CAN) first. "
253		"You can find your card access number (CAN) on the front of your ID card."));
	252	"For a third attempt, please first enter the six-digit Card Access Number (CAN). "
	253	"You can find your Card Access Number (CAN) in the bottom right on the front of your ID card."));
254	254	QVERIFY(mModel->hasError());
255	255
256	256	context->setLastPaceResult(CardReturnCode::INVALID_PIN_3);
257	257	QCOMPARE(mModel->getInputError(), tr("A wrong PIN has been entered three times on your ID card. "
258	258	"Your PIN is now blocked. "
259		"To unblock your PIN you have to enter the PUK."));
	259	"You have to enter the PUK to remove the block."));
260	260	QVERIFY(mModel->hasError());
261	261
262	262	context->setLastPaceResult(CardReturnCode::INVALID_CAN);
263		QCOMPARE(mModel->getInputError(), tr("The entered card access number (CAN) is incorrect. Please try again."));
	263	QCOMPARE(mModel->getInputError(), tr("The entered Card Access Number (CAN) is incorrect. Please try again."));
264	264
265	265	context->setLastPaceResult(CardReturnCode::INVALID_PUK);
266	266	QCOMPARE(mModel->getInputError(), tr("The entered PUK is incorrect. Please try again."));

275	275	tr("https://www.ausweisapp.bund.de/en/qa/support/"),
276	276	tr("AusweisApp2 Support")));
277	277	QVERIFY(mModel->hasError());
	278
	279	mModel->setRequestTransportPin(true);
	280	context->setLastPaceResult(CardReturnCode::INVALID_PIN);
	281	QCOMPARE(mModel->getInputError(), tr("The given Transport PIN is not correct. You have two attempts to enter the correct Transport PIN."));
	282	context->setLastPaceResult(CardReturnCode::INVALID_PIN_2);
	283	QCOMPARE(mModel->getInputError(), tr("A wrong Transport PIN has been entered twice on your ID card. "
	284	"For a third attempt, please first enter the six-digit Card Access Number (CAN). "
	285	"You can find your Card Access Number (CAN) in the bottom right on the front of your ID card."));
	286	context->setLastPaceResult(CardReturnCode::INVALID_PIN_3);
	287	QCOMPARE(mModel->getInputError(), tr("A wrong Transport PIN has been entered three times on your ID card. "
	288	"Your Transport PIN is now blocked. "
	289	"You have to enter the PUK to remove the block."));
278	290
279	291	connectionThread.quit();
280	292	connectionThread.wait();

+3

-3

test/qt/ui/qml/test_ProviderNameFilterModel.cpp less more

47	47	HistoryModel model;
48	48	mModel->setSourceModel(&model);
49	49
50		HistoryInfo historyInfo1("SubjectName", QString("https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen/"), "Usage", QDateTime::currentDateTime(), "TermOfUsage", {"RequestedData"});
	50	HistoryInfo historyInfo1("SubjectName", QString("https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen"), "Usage", QDateTime::currentDateTime(), "TermOfUsage", {"RequestedData"});
51	51	HistoryInfo historyInfo2("SubjectName", QString("https://test.de"), "Usage", QDateTime::currentDateTime(), "TermOfUsage", {"RequestedData"});
52	52	Env::getSingleton<AppSettings>()->getHistorySettings().addHistoryInfo(historyInfo1);
53	53	Env::getSingleton<AppSettings>()->getHistorySettings().addHistoryInfo(historyInfo2);
54		const QString providerAddress("https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen/");
	54	const QString providerAddress("https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen");
55	55	mModel->setProviderAddress(providerAddress);
56	56
57	57	QVERIFY(!mModel->filterAcceptsRow(0, QModelIndex()));

66	66	mModel->setProviderAddress(invalidProviderAddress);
67	67	QCOMPARE(mModel->mProvider.getAddress(), QString());
68	68
69		const QString validProviderAddress("https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen/");
	69	const QString validProviderAddress("https://www.ausweisapp.bund.de/online-ausweisen/meine-daten-auslesen");
70	70	mModel->setProviderAddress(validProviderAddress);
71	71	QCOMPARE(mModel->mProvider.getAddress(), validProviderAddress);
72	72	}

+97

-0

test/qt/ui/qml/test_ProxyCredentials.cpp less more

	0	/*!
	1	* \brief Unit tests for \ref ProxyCredentials
	2	*
	3	* \copyright Copyright (c) 2020 Governikus GmbH & Co. KG, Germany
	4	*/
	5
	6	#include "ProxyCredentials.h"
	7
	8
	9	#include <QElapsedTimer>
	10	#include <QtTest>
	11	#include <QTimer>
	12
	13
	14	using namespace governikus;
	15
	16
	17	Q_DECLARE_METATYPE(QNetworkProxy::ProxyType)
	18
	19
	20	class test_ProxyCredentials
	21	: public QObject
	22	{
	23	Q_OBJECT
	24
	25	private Q_SLOTS:
	26	void test_Url_data()
	27	{
	28	QTest::addColumn<QNetworkProxy::ProxyType>("type");
	29	QTest::addColumn<QString>("url");
	30
	31	QTest::newRow("NoProxy") << QNetworkProxy::NoProxy << "http://proxy.example.com:1337";
	32	QTest::newRow("DefaultProxy") << QNetworkProxy::DefaultProxy << "http://proxy.example.com:1337";
	33	QTest::newRow("Socks5Proxy") << QNetworkProxy::Socks5Proxy << "socks5://proxy.example.com:1337";
	34	QTest::newRow("HttpProxy") << QNetworkProxy::HttpProxy << "http://proxy.example.com:1337";
	35	QTest::newRow("HttpCachingProxy") << QNetworkProxy::HttpCachingProxy << "http://proxy.example.com:1337";
	36	QTest::newRow("FtpCachingProxy") << QNetworkProxy::FtpCachingProxy << "ftp://proxy.example.com:1337";
	37	}
	38
	39
	40	void test_Url()
	41	{
	42	QFETCH(QNetworkProxy::ProxyType, type);
	43	QFETCH(QString, url);
	44
	45	QNetworkProxy proxy(QNetworkProxy::HttpProxy, "proxy.example.com", 1337, "Test");
	46	proxy.setType(type);
	47	QAuthenticator authenticator;
	48
	49	ProxyCredentials proxyCredentials(proxy, &authenticator);
	50	QCOMPARE(proxyCredentials.getUrl(), url);
	51	}
	52
	53
	54	void test_Credentials()
	55	{
	56	QNetworkProxy proxy(QNetworkProxy::HttpProxy, "proxy.example.com", 1337, "Test");
	57	QAuthenticator authenticator;
	58
	59	ProxyCredentials proxyCredentials(proxy, &authenticator);
	60	QCOMPARE(proxyCredentials.getProposedUser(), "Test");
	61
	62	QCOMPARE(proxyCredentials.getUser(), "");
	63	proxyCredentials.setUser("TestUser");
	64	QCOMPARE(proxyCredentials.getUser(), "TestUser");
	65
	66	QCOMPARE(proxyCredentials.getPassword(), "");
	67	proxyCredentials.setPassword("TestPassword");
	68	QCOMPARE(proxyCredentials.getPassword(), "TestPassword");
	69	}
	70
	71
	72	void test_BlockingWait()
	73	{
	74	const int waitFor = 500;
	75	const int tolerance = 10;
	76
	77	QNetworkProxy proxy(QNetworkProxy::HttpProxy, "proxy.example.com", 1337, "Test");
	78	QAuthenticator authenticator;
	79	ProxyCredentials proxyCredentials(proxy, &authenticator);
	80
	81	QElapsedTimer timer;
	82	timer.start();
	83
	84	QTimer::singleShot(waitFor, this, [&proxyCredentials] {
	85	proxyCredentials.confirmInput();
	86	});
	87
	88	proxyCredentials.waitForConfirmation();
	89	QVERIFY(timer.elapsed() >= waitFor - tolerance);
	90	}
	91
	92
	93	};
	94
	95	QTEST_GUILESS_MAIN(test_ProxyCredentials)
	96	#include "test_ProxyCredentials.moc"

+0

-1

test/qt/ui/qml/test_RemoteServiceModel.cpp less more

40	40
41	41	return command.getBuffer();
42	42	}
43
44	43
45	44	private Q_SLOTS:
46	45	void initTestCase()

+59

-38

test/qt/ui/qml/test_UIPlugInQml.cpp less more

20	20	Q_OBJECT
21	21
22	22	private:
23		static const int PROCESS_TIMEOUT = 75000;
	23	static const int PROCESS_TIMEOUT = 15000;
24	24
25	25	QScopedPointer<QProcess> mApp2;
26	26	QScopedPointer<WebSocketHelper> mHelper;
27	27
28		bool isQmlEngineInitDone(const bool pCheckDoneAndSuccessful)
29		{
	28	QString getLogData()
	29	{
	30	QString logData;
30	31	mHelper->sendMessage(QStringLiteral("{\"cmd\": \"GET_LOG\"}"));
31
32		bool initContainedInLog = false;
33		bool initContainedAndSuccess = false;
34		bool showUiReceived = false;
35		bool noQmlWarning = true;
36		QString logData;
37		mHelper->waitForMessage([&initContainedInLog, &initContainedAndSuccess, &showUiReceived, &noQmlWarning, &logData](const QJsonObject& pMessage){
38		if (pMessage[QLatin1String("data")].isNull())
	32	mHelper->waitForMessage([&logData](const QJsonObject& pMessage){
	33	if (pMessage["msg"] != "LOG")
39	34	{
40	35	return false;
41	36	}
42	37
43		const QString& data = pMessage[QLatin1String("data")].toString();
44		logData = data;
45		initContainedInLog = data.contains(QLatin1String("QML engine initialization finished"));
46		initContainedAndSuccess = data.contains(QLatin1String("QML engine initialization finished with 0 warnings."));
47		showUiReceived = (data.count(QStringLiteral("/eID-Client?showui=")) == 3);
48		noQmlWarning = !data.contains(QRegularExpression(" W .*\\.qml:"));
	38	auto jsonData = pMessage[QLatin1String("data")];
	39	if (!jsonData.isNull())
	40	{
	41	logData = jsonData.toString();
	42	}
49	43
50	44	return true;
51	45	});
52
53		if (pCheckDoneAndSuccessful)
54		{
55		if (initContainedAndSuccess && showUiReceived && noQmlWarning)
56		{
57		return true;
58		}
59
	46	return logData;
	47	}
	48
	49
	50	bool isQmlEngineInitDone()
	51	{
	52	return getLogData().contains(QStringLiteral("QML engine initialization finished"));
	53	}
	54
	55
	56	bool isQmlEngineInitSuccess()
	57	{
	58	const QString logData = getLogData();
	59
	60	bool initContainedAndSuccess = logData.contains(QLatin1String("QML engine initialization finished with 0 warnings."));
	61	bool noQmlWarning = !logData.contains(QRegularExpression(" W .*\\.qml:"));
	62
	63	bool success = initContainedAndSuccess && noQmlWarning;
	64	if (!success)
	65	{
60	66	qDebug().noquote() << "Error output from AusweisApp2 process:\n" << logData;
61		return false;
62		}
63
64		return initContainedInLog;
65		}
66
	67	}
	68	return success;
	69	}
	70
	71
	72	bool isShowUiInLog(const QString& showUi)
	73	{
	74	return getLogData().contains(QStringLiteral(" \"GET\" \| QUrl(\"/eID-Client?showui=%1\")").arg(showUi));
	75	}
67	76
68	77	private Q_SLOTS:
69	78	void initTestCase()

81	90	QTest::newRow("Android Tablet") << QString("mobile,android,tablet");
82	91	QTest::newRow("iOS") << QString("mobile,ios,phone");
83	92	QTest::newRow("iOS Tablet") << QString("mobile,ios,tablet");
84		QTest::newRow("macOS") << QString("desktop,mac");
	93	#ifdef Q_OS_WIN
85	94	QTest::newRow("Windows") << QString("desktop,win");
	95	#else
	96	QTest::newRow("macOS") << QString("desktop,nowin");
	97	#endif
86	98	}
87	99
88	100

123	135	QTextStream(&portInfoFile) >> applicationPort;
124	136	QVERIFY(applicationPort > 0);
125	137
	138	mHelper.reset(new WebSocketHelper(applicationPort));
	139	QTRY_VERIFY_WITH_TIMEOUT(mHelper->isConnected(), PROCESS_TIMEOUT);
	140
	141	QTRY_VERIFY_WITH_TIMEOUT(!getLogData().isEmpty(), PROCESS_TIMEOUT);
	142	QTRY_VERIFY_WITH_TIMEOUT(isQmlEngineInitDone(), PROCESS_TIMEOUT);
	143	QVERIFY(isQmlEngineInitSuccess());
	144
126	145	const QString showUiUri = QStringLiteral("http://localhost:%1/eID-Client?showui=%2").arg(applicationPort);
127	146	QNetworkAccessManager accessManager;
128	147	QSignalSpy logSpy(&accessManager, &QNetworkAccessManager::finished);
	148
129	149	accessManager.get(QNetworkRequest(QUrl(showUiUri.arg("IDENTIFY"))));
130	150	QTRY_COMPARE_WITH_TIMEOUT(logSpy.size(), 1, PROCESS_TIMEOUT);
	151	QTRY_VERIFY_WITH_TIMEOUT(isShowUiInLog(QStringLiteral("IDENTIFY")), PROCESS_TIMEOUT);
	152
131	153	accessManager.get(QNetworkRequest(QUrl(showUiUri.arg("SETTINGS"))));
132	154	QTRY_COMPARE_WITH_TIMEOUT(logSpy.size(), 2, PROCESS_TIMEOUT);
	155	QTRY_VERIFY_WITH_TIMEOUT(isShowUiInLog(QStringLiteral("SETTINGS")), PROCESS_TIMEOUT);
	156
133	157	accessManager.get(QNetworkRequest(QUrl(showUiUri.arg("UPDATEINFORMATION"))));
134	158	QTRY_COMPARE_WITH_TIMEOUT(logSpy.size(), 3, PROCESS_TIMEOUT);
135
136		mHelper.reset(new WebSocketHelper(applicationPort));
137		QCOMPARE(mHelper->getState(), QAbstractSocket::SocketState::ConnectedState);
138
139		QTRY_VERIFY_WITH_TIMEOUT(isQmlEngineInitDone(false), PROCESS_TIMEOUT);
140		QVERIFY(isQmlEngineInitDone(true));
	159	QTRY_VERIFY_WITH_TIMEOUT(isShowUiInLog(QStringLiteral("UPDATEINFORMATION")), PROCESS_TIMEOUT);
	160
	161	QVERIFY(isQmlEngineInitSuccess());
141	162	}
142	163
143	164

+1

-1

test/qt/ui/websocket/test_UIPlugInWebSocket.cpp less more

67	67	QVERIFY(webSocketPort > 0);
68	68
69	69	mHelper.reset(new WebSocketHelper(webSocketPort));
70		QCOMPARE(mHelper->getState(), QAbstractSocket::SocketState::ConnectedState);
	70	QTRY_VERIFY_WITH_TIMEOUT(mHelper->isConnected(), PROCESS_TIMEOUT);
71	71	}
72	72
73	73

+0

-1

test/qt/ui/widget/test_HelpAction.cpp less more

48	48	{
49	49	return QUrl::fromLocalFile(helpDir.path()).toString() + QString::fromLatin1(pStr);
50	50	}
51
52	51
53	52	private Q_SLOTS:
54	53	void init()

+0

-1

test/qt/ui/widget/test_ReaderDriverModel.cpp less more

59	59	Env::set(ReaderDetector::staticMetaObject, &mMockReaderDetector);
60	60	Env::set(ReaderManager::staticMetaObject, &mMockReaderManager);
61	61	}
62
63	62
64	63	private:
65	64	QScopedPointer<MockReaderConfiguration> mMockReaderConfiguration;

+29

-3

uncrustify.cfg less more

0		# Uncrustify_d-0.70.1_f
	0	# Uncrustify_d-0.71.0_f
1	1	newlines = lf
2	2	input_tab_size = 4
3	3	output_tab_size = 4

5	5	string_escape_char2 = 0
6	6	string_replace_tab_chars = false
7	7	tok_split_gte = false
	8	disable_processing_nl_cont = false
8	9	disable_processing_cmt = ""
9	10	enable_processing_cmt = ""
10	11	enable_digraphs = false

20	21	sp_cpp_lambda_assign = ignore
21	22	sp_cpp_lambda_square_paren = ignore
22	23	sp_cpp_lambda_square_brace = ignore
	24	sp_cpp_lambda_paren_brace = ignore
23	25	sp_cpp_lambda_fparen = ignore
24	26	sp_assign_default = force
25	27	sp_before_assign = force

128	130	sp_inside_braces_empty = remove
129	131	sp_trailing_return = ignore
130	132	sp_type_func = remove
131		sp_type_brace_init_lst = ignore
	133	sp_type_brace_init_lst = remove
132	134	sp_func_proto_paren = remove
133	135	sp_func_proto_paren_empty = ignore
134	136	sp_func_type_paren = ignore

157	159	sp_after_throw = ignore
158	160	sp_catch_paren = force
159	161	sp_oc_catch_paren = ignore
	162	sp_before_oc_proto_list = ignore
160	163	sp_oc_classname_paren = ignore
161	164	sp_version_paren = ignore
162	165	sp_scope_paren = ignore

175	178	sp_brace_finally = ignore
176	179	sp_try_brace = ignore
177	180	sp_getset_brace = ignore
178		sp_word_brace = add
	181	sp_word_brace_init_lst = add
179	182	sp_word_brace_ns = add
180	183	sp_before_dc = remove
181	184	sp_after_dc = remove

282	285	indent_member = 0
283	286	indent_member_single = false
284	287	indent_sing_line_comments = 0
	288	indent_sparen_extra = 0
285	289	indent_relative_single_line_comments = false
286	290	indent_switch_case = 4
287	291	indent_switch_break_with_case = false

306	310	indent_square_nl = false
307	311	indent_preserve_sql = false
308	312	indent_align_assign = true
	313	indent_off_after_assign = false
309	314	indent_align_paren = true
	315	indent_oc_inside_msg_sel = false
310	316	indent_oc_block = false
311	317	indent_oc_block_msg = 0
312	318	indent_oc_msg_colon = 0

320	326	indent_vbrace_open_on_tabstop = false
321	327	indent_token_after_brace = true
322	328	indent_cpp_lambda_body = true
	329	indent_compound_literal_return = true
323	330	indent_using_block = true
324	331	indent_ternary_operator = 0
	332	indent_inside_ternary_operator = false
	333	indent_off_after_return = false
325	334	indent_off_after_return_new = false
326	335	indent_single_after_return = false
327	336	indent_ignore_asm_block = false

365	374	nl_elseif_brace = force
366	375	nl_else_brace = force
367	376	nl_else_if = remove
	377	nl_before_opening_brace_func_class_def = ignore
368	378	nl_before_if_closing_paren = ignore
369	379	nl_brace_finally = force
370	380	nl_finally_brace = force

431	441	nl_func_def_start_multi_line = false
432	442	nl_func_decl_args = ignore
433	443	nl_func_def_args = ignore
	444	nl_func_call_args = ignore
434	445	nl_func_decl_args_multi_line = false
435	446	nl_func_def_args_multi_line = false
436	447	nl_func_decl_end = ignore

443	454	nl_func_def_empty = ignore
444	455	nl_func_call_empty = ignore
445	456	nl_func_call_start = ignore
	457	nl_func_call_end = ignore
446	458	nl_func_call_start_multi_line = false
447	459	nl_func_call_args_multi_line = false
448	460	nl_func_call_end_multi_line = false
	461	nl_func_call_args_multi_line_ignore_closures = false
449	462	nl_template_start = false
450	463	nl_template_args = false
451	464	nl_template_end = false

543	556	nl_remove_extra_newlines = 0
544	557	nl_after_annotation = ignore
545	558	nl_between_annotation = ignore
	559	nl_before_whole_file_ifdef = 0
	560	nl_after_whole_file_ifdef = 0
	561	nl_before_whole_file_endif = 0
	562	nl_after_whole_file_endif = 0
546	563	pos_arith = ignore
547	564	pos_assign = ignore
548	565	pos_bool = ignore

623	640	align_oc_msg_colon_span = 0
624	641	align_oc_msg_colon_first = false
625	642	align_oc_decl_colon = false
	643	align_oc_msg_colon_xcode_like = false
626	644	cmt_width = 0
627	645	cmt_reflow_mode = 0
628	646	cmt_convert_tab_to_spaces = false

671	689	mod_sort_import = true
672	690	mod_sort_using = false
673	691	mod_sort_include = true
	692	mod_sort_incl_import_prioritize_filename = false
	693	mod_sort_incl_import_prioritize_extensionless = false
	694	mod_sort_incl_import_prioritize_angle_over_quotes = false
	695	mod_sort_incl_import_ignore_extension = false
	696	mod_sort_incl_import_grouping_enabled = false
674	697	mod_move_case_break = true
675	698	mod_case_brace = ignore
676	699	mod_remove_empty_return = false

706	729	indent_cpp_lambda_only_once = false
707	730	use_sp_after_angle_always = false
708	731	use_options_overriding_for_qt_macros = true
	732	use_form_feed_no_more_as_whitespace_character = false
709	733	warn_level_tabs_found_in_verbatim_string_literals = 2
	734	debug_max_number_of_loops = 0
	735	debug_line_number_to_protocol = 0
710	736	macro-open ASN1_ITEM_TEMPLATE
711	737	macro-close ASN1_ITEM_TEMPLATE_END
712	738	# option(s) with 'not default' value: 157