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

Commit

Permalink
Merge pull request #1 from My-DIGI-ID/release/1.2
Browse files Browse the repository at this point in the history 
c997c6f4
  • Loading branch information
@sweidenbach
sweidenbach authored May 14, 2021
2 parents b4d8a45 + 8ffab56 commit cad2b6c
Show file tree
Hide file tree
Showing 18 changed files with 361 additions and 86 deletions.
2 changes: 1 addition & 1 deletion src/IDWallet.Android/IDWallet.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties TriggeredFromHotReload="False" XamarinHotReloadUnhandledDeviceExceptionIDWalletAndroidHideInfoBar="True" />
<UserProperties XamarinHotReloadUnhandledDeviceExceptionIDWalletAndroidHideInfoBar="True" TriggeredFromHotReload="False" />
</VisualStudio>
</ProjectExtensions>
</Project>
2 changes: 1 addition & 1 deletion src/IDWallet.Android/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="10106" android:versionName="1.1" package="com.digitalenabling.idw" android:installLocation="preferExternal">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="10203" android:versionName="1.2" package="com.digitalenabling.idw" android:installLocation="preferExternal">
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
Expand Down
14 changes: 8 additions & 6 deletions src/IDWallet.iOS/AppDelegate.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using AusweisApp2Adapters;
using Autofac;
using CoreFoundation;
using CoreNFC;
using IDWallet.Interfaces;
using IDWallet.Models.AusweisSDK;
Expand All @@ -20,7 +19,7 @@ namespace IDWallet.iOS
[Register("AppDelegate")]
public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate, IAusweisApp2Delegate
{
public static AusweisApp2Adapter AusweisApp2Adapter;
public static AusweisApp2Adapter AusweisApp2Adapter = null;

private static AppDelegate appDelegate;

Expand Down Expand Up @@ -130,11 +129,14 @@ void DidReceive(string p0)

public static void BindSdk()
{
if (NFCNdefReaderSession.ReadingAvailable)
if (AusweisApp2Adapter == null)
{
NSError error;
AusweisApp2Adapter = new AusweisApp2Adapter(appDelegate, out error);
}
if (NFCNdefReaderSession.ReadingAvailable)
{
NSError error;
AusweisApp2Adapter = new AusweisApp2Adapter(appDelegate, out error);
}
}
}

public override bool OpenUrl(UIApplication app, NSUrl url, NSDictionary options)
Expand Down
4 changes: 2 additions & 2 deletions src/IDWallet.iOS/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>CFBundleDisplayName</key>
<string>ID Wallet</string>
<key>CFBundleVersion</key>
<string>10106</string>
<string>10203</string>
<key>CFBundleName</key>
<string>ID Wallet</string>
<key>UIAppFonts</key>
Expand Down Expand Up @@ -77,7 +77,7 @@
<key>CFBundleIdentifier</key>
<string>com.digitalenabling.idw</string>
<key>CFBundleShortVersionString</key>
<string>1.1</string>
<string>1.2</string>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcons.appiconset</string>
<key>UILaunchStoryboardName</key>
Expand Down
12 changes: 12 additions & 0 deletions src/IDWallet/Agent/Models/CustomRequestPresentationMessage.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using Hyperledger.Aries.Decorators;
using Hyperledger.Aries.Features.PresentProof;
using Newtonsoft.Json;

namespace IDWallet.Agent.Models
{
public class CustomRequestPresentationMessage : RequestPresentationMessage
{
[JsonProperty("~service")]
public CustomServiceDecorator Service { get; set; }
}
}
6 changes: 4 additions & 2 deletions src/IDWallet/IDWallet.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
<None Remove="Resources\imagesources\Onboarding_Image.svg" />
<None Remove="Resources\imagesources\PrivacyPolicy_Icon.svg" />
<None Remove="Resources\imagesources\PushRenew_Icon.svg" />
<None Remove="Resources\imagesources\ScanNotOpen_Icon.svg" />
<None Remove="Resources\imagesources\RoundClick_Icon.svg" />
<None Remove="Resources\imagesources\ScanNotOpen_Icon.svg" />
<None Remove="Resources\imagesources\ScanOpen_Icon.svg" />
<None Remove="Resources\imagesources\Search_Icon.svg" />
<None Remove="Resources\imagesources\SettingNotOpen_Icon.png" />
Expand Down Expand Up @@ -166,7 +167,8 @@
<EmbeddedResource Include="Resources\imagesources\OnboardingForward_Icon.svg" />
<EmbeddedResource Include="Resources\imagesources\Onboarding_Image.svg" />
<EmbeddedResource Include="Resources\imagesources\PrivacyPolicy_Icon.svg" />
<EmbeddedResource Include="Resources\imagesources\PushRenew_Icon.svg" />
<EmbeddedResource Include="Resources\imagesources\PushRenew_Icon.svg" />
<EmbeddedResource Include="Resources\imagesources\RoundClick_Icon.svg" />
<EmbeddedResource Include="Resources\imagesources\ScanNotOpen_Icon.svg" />
<EmbeddedResource Include="Resources\imagesources\ScanOpen_Icon.svg" />
<EmbeddedResource Include="Resources\imagesources\Search_Icon.svg" />
Expand Down
66 changes: 51 additions & 15 deletions src/IDWallet/Resources/Lang.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 26 additions & 5 deletions src/IDWallet/Resources/Lang.de.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@
<value>Benachrichtigungen</value>
</data>
<data name="IntroPage_Text" xml:space="preserve">
<value>Verwernden Sie Ihr Handy, um Ihre persönlichen Nachweise zu verwalten.</value>
<value>Verwenden Sie Ihr Handy, um Ihre persönlichen Nachweise zu verwalten.</value>
</data>
<data name="IntroPage_Title" xml:space="preserve">
<value>Erstellen Sie Ihre eigene digitale ID</value>
Expand Down Expand Up @@ -1611,7 +1611,7 @@
<value>Ihnen fehlen die nötigen Nachweise um diese Anfrage zu beantworten.</value>
</data>
<data name="BaseIDPage_SuccessScreen_Button" xml:space="preserve">
<value>ID Anzeigen</value>
<value>ID anzeigen</value>
</data>
<data name="BaseIDPage_SuccessScreen_Text" xml:space="preserve">
<value>Ihre Basis-ID liegt jetzt in Ihrer Wallet bereit.</value>
Expand Down Expand Up @@ -1940,11 +1940,11 @@
<data name="PopUp_BaseID_Auth_Error_Button" xml:space="preserve">
<value>Okay</value>
</data>
<data name="PopUp_BaseID_Auth_Error_Text" xml:space="preserve">
<value>Beim Verbinden mit der Bundesdruckerei ist etwas schief gelaufen. Bitte starten Sie den Prozess erneut.</value>
<data name="PopUp_BaseID_Auth_Error_Card_Text" xml:space="preserve">
<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>
</data>
<data name="PopUp_BaseID_Auth_Error_Title" xml:space="preserve">
<value>Verbindungsaufbau fehlgeschlagen</value>
<value>Basis-ID Fehler</value>
</data>
<data name="PopUp_HistoryDetails_Text1" xml:space="preserve">
<value>Am</value>
Expand Down Expand Up @@ -2045,4 +2045,25 @@
<data name="PopUp_Proof_Auth_Title" xml:space="preserve">
<value>Bitte geben Sie Ihre Wallet-PIN ein.</value>
</data>
<data name="LiabilityPage_Text" xml:space="preserve">
<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>
</data>
<data name="LiabilityPage_Title" xml:space="preserve">
<value>Haftung</value>
</data>
<data name="LiabilityPage_Jurisdiction" xml:space="preserve">
<value>Gerichtsstand: Arnstorf</value>
</data>
<data name="PopUp_BaseID_Auth_Error_Text" xml:space="preserve">
<value>Bei der Ausstellung ihrer Basis-ID ist etwas schief gelaufen. Bitte starten Sie den Prozess erneut.</value>
</data>
<data name="BaseIDPage_Info_Label_1" xml:space="preserve">
<value>Funktioniert für Sie derzeit nur mit Testausweisen (weitere Infos </value>
</data>
<data name="BaseIDPage_Info_Label_2" xml:space="preserve">
<value>hier</value>
</data>
<data name="BaseIDPage_Info_Label_3" xml:space="preserve">
<value>). Später im Jahr auch für Ihren Personalausweis verfügbar.</value>
</data>
</root>
33 changes: 27 additions & 6 deletions src/IDWallet/Resources/Lang.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@
<value>Messages</value>
</data>
<data name="IntroPage_Text" xml:space="preserve">
<value>Use your mobile phone to scan your personal documents and access them on your mobile phone</value>
<value>Use your mobile phone to manage your personal documents.</value>
</data>
<data name="IntroPage_Title" xml:space="preserve">
<value>Create your own digital ID</value>
Expand Down Expand Up @@ -1800,7 +1800,7 @@
<value>left to enter the correct PIN.</value>
</data>
<data name="PopUp_BaseID_Wrong_PIN_Pre_Text" xml:space="preserve">
<value>You have entered the wrong six digit PIN. You have</value>
<value>You have entered the wrong six digit PIN. You have </value>
</data>
<data name="PopUp_BaseID_Wrong_PIN_Title" xml:space="preserve">
<value>Wrong PIN</value>
Expand Down Expand Up @@ -1949,11 +1949,11 @@
<data name="PopUp_BaseID_Auth_Error_Button" xml:space="preserve">
<value>Okay</value>
</data>
<data name="PopUp_BaseID_Auth_Error_Text" xml:space="preserve">
<value>Something went wrong when connecting to the Bundesdruckerei. Please restart the process.</value>
<data name="PopUp_BaseID_Auth_Error_Card_Text" xml:space="preserve">
<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>
</data>
<data name="PopUp_BaseID_Auth_Error_Title" xml:space="preserve">
<value>Connection establishment failed</value>
<value>Basis-ID error</value>
</data>
<data name="PopUp_HistoryDetails_Text1" xml:space="preserve">
<value>On</value>
Expand Down Expand Up @@ -2028,7 +2028,7 @@
<value>You have entered an incorrect Transport-PIN twice.</value>
</data>
<data name="PopUp_BaseID_Wrong_PIN_Pre_Text_2" xml:space="preserve">
<value>You have entered the wrong Transport-PIN. You have</value>
<value>You have entered the wrong Transport-PIN. You have </value>
</data>
<data name="PopUp_Vitual_Device_Title" xml:space="preserve">
<value>Warning</value>
Expand Down Expand Up @@ -2072,4 +2072,25 @@
<data name="PopUp_BaseID_ReadyToScan_Cancel_Button" xml:space="preserve">
<value>Cancel</value>
</data>
<data name="LiabilityPage_Title" xml:space="preserve">
<value>Liability</value>
</data>
<data name="LiabilityPage_Text" xml:space="preserve">
<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>
</data>
<data name="LiabilityPage_Jurisdiction" xml:space="preserve">
<value>Place of jurisdiction: Arnstorf</value>
</data>
<data name="PopUp_BaseID_Auth_Error_Text" xml:space="preserve">
<value>Something went wrong while issuing your Basis-ID. Please restart the process.</value>
</data>
<data name="BaseIDPage_Info_Label_1" xml:space="preserve">
<value>Currently only works for you with test ID cards (more info </value>
</data>
<data name="BaseIDPage_Info_Label_2" xml:space="preserve">
<value>here</value>
</data>
<data name="BaseIDPage_Info_Label_3" xml:space="preserve">
<value>). Later in the year also available for your ID card.</value>
</data>
</root>
7 changes: 7 additions & 0 deletions src/IDWallet/Resources/imagesources/RoundClick_Icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit cad2b6c

Please sign in to comment.