From d5f630464a9d914ba2445bbbc1cce67cd6fb781c Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Mon, 29 Jul 2019 18:16:42 +0200
Subject: [PATCH] Correctif encodage pdf release

---
 .../AideDeJeu.Android.csproj                  |  4 ++-
 .../Properties/AndroidManifest.xml            |  2 +-
 AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj  |  4 +--
 AideDeJeu/AideDeJeu/Pdf/PdfService.cs         | 30 ++++++++++++++-----
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
index 846110f3..90863622 100644
--- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
+++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
@@ -15,7 +15,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <ReleaseVersion>1.32</ReleaseVersion>
+    <ReleaseVersion>1.38</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -32,6 +32,7 @@
     <EnableLLVM>false</EnableLLVM>
     <BundleAssemblies>false</BundleAssemblies>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+    <MandroidI18n>West</MandroidI18n>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
@@ -55,6 +56,7 @@
     <AndroidCreatePackagePerAbi>true</AndroidCreatePackagePerAbi>
     <AndroidDexTool>d8</AndroidDexTool>
     <AndroidLinkTool>r8</AndroidLinkTool>
+    <MandroidI18n>West</MandroidI18n>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
diff --git a/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml b/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
index 13cabeca..2c0ccf4d 100644
--- a/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
+++ b/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nioux.aidedejeu" android:installLocation="preferExternal" android:versionCode="37" android:versionName="1.37">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nioux.aidedejeu" android:installLocation="preferExternal" android:versionCode="38" android:versionName="1.38">
 	<uses-sdk android:targetSdkVersion="28" />
 	<application android:label="Beta Haches &amp; Dés">
 		<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.nioux.aidedejeu.fileprovider" android:exported="false" android:grantUriPermissions="true">
diff --git a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
index 90383761..ca9d8cb0 100644
--- a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
+++ b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
@@ -85,8 +85,8 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-    <Optimize>true</Optimize>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
diff --git a/AideDeJeu/AideDeJeu/Pdf/PdfService.cs b/AideDeJeu/AideDeJeu/Pdf/PdfService.cs
index ea0d5503..e2cbb995 100644
--- a/AideDeJeu/AideDeJeu/Pdf/PdfService.cs
+++ b/AideDeJeu/AideDeJeu/Pdf/PdfService.cs
@@ -95,15 +95,32 @@ namespace AideDeJeu.Pdf
             //PdfStamper stamper = null;
             //stamper = new PdfStamper(reader, stream);
 
-            foreach (var md in mds)
+            try
             {
-                var expandedMd = await ExpandMarkdownAsync(md);
-                var parsed = Markdig.Markdown.Parse(expandedMd, pipeline);
-                Render(parsed.AsEnumerable(), document, writer);
+                foreach (var md in mds)
+                {
+                    var expandedMd = await ExpandMarkdownAsync(md);
+                    var parsed = Markdig.Markdown.Parse(expandedMd, pipeline);
+                    Render(parsed.AsEnumerable(), document, writer);
+                }
+            }
+            catch(Exception ex)
+            {
+                Debug.WriteLine(ex);
+            }
+            finally
+            {
+                try
+                { 
+                    document?.Close();
+                }
+                catch
+                {
+
+                }
+                writer.Close();
             }
 
-            document.Close();
-            writer.Close();
             //stamper.Close();
             //reader.Close();
         }
@@ -243,7 +260,6 @@ namespace AideDeJeu.Pdf
             //}
             var phrases = Render(blocks);
 
-
             ColumnText ct = new ColumnText(writer.DirectContent);
 
             int column = 0;