Skip to content
This repository was archived by the owner on May 4, 2022. It is now read-only.

Commit 8ffab56

Browse files
Weidenbachsweidenbach
Weidenbach
authored and
sweidenbach
committed
c997c6f4
644043aa 859bf14e 39889262 9995ad7f 40ea6713 95e38aa5 043ecd86 2a049870 679cc0e8 d9517b3d 19d97f2b 3c3a3884 name fix
1 parent b4d8a45 commit 8ffab56

18 files changed

+361
-86
lines changed

‎src/IDWallet.Android/IDWallet.Android.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
338338
<ProjectExtensions>
339339
<VisualStudio>
340-
<UserProperties TriggeredFromHotReload="False" XamarinHotReloadUnhandledDeviceExceptionIDWalletAndroidHideInfoBar="True" />
340+
<UserProperties XamarinHotReloadUnhandledDeviceExceptionIDWalletAndroidHideInfoBar="True" TriggeredFromHotReload="False" />
341341
</VisualStudio>
342342
</ProjectExtensions>
343343
</Project>

‎src/IDWallet.Android/Properties/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="10106" android:versionName="1.1" package="com.digitalenabling.idw" android:installLocation="preferExternal">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="10203" android:versionName="1.2" package="com.digitalenabling.idw" android:installLocation="preferExternal">
33
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="29" />
44
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
55
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

‎src/IDWallet.iOS/AppDelegate.cs

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using AusweisApp2Adapters;
22
using Autofac;
3-
using CoreFoundation;
43
using CoreNFC;
54
using IDWallet.Interfaces;
65
using IDWallet.Models.AusweisSDK;
@@ -20,7 +19,7 @@ namespace IDWallet.iOS
2019
[Register("AppDelegate")]
2120
public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate, IAusweisApp2Delegate
2221
{
23-
public static AusweisApp2Adapter AusweisApp2Adapter;
22+
public static AusweisApp2Adapter AusweisApp2Adapter = null;
2423

2524
private static AppDelegate appDelegate;
2625

@@ -130,11 +129,14 @@ void DidReceive(string p0)
130129

131130
public static void BindSdk()
132131
{
133-
if (NFCNdefReaderSession.ReadingAvailable)
132+
if (AusweisApp2Adapter == null)
134133
{
135-
NSError error;
136-
AusweisApp2Adapter = new AusweisApp2Adapter(appDelegate, out error);
137-
}
134+
if (NFCNdefReaderSession.ReadingAvailable)
135+
{
136+
NSError error;
137+
AusweisApp2Adapter = new AusweisApp2Adapter(appDelegate, out error);
138+
}
139+
}
138140
}
139141

140142
public override bool OpenUrl(UIApplication app, NSUrl url, NSDictionary options)

‎src/IDWallet.iOS/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundleDisplayName</key>
2222
<string>ID Wallet</string>
2323
<key>CFBundleVersion</key>
24-
<string>10106</string>
24+
<string>10203</string>
2525
<key>CFBundleName</key>
2626
<string>ID Wallet</string>
2727
<key>UIAppFonts</key>
@@ -77,7 +77,7 @@
7777
<key>CFBundleIdentifier</key>
7878
<string>com.digitalenabling.idw</string>
7979
<key>CFBundleShortVersionString</key>
80-
<string>1.1</string>
80+
<string>1.2</string>
8181
<key>XSAppIconAssets</key>
8282
<string>Assets.xcassets/AppIcons.appiconset</string>
8383
<key>UILaunchStoryboardName</key>

‎src/IDWallet/Agent/Models/CustomRequestPresentationMessage.cs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using Hyperledger.Aries.Decorators;
2+
using Hyperledger.Aries.Features.PresentProof;
3+
using Newtonsoft.Json;
4+
5+
namespace IDWallet.Agent.Models
6+
{
7+
public class CustomRequestPresentationMessage : RequestPresentationMessage
8+
{
9+
[JsonProperty("~service")]
10+
public CustomServiceDecorator Service { get; set; }
11+
}
12+
}

‎src/IDWallet/IDWallet.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@
8080
<None Remove="Resources\imagesources\Onboarding_Image.svg" />
8181
<None Remove="Resources\imagesources\PrivacyPolicy_Icon.svg" />
8282
<None Remove="Resources\imagesources\PushRenew_Icon.svg" />
83-
<None Remove="Resources\imagesources\ScanNotOpen_Icon.svg" />
83+
<None Remove="Resources\imagesources\RoundClick_Icon.svg" />
84+
<None Remove="Resources\imagesources\ScanNotOpen_Icon.svg" />
8485
<None Remove="Resources\imagesources\ScanOpen_Icon.svg" />
8586
<None Remove="Resources\imagesources\Search_Icon.svg" />
8687
<None Remove="Resources\imagesources\SettingNotOpen_Icon.png" />
@@ -166,7 +167,8 @@
166167
<EmbeddedResource Include="Resources\imagesources\OnboardingForward_Icon.svg" />
167168
<EmbeddedResource Include="Resources\imagesources\Onboarding_Image.svg" />
168169
<EmbeddedResource Include="Resources\imagesources\PrivacyPolicy_Icon.svg" />
169-
<EmbeddedResource Include="Resources\imagesources\PushRenew_Icon.svg" />
170+
<EmbeddedResource Include="Resources\imagesources\PushRenew_Icon.svg" />
171+
<EmbeddedResource Include="Resources\imagesources\RoundClick_Icon.svg" />
170172
<EmbeddedResource Include="Resources\imagesources\ScanNotOpen_Icon.svg" />
171173
<EmbeddedResource Include="Resources\imagesources\ScanOpen_Icon.svg" />
172174
<EmbeddedResource Include="Resources\imagesources\Search_Icon.svg" />

‎src/IDWallet/Resources/Lang.Designer.cs

+51-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/IDWallet/Resources/Lang.de.resx

+26-5
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@
421421
<value>Benachrichtigungen</value>
422422
</data>
423423
<data name="IntroPage_Text" xml:space="preserve">
424-
<value>Verwernden Sie Ihr Handy, um Ihre persönlichen Nachweise zu verwalten.</value>
424+
<value>Verwenden Sie Ihr Handy, um Ihre persönlichen Nachweise zu verwalten.</value>
425425
</data>
426426
<data name="IntroPage_Title" xml:space="preserve">
427427
<value>Erstellen Sie Ihre eigene digitale ID</value>
@@ -1611,7 +1611,7 @@
16111611
<value>Ihnen fehlen die nötigen Nachweise um diese Anfrage zu beantworten.</value>
16121612
</data>
16131613
<data name="BaseIDPage_SuccessScreen_Button" xml:space="preserve">
1614-
<value>ID Anzeigen</value>
1614+
<value>ID anzeigen</value>
16151615
</data>
16161616
<data name="BaseIDPage_SuccessScreen_Text" xml:space="preserve">
16171617
<value>Ihre Basis-ID liegt jetzt in Ihrer Wallet bereit.</value>
@@ -1940,11 +1940,11 @@
19401940
<data name="PopUp_BaseID_Auth_Error_Button" xml:space="preserve">
19411941
<value>Okay</value>
19421942
</data>
1943-
<data name="PopUp_BaseID_Auth_Error_Text" xml:space="preserve">
1944-
<value>Beim Verbinden mit der Bundesdruckerei ist etwas schief gelaufen. Bitte starten Sie den Prozess erneut.</value>
1943+
<data name="PopUp_BaseID_Auth_Error_Card_Text" xml:space="preserve">
1944+
<value>Die Echtheit Ihres Ausweises konnte nicht überprüft werden. Bitte stellen Sie sicher, dass Sie einen echten Ausweis verwenden. Bitte beachten Sie, dass Testanwendungen die Verwendung eines Testausweises erfordern.</value>
19451945
</data>
19461946
<data name="PopUp_BaseID_Auth_Error_Title" xml:space="preserve">
1947-
<value>Verbindungsaufbau fehlgeschlagen</value>
1947+
<value>Basis-ID Fehler</value>
19481948
</data>
19491949
<data name="PopUp_HistoryDetails_Text1" xml:space="preserve">
19501950
<value>Am</value>
@@ -2045,4 +2045,25 @@
20452045
<data name="PopUp_Proof_Auth_Title" xml:space="preserve">
20462046
<value>Bitte geben Sie Ihre Wallet-PIN ein.</value>
20472047
</data>
2048+
<data name="LiabilityPage_Text" xml:space="preserve">
2049+
<value>Dem Benutzer ist bewusst, dass es bei der Nutzung der App zu technischen Störungen und anderen Komplikationen kommen kann. Etwaige Haftungsansprüche richten sich nach den §§ 516 ff. BGB. Die Haftung des Betreibers ist auf Vorsatz und grobe Fahrlässigkeit beschränkt (§ 521 BGB). Darüber haftet der Betreiber für Rechtsmängel und Sachmängel nur bei arglistigem Verschweigen des Mangels (§ 523 Abs. 1, § 524 Abs. 1 BGB). Etwaige andere einschlägige Vorschriften bleiben unberührt.</value>
2050+
</data>
2051+
<data name="LiabilityPage_Title" xml:space="preserve">
2052+
<value>Haftung</value>
2053+
</data>
2054+
<data name="LiabilityPage_Jurisdiction" xml:space="preserve">
2055+
<value>Gerichtsstand: Arnstorf</value>
2056+
</data>
2057+
<data name="PopUp_BaseID_Auth_Error_Text" xml:space="preserve">
2058+
<value>Bei der Ausstellung ihrer Basis-ID ist etwas schief gelaufen. Bitte starten Sie den Prozess erneut.</value>
2059+
</data>
2060+
<data name="BaseIDPage_Info_Label_1" xml:space="preserve">
2061+
<value>Funktioniert für Sie derzeit nur mit Testausweisen (weitere Infos </value>
2062+
</data>
2063+
<data name="BaseIDPage_Info_Label_2" xml:space="preserve">
2064+
<value>hier</value>
2065+
</data>
2066+
<data name="BaseIDPage_Info_Label_3" xml:space="preserve">
2067+
<value>). Später im Jahr auch für Ihren Personalausweis verfügbar.</value>
2068+
</data>
20482069
</root>

‎src/IDWallet/Resources/Lang.resx

+27-6
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@
421421
<value>Messages</value>
422422
</data>
423423
<data name="IntroPage_Text" xml:space="preserve">
424-
<value>Use your mobile phone to scan your personal documents and access them on your mobile phone</value>
424+
<value>Use your mobile phone to manage your personal documents.</value>
425425
</data>
426426
<data name="IntroPage_Title" xml:space="preserve">
427427
<value>Create your own digital ID</value>
@@ -1800,7 +1800,7 @@
18001800
<value>left to enter the correct PIN.</value>
18011801
</data>
18021802
<data name="PopUp_BaseID_Wrong_PIN_Pre_Text" xml:space="preserve">
1803-
<value>You have entered the wrong six digit PIN. You have</value>
1803+
<value>You have entered the wrong six digit PIN. You have </value>
18041804
</data>
18051805
<data name="PopUp_BaseID_Wrong_PIN_Title" xml:space="preserve">
18061806
<value>Wrong PIN</value>
@@ -1949,11 +1949,11 @@
19491949
<data name="PopUp_BaseID_Auth_Error_Button" xml:space="preserve">
19501950
<value>Okay</value>
19511951
</data>
1952-
<data name="PopUp_BaseID_Auth_Error_Text" xml:space="preserve">
1953-
<value>Something went wrong when connecting to the Bundesdruckerei. Please restart the process.</value>
1952+
<data name="PopUp_BaseID_Auth_Error_Card_Text" xml:space="preserve">
1953+
<value>The authenticity of your ID card could not be verified. Please make sure that you are using a genuine ID card. Please note that test applications require the use of a test ID card.</value>
19541954
</data>
19551955
<data name="PopUp_BaseID_Auth_Error_Title" xml:space="preserve">
1956-
<value>Connection establishment failed</value>
1956+
<value>Basis-ID error</value>
19571957
</data>
19581958
<data name="PopUp_HistoryDetails_Text1" xml:space="preserve">
19591959
<value>On</value>
@@ -2028,7 +2028,7 @@
20282028
<value>You have entered an incorrect Transport-PIN twice.</value>
20292029
</data>
20302030
<data name="PopUp_BaseID_Wrong_PIN_Pre_Text_2" xml:space="preserve">
2031-
<value>You have entered the wrong Transport-PIN. You have</value>
2031+
<value>You have entered the wrong Transport-PIN. You have </value>
20322032
</data>
20332033
<data name="PopUp_Vitual_Device_Title" xml:space="preserve">
20342034
<value>Warning</value>
@@ -2072,4 +2072,25 @@
20722072
<data name="PopUp_BaseID_ReadyToScan_Cancel_Button" xml:space="preserve">
20732073
<value>Cancel</value>
20742074
</data>
2075+
<data name="LiabilityPage_Title" xml:space="preserve">
2076+
<value>Liability</value>
2077+
</data>
2078+
<data name="LiabilityPage_Text" xml:space="preserve">
2079+
<value>The user is aware that technical malfunctions and other complications may occur when using the app. Any liability claims are governed by §§ 516 ff. BGB. The liability of the operator is limited to intent and gross negligence (§ 521 BGB). In addition, the operator shall only be liable for defects of law and defects of quality in the event of fraudulent concealment of the defects (§ 523 para. 1, § 524 para. 1 BGB). Any other relevant provisions shall remain unaffected.</value>
2080+
</data>
2081+
<data name="LiabilityPage_Jurisdiction" xml:space="preserve">
2082+
<value>Place of jurisdiction: Arnstorf</value>
2083+
</data>
2084+
<data name="PopUp_BaseID_Auth_Error_Text" xml:space="preserve">
2085+
<value>Something went wrong while issuing your Basis-ID. Please restart the process.</value>
2086+
</data>
2087+
<data name="BaseIDPage_Info_Label_1" xml:space="preserve">
2088+
<value>Currently only works for you with test ID cards (more info </value>
2089+
</data>
2090+
<data name="BaseIDPage_Info_Label_2" xml:space="preserve">
2091+
<value>here</value>
2092+
</data>
2093+
<data name="BaseIDPage_Info_Label_3" xml:space="preserve">
2094+
<value>). Later in the year also available for your ID card.</value>
2095+
</data>
20752096
</root>

‎src/IDWallet/Resources/imagesources/RoundClick_Icon.svg

+7
Loading

0 commit comments

Comments
 (0)