request sms tan in waiting screen

7 files changed, 249 insertions, 141 deletions

diff --git a/installer/windows/PDF-Over.aip b/installer/windows/PDF-Over.aip
index d7bbc4ef..e65560d5 100644
--- a/installer/windows/PDF-Over.aip
+++ b/installer/windows/PDF-Over.aip
@@ -9,17 +9,16 @@
   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">

     <ROW Property="AI_DESKTOP_SH" Value="1" Type="4" MsiKey="AI_DESKTOP_SH"/>

-    <ROW Property="AI_FINDEXE_TITLE" Value="Select the installation package for [|ProductName]" ValueLocId="AI.Property.FindExeTitle"/>

     <ROW Property="AI_SHORTCUTSREG" Value="0|0|0|0|"/>

     <ROW Property="ALLUSERS" Value="1" MultiBuildValue="DefaultBuild:2"/>

     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>

     <ROW Property="ARPPRODUCTICON" Value="icon.exe" Type="8"/>

     <ROW Property="Manufacturer" Value="A-SIT (Secure Information Technology Center - Austria)"/>

-    <ROW Property="ProductCode" Value="1033:{9064B353-365A-4F06-8C0A-D59AE43B1B9F} 1031:{23E0ECD9-B3D9-4A43-A6B6-D4F862240DAE} " Type="16"/>

+    <ROW Property="ProductCode" Value="1033:{C1C9AEE6-42AC-4C23-83C5-817922D9F886} 1031:{23CEE8D6-F363-4D03-8C14-037EF1058A4C} " Type="16"/>

     <ROW Property="ProductLanguage" Value="1033"/>

     <ROW Property="ProductName" Value="PDF-Over"/>

-    <ROW Property="ProductVersion" Value="4.2.1" Type="32"/>

-    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>

+    <ROW Property="ProductVersion" Value="4.2.2" Type="32"/>

+    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>

     <ROW Property="UpgradeCode" Value="{4F146EA4-79F9-4873-9A4C-A66A525AF62F}"/>

     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

     <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

@@ -38,11 +37,10 @@
   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">

     <ROW Component="AIShRegAnswer" ComponentId="{19C5B0EB-63C2-4BE4-B2C8-B5EFC6393279}" Directory_="APPDIR" Attributes="4" KeyPath="AIShRegAnswer"/>

-    <ROW Component="AI_ExePath" ComponentId="{DEB1C80C-7DC5-4627-B793-3F0F4B794D56}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>

+    <ROW Component="FastInfoset1.2.13.jar" ComponentId="{4D24E378-7432-48F5-8D3A-98A6FA15C102}" Directory_="lib_1_Dir" Attributes="0" KeyPath="FastInfoset1.2.13.jar" Type="0"/>

     <ROW Component="ProductInformation" ComponentId="{8126D538-2928-475F-8DBB-9BFB1EB29D9F}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>

     <ROW Component="ReadMe.txt" ComponentId="{83873372-D521-4481-A6CE-17BFE2457701}" Directory_="APPDIR" Attributes="0" KeyPath="ReadMe.txt_1" Type="0"/>

     <ROW Component="SHORTCUTDIR" ComponentId="{E162254F-9CB5-4FE2-8CC5-7EE2580EB565}" Directory_="SHORTCUTDIR" Attributes="0"/>

-    <ROW Component="core3.2.0.jar" ComponentId="{ADEAC6CA-3C71-415F-B744-1FAAD314CE7F}" Directory_="lib_1_Dir" Attributes="0" KeyPath="core3.2.0.jar" Type="0"/>

     <ROW Component="icon.icns_1" ComponentId="{1E21D20F-B60F-41F0-A463-485E4E236660}" Directory_="icons_1_Dir" Attributes="0" KeyPath="icon.icns_1" Type="0"/>

     <ROW Component="lib" ComponentId="{AC2FDF64-8069-494B-8B1F-B9AA178C8ED9}" Directory_="lib_1_Dir" Attributes="0"/>

     <ROW Component="libswt" ComponentId="{BE13A95A-A8A2-48E1-8859-F71AE0D7B5C2}" Directory_="libswt_1_Dir" Attributes="0"/>

@@ -52,31 +50,31 @@
     <ROW Component="swtwindows64.jar" ComponentId="{D76D0B21-0859-45C2-A7BC-ED241A505915}" Directory_="libswt_1_Dir" Attributes="0" KeyPath="swtwindows64.jar" Type="0"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">

-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AIShRegAnswer AI_ExePath ProductInformation ReadMe.txt SHORTCUTDIR core3.2.0.jar icon.icns_1 lib libswt pdfover_linux.sh_1 pdfover_win.bat scripts swtwindows64.jar"/>

+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AIShRegAnswer FastInfoset1.2.13.jar ProductInformation ReadMe.txt SHORTCUTDIR icon.icns_1 lib libswt pdfover_linux.sh_1 pdfover_win.bat scripts swtwindows64.jar"/>

     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">

-    <ROW File="FastInfoset1.2.13.jar" Component_="core3.2.0.jar" FileName="FastIn~1.jar|FastInfoset-1.2.13.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\FastInfoset-1.2.13.jar" SelfReg="false" NextFile="fontbox1.8.11.jar"/>

+    <ROW File="FastInfoset1.2.13.jar" Component_="FastInfoset1.2.13.jar" FileName="FastIn~1.jar|FastInfoset-1.2.13.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\FastInfoset-1.2.13.jar" SelfReg="false" NextFile="fontbox1.8.11.jar"/>

     <ROW File="ReadMe.txt_1" Component_="ReadMe.txt" FileName="ReadMe.txt" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\ReadMe.txt" SelfReg="false" NextFile="pdfover_wincli.bat_1"/>

-    <ROW File="activation1.1.1.jar" Component_="core3.2.0.jar" FileName="activa~1.jar|activation-1.1.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\activation-1.1.1.jar" SelfReg="false" NextFile="bcprovjdk15on1.59.jar"/>

-    <ROW File="bcprovjdk15on1.59.jar" Component_="core3.2.0.jar" FileName="bcprov~1.jar|bcprov-jdk15on-1.59.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\bcprov-jdk15on-1.59.jar" SelfReg="false" NextFile="commonscodec1.6.jar"/>

-    <ROW File="commonscodec1.6.jar" Component_="core3.2.0.jar" FileName="common~1.jar|commons-codec-1.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-codec-1.6.jar" SelfReg="false" NextFile="commonscollections3.2.2.jar"/>

-    <ROW File="commonscollections3.2.2.jar" Component_="core3.2.0.jar" FileName="common~2.jar|commons-collections-3.2.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-collections-3.2.2.jar" SelfReg="false" NextFile="commonscollections44.1.jar"/>

-    <ROW File="commonscollections44.1.jar" Component_="core3.2.0.jar" FileName="common~3.jar|commons-collections4-4.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-collections4-4.1.jar" SelfReg="false" NextFile="commonshttpclient3.1.jar"/>

-    <ROW File="commonshttpclient3.1.jar" Component_="core3.2.0.jar" FileName="common~4.jar|commons-httpclient-3.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-httpclient-3.1.jar" SelfReg="false" NextFile="commonsio2.4.jar"/>

-    <ROW File="commonsio2.4.jar" Component_="core3.2.0.jar" FileName="common~5.jar|commons-io-2.4.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-io-2.4.jar" SelfReg="false" NextFile="commonslang33.3.2.jar"/>

-    <ROW File="commonslang33.3.2.jar" Component_="core3.2.0.jar" FileName="common~6.jar|commons-lang3-3.3.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-lang3-3.3.2.jar" SelfReg="false" NextFile="commonslogging1.0.4.jar"/>

-    <ROW File="commonslogging1.0.4.jar" Component_="core3.2.0.jar" FileName="common~7.jar|commons-logging-1.0.4.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-logging-1.0.4.jar" SelfReg="false" NextFile="swtwindows64.jar"/>

-    <ROW File="core3.2.0.jar" Component_="core3.2.0.jar" FileName="core-3~1.jar|core-3.2.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\core-3.2.0.jar" SelfReg="false" NextFile="FastInfoset1.2.13.jar"/>

-    <ROW File="fontbox1.8.11.jar" Component_="core3.2.0.jar" FileName="fontbo~1.jar|fontbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\fontbox-1.8.11.jar" SelfReg="false" NextFile="gson2.8.2.jar"/>

-    <ROW File="gson2.8.2.jar" Component_="core3.2.0.jar" FileName="gson-2~1.jar|gson-2.8.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\gson-2.8.2.jar" SelfReg="false" NextFile="httpclient4.5.3.jar"/>

-    <ROW File="httpclient4.5.3.jar" Component_="core3.2.0.jar" FileName="httpcl~1.jar|httpclient-4.5.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpclient-4.5.3.jar" SelfReg="false" NextFile="httpcore4.4.6.jar"/>

-    <ROW File="httpcore4.4.6.jar" Component_="core3.2.0.jar" FileName="httpco~1.jar|httpcore-4.4.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpcore-4.4.6.jar" SelfReg="false" NextFile="httpmime4.3.5.jar"/>

-    <ROW File="httpmime4.3.5.jar" Component_="core3.2.0.jar" FileName="httpmi~1.jar|httpmime-4.3.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpmime-4.3.5.jar" SelfReg="false" NextFile="iaik_cms2.15.jar"/>

-    <ROW File="iaik_cms2.15.jar" Component_="core3.2.0.jar" FileName="iaik_c~1.jar|iaik_cms-2.15.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_cms-2.15.jar" SelfReg="false" NextFile="iaik_eccelerate_cms3.01.jar"/>

-    <ROW File="iaik_eccelerate3.01.jar" Component_="core3.2.0.jar" FileName="iaik_e~2.jar|iaik_eccelerate-3.01.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_eccelerate-3.01.jar" SelfReg="false" NextFile="iaik_jce_full_signed5.5.jar"/>

-    <ROW File="iaik_eccelerate_cms3.01.jar" Component_="core3.2.0.jar" FileName="iaik_e~1.jar|iaik_eccelerate_cms-3.01.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_eccelerate_cms-3.01.jar" SelfReg="false" NextFile="iaik_eccelerate3.01.jar"/>

-    <ROW File="iaik_jce_full_signed5.5.jar" Component_="core3.2.0.jar" FileName="iaik_j~1.jar|iaik_jce_full_signed-5.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_jce_full_signed-5.5.jar" SelfReg="false" NextFile="istackcommonsruntime3.0.5.jar"/>

+    <ROW File="activation1.1.1.jar" Component_="FastInfoset1.2.13.jar" FileName="activa~1.jar|activation-1.1.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\activation-1.1.1.jar" SelfReg="false" NextFile="bcprovjdk15on1.59.jar"/>

+    <ROW File="bcprovjdk15on1.59.jar" Component_="FastInfoset1.2.13.jar" FileName="bcprov~1.jar|bcprov-jdk15on-1.59.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\bcprov-jdk15on-1.59.jar" SelfReg="false" NextFile="commonscodec1.6.jar"/>

+    <ROW File="commonscodec1.6.jar" Component_="FastInfoset1.2.13.jar" FileName="common~1.jar|commons-codec-1.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-codec-1.6.jar" SelfReg="false" NextFile="commonscollections3.2.2.jar"/>

+    <ROW File="commonscollections3.2.2.jar" Component_="FastInfoset1.2.13.jar" FileName="common~2.jar|commons-collections-3.2.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-collections-3.2.2.jar" SelfReg="false" NextFile="commonscollections44.1.jar"/>

+    <ROW File="commonscollections44.1.jar" Component_="FastInfoset1.2.13.jar" FileName="common~3.jar|commons-collections4-4.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-collections4-4.1.jar" SelfReg="false" NextFile="commonshttpclient3.1.jar"/>

+    <ROW File="commonshttpclient3.1.jar" Component_="FastInfoset1.2.13.jar" FileName="common~4.jar|commons-httpclient-3.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-httpclient-3.1.jar" SelfReg="false" NextFile="commonsio2.4.jar"/>

+    <ROW File="commonsio2.4.jar" Component_="FastInfoset1.2.13.jar" FileName="common~5.jar|commons-io-2.4.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-io-2.4.jar" SelfReg="false" NextFile="commonslang33.3.2.jar"/>

+    <ROW File="commonslang33.3.2.jar" Component_="FastInfoset1.2.13.jar" FileName="common~6.jar|commons-lang3-3.3.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-lang3-3.3.2.jar" SelfReg="false" NextFile="commonslogging1.0.4.jar"/>

+    <ROW File="commonslogging1.0.4.jar" Component_="FastInfoset1.2.13.jar" FileName="common~7.jar|commons-logging-1.0.4.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-logging-1.0.4.jar" SelfReg="false" NextFile="core3.2.0.jar"/>

+    <ROW File="core3.2.0.jar" Component_="FastInfoset1.2.13.jar" FileName="core-3~1.jar|core-3.2.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\core-3.2.0.jar" SelfReg="false"/>

+    <ROW File="fontbox1.8.11.jar" Component_="FastInfoset1.2.13.jar" FileName="fontbo~1.jar|fontbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\fontbox-1.8.11.jar" SelfReg="false" NextFile="gson2.8.2.jar"/>

+    <ROW File="gson2.8.2.jar" Component_="FastInfoset1.2.13.jar" FileName="gson-2~1.jar|gson-2.8.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\gson-2.8.2.jar" SelfReg="false" NextFile="httpclient4.5.3.jar"/>

+    <ROW File="httpclient4.5.3.jar" Component_="FastInfoset1.2.13.jar" FileName="httpcl~1.jar|httpclient-4.5.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpclient-4.5.3.jar" SelfReg="false" NextFile="httpcore4.4.6.jar"/>

+    <ROW File="httpcore4.4.6.jar" Component_="FastInfoset1.2.13.jar" FileName="httpco~1.jar|httpcore-4.4.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpcore-4.4.6.jar" SelfReg="false" NextFile="httpmime4.3.5.jar"/>

+    <ROW File="httpmime4.3.5.jar" Component_="FastInfoset1.2.13.jar" FileName="httpmi~1.jar|httpmime-4.3.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpmime-4.3.5.jar" SelfReg="false" NextFile="iaik_cms2.15.jar"/>

+    <ROW File="iaik_cms2.15.jar" Component_="FastInfoset1.2.13.jar" FileName="iaik_c~1.jar|iaik_cms-2.15.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_cms-2.15.jar" SelfReg="false" NextFile="iaik_eccelerate_cms3.01.jar"/>

+    <ROW File="iaik_eccelerate3.01.jar" Component_="FastInfoset1.2.13.jar" FileName="iaik_e~2.jar|iaik_eccelerate-3.01.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_eccelerate-3.01.jar" SelfReg="false" NextFile="iaik_jce_full_signed5.5.jar"/>

+    <ROW File="iaik_eccelerate_cms3.01.jar" Component_="FastInfoset1.2.13.jar" FileName="iaik_e~1.jar|iaik_eccelerate_cms-3.01.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_eccelerate_cms-3.01.jar" SelfReg="false" NextFile="iaik_eccelerate3.01.jar"/>

+    <ROW File="iaik_jce_full_signed5.5.jar" Component_="FastInfoset1.2.13.jar" FileName="iaik_j~1.jar|iaik_jce_full_signed-5.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_jce_full_signed-5.5.jar" SelfReg="false" NextFile="istackcommonsruntime3.0.5.jar"/>

     <ROW File="icon.icns_1" Component_="icon.icns_1" FileName="icon~1.icn|icon.icns" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.icns" SelfReg="false" NextFile="icon.ico_1"/>

     <ROW File="icon.ico_1" Component_="icon.icns_1" FileName="icon.ico" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.ico" SelfReg="false" NextFile="icon.png_1"/>

     <ROW File="icon.png_1" Component_="icon.icns_1" FileName="icon.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.png" SelfReg="false" NextFile="icon144x144.png_1"/>

@@ -86,42 +84,43 @@
     <ROW File="icon32x32.png_1" Component_="icon.icns_1" FileName="icon32~1.png|icon32x32.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon32x32.png" SelfReg="false" NextFile="icon48x48.png_1"/>

     <ROW File="icon48x48.png_1" Component_="icon.icns_1" FileName="icon48~1.png|icon48x48.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon48x48.png" SelfReg="false" NextFile="icon96x96.png_1"/>

     <ROW File="icon96x96.png_1" Component_="icon.icns_1" FileName="icon96~1.png|icon96x96.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon96x96.png" SelfReg="false" NextFile="ReadMe.txt_1"/>

-    <ROW File="istackcommonsruntime3.0.5.jar" Component_="core3.2.0.jar" FileName="istack~1.jar|istack-commons-runtime-3.0.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\istack-commons-runtime-3.0.5.jar" SelfReg="false" NextFile="javase3.2.0.jar"/>

-    <ROW File="javase3.2.0.jar" Component_="core3.2.0.jar" FileName="javase~1.jar|javase-3.2.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\javase-3.2.0.jar" SelfReg="false" NextFile="javassist3.11.0.GA.jar"/>

-    <ROW File="javassist3.11.0.GA.jar" Component_="core3.2.0.jar" FileName="javass~1.jar|javassist-3.11.0.GA.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\javassist-3.11.0.GA.jar" SelfReg="false" NextFile="jaxbapi2.3.0.jar"/>

-    <ROW File="jaxbapi2.3.0.jar" Component_="core3.2.0.jar" FileName="jaxb-a~1.jar|jaxb-api-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-api-2.3.0.jar" SelfReg="false" NextFile="jaxbcore2.3.0.jar"/>

-    <ROW File="jaxbcore2.3.0.jar" Component_="core3.2.0.jar" FileName="jaxb-c~1.jar|jaxb-core-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-core-2.3.0.jar" SelfReg="false" NextFile="jaxbruntime2.3.0.jar"/>

-    <ROW File="jaxbruntime2.3.0.jar" Component_="core3.2.0.jar" FileName="jaxb-r~1.jar|jaxb-runtime-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-runtime-2.3.0.jar" SelfReg="false" NextFile="jbig21.0.jar"/>

-    <ROW File="jbig21.0.jar" Component_="core3.2.0.jar" FileName="jbig2-~1.jar|jbig2-1.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jbig2-1.0.jar" SelfReg="false" NextFile="jcloverslf4j1.7.18.jar"/>

-    <ROW File="jcloverslf4j1.7.18.jar" Component_="core3.2.0.jar" FileName="jcl-ov~1.jar|jcl-over-slf4j-1.7.18.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jcl-over-slf4j-1.7.18.jar" SelfReg="false" NextFile="jempbox1.8.11.jar"/>

-    <ROW File="jempbox1.8.11.jar" Component_="core3.2.0.jar" FileName="jempbo~1.jar|jempbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jempbox-1.8.11.jar" SelfReg="false" NextFile="jose4j0.6.3.jar"/>

-    <ROW File="jose4j0.6.3.jar" Component_="core3.2.0.jar" FileName="jose4j~1.jar|jose4j-0.6.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jose4j-0.6.3.jar" SelfReg="false" NextFile="log4j1.2.17.jar"/>

-    <ROW File="log4j1.2.17.jar" Component_="core3.2.0.jar" FileName="log4j-~1.jar|log4j-1.2.17.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\log4j-1.2.17.jar" SelfReg="false" NextFile="metadataextractor2.9.1.jar"/>

-    <ROW File="metadataextractor2.9.1.jar" Component_="core3.2.0.jar" FileName="metada~1.jar|metadata-extractor-2.9.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\metadata-extractor-2.9.1.jar" SelfReg="false" NextFile="ognl3.0.8.jar"/>

-    <ROW File="ognl3.0.8.jar" Component_="core3.2.0.jar" FileName="ognl-3~1.jar|ognl-3.0.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\ognl-3.0.8.jar" SelfReg="false" NextFile="org.eclipse.swt.win32.win32.x864.8.jar"/>

-    <ROW File="org.eclipse.swt.win32.win32.x864.8.jar" Component_="core3.2.0.jar" FileName="orgecl~1.jar|org.eclipse.swt.win32.win32.x86-4.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\org.eclipse.swt.win32.win32.x86-4.8.jar" SelfReg="false" NextFile="pdfascommon4.1.5.jar"/>

-    <ROW File="pdfascommon4.1.5.jar" Component_="core3.2.0.jar" FileName="pdf-as~1.jar|pdf-as-common-4.1.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-common-4.1.5.jar" SelfReg="false" NextFile="pdfaslib4.1.5.jar"/>

-    <ROW File="pdfaslib4.1.5.jar" Component_="core3.2.0.jar" FileName="pdf-as~2.jar|pdf-as-lib-4.1.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-lib-4.1.5.jar" SelfReg="false" NextFile="pdfaspdfbox4.1.5.jar"/>

-    <ROW File="pdfaspdfbox4.1.5.jar" Component_="core3.2.0.jar" FileName="pdf-as~3.jar|pdf-as-pdfbox-4.1.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-pdfbox-4.1.5.jar" SelfReg="false" NextFile="pdfbox1.8.11.jar"/>

-    <ROW File="pdfbox1.8.11.jar" Component_="core3.2.0.jar" FileName="pdfbox~1.jar|pdfbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfbox-1.8.11.jar" SelfReg="false" NextFile="pdfovergui4.2.1.jar"/>

-    <ROW File="pdfover_win.bat_1" Component_="pdfover_win.bat" FileName="pdf-ov~2.bat|pdf-over_win.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_win.bat" SelfReg="false" NextFile="core3.2.0.jar"/>

+    <ROW File="istackcommonsruntime3.0.5.jar" Component_="FastInfoset1.2.13.jar" FileName="istack~1.jar|istack-commons-runtime-3.0.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\istack-commons-runtime-3.0.5.jar" SelfReg="false" NextFile="javase3.2.0.jar"/>

+    <ROW File="javase3.2.0.jar" Component_="FastInfoset1.2.13.jar" FileName="javase~1.jar|javase-3.2.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\javase-3.2.0.jar" SelfReg="false" NextFile="javassist3.11.0.GA.jar"/>

+    <ROW File="javassist3.11.0.GA.jar" Component_="FastInfoset1.2.13.jar" FileName="javass~1.jar|javassist-3.11.0.GA.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\javassist-3.11.0.GA.jar" SelfReg="false" NextFile="jaxbapi2.3.0.jar"/>

+    <ROW File="jaxbapi2.3.0.jar" Component_="FastInfoset1.2.13.jar" FileName="jaxb-a~1.jar|jaxb-api-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-api-2.3.0.jar" SelfReg="false" NextFile="jaxbcore2.3.0.jar"/>

+    <ROW File="jaxbcore2.3.0.jar" Component_="FastInfoset1.2.13.jar" FileName="jaxb-c~1.jar|jaxb-core-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-core-2.3.0.jar" SelfReg="false" NextFile="jaxbruntime2.3.0.jar"/>

+    <ROW File="jaxbruntime2.3.0.jar" Component_="FastInfoset1.2.13.jar" FileName="jaxb-r~1.jar|jaxb-runtime-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-runtime-2.3.0.jar" SelfReg="false" NextFile="jbig21.0.jar"/>

+    <ROW File="jbig21.0.jar" Component_="FastInfoset1.2.13.jar" FileName="jbig2-~1.jar|jbig2-1.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jbig2-1.0.jar" SelfReg="false" NextFile="jcloverslf4j1.7.18.jar"/>

+    <ROW File="jcloverslf4j1.7.18.jar" Component_="FastInfoset1.2.13.jar" FileName="jcl-ov~1.jar|jcl-over-slf4j-1.7.18.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jcl-over-slf4j-1.7.18.jar" SelfReg="false" NextFile="jempbox1.8.11.jar"/>

+    <ROW File="jempbox1.8.11.jar" Component_="FastInfoset1.2.13.jar" FileName="jempbo~1.jar|jempbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jempbox-1.8.11.jar" SelfReg="false" NextFile="jose4j0.6.3.jar"/>

+    <ROW File="jose4j0.6.3.jar" Component_="FastInfoset1.2.13.jar" FileName="jose4j~1.jar|jose4j-0.6.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jose4j-0.6.3.jar" SelfReg="false" NextFile="jsoup1.11.3.jar"/>

+    <ROW File="jsoup1.11.3.jar" Component_="FastInfoset1.2.13.jar" FileName="jsoup-~1.jar|jsoup-1.11.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jsoup-1.11.3.jar" SelfReg="false" NextFile="log4j1.2.17.jar"/>

+    <ROW File="log4j1.2.17.jar" Component_="FastInfoset1.2.13.jar" FileName="log4j-~1.jar|log4j-1.2.17.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\log4j-1.2.17.jar" SelfReg="false" NextFile="metadataextractor2.9.1.jar"/>

+    <ROW File="metadataextractor2.9.1.jar" Component_="FastInfoset1.2.13.jar" FileName="metada~1.jar|metadata-extractor-2.9.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\metadata-extractor-2.9.1.jar" SelfReg="false" NextFile="ognl3.0.8.jar"/>

+    <ROW File="ognl3.0.8.jar" Component_="FastInfoset1.2.13.jar" FileName="ognl-3~1.jar|ognl-3.0.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\ognl-3.0.8.jar" SelfReg="false" NextFile="org.eclipse.swt.win32.win32.x864.8.jar"/>

+    <ROW File="org.eclipse.swt.win32.win32.x864.8.jar" Component_="FastInfoset1.2.13.jar" FileName="orgecl~1.jar|org.eclipse.swt.win32.win32.x86-4.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\org.eclipse.swt.win32.win32.x86-4.8.jar" SelfReg="false" NextFile="pdfascommon4.1.5.jar"/>

+    <ROW File="pdfascommon4.1.5.jar" Component_="FastInfoset1.2.13.jar" FileName="pdf-as~1.jar|pdf-as-common-4.1.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-common-4.1.5.jar" SelfReg="false" NextFile="pdfaslib4.1.5.jar"/>

+    <ROW File="pdfaslib4.1.5.jar" Component_="FastInfoset1.2.13.jar" FileName="pdf-as~2.jar|pdf-as-lib-4.1.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-lib-4.1.5.jar" SelfReg="false" NextFile="pdfaspdfbox4.1.5.jar"/>

+    <ROW File="pdfaspdfbox4.1.5.jar" Component_="FastInfoset1.2.13.jar" FileName="pdf-as~3.jar|pdf-as-pdfbox-4.1.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-pdfbox-4.1.5.jar" SelfReg="false" NextFile="pdfbox1.8.11.jar"/>

+    <ROW File="pdfbox1.8.11.jar" Component_="FastInfoset1.2.13.jar" FileName="pdfbox~1.jar|pdfbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfbox-1.8.11.jar" SelfReg="false" NextFile="pdfovergui4.2.2.jar"/>

+    <ROW File="pdfover_win.bat_1" Component_="pdfover_win.bat" FileName="pdf-ov~2.bat|pdf-over_win.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_win.bat" SelfReg="false" NextFile="swtwindows64.jar"/>

     <ROW File="pdfover_wincli.bat_1" Component_="pdfover_linux.sh_1" FileName="pdf-ov~1.bat|pdf-over_win-cli.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_win-cli.bat" SelfReg="false" NextFile="pdfover_win.bat_1"/>

-    <ROW File="pdfovergui4.2.1.jar" Component_="core3.2.0.jar" FileName="pdf-ov~1.jar|pdf-over-gui-4.2.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-gui-4.2.1.jar" SelfReg="false" NextFile="pdfoverinstallhelper.jar"/>

-    <ROW File="pdfoverinstallhelper.jar" Component_="core3.2.0.jar" FileName="pdf-ov~2.jar|pdf-over-install-helper.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-install-helper.jar" SelfReg="false" NextFile="pdfoversignator4.2.1.jar"/>

-    <ROW File="pdfoversignator4.2.1.jar" Component_="core3.2.0.jar" FileName="pdf-ov~3.jar|pdf-over-signator-4.2.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-signator-4.2.1.jar" SelfReg="false" NextFile="pdfoversigpdfas44.2.1.jar"/>

-    <ROW File="pdfoversigpdfas44.2.1.jar" Component_="core3.2.0.jar" FileName="pdf-ov~4.jar|pdf-over-sigpdfas4-4.2.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-sigpdfas4-4.2.1.jar" SelfReg="false" NextFile="pdfview0.9.3CyBot.jar"/>

-    <ROW File="pdfview0.9.3CyBot.jar" Component_="core3.2.0.jar" FileName="pdfvie~1.jar|pdfview-0.9.3-CyBot.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfview-0.9.3-CyBot.jar" SelfReg="false" NextFile="sigspades4.1.5.jar"/>

-    <ROW File="sigspades4.1.5.jar" Component_="core3.2.0.jar" FileName="sigs-p~1.jar|sigs-pades-4.1.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\sigs-pades-4.1.5.jar" SelfReg="false" NextFile="slf4japi1.6.6.jar"/>

-    <ROW File="slf4japi1.6.6.jar" Component_="core3.2.0.jar" FileName="slf4j-~1.jar|slf4j-api-1.6.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\slf4j-api-1.6.6.jar" SelfReg="false" NextFile="slf4jlog4j121.6.6.jar"/>

-    <ROW File="slf4jlog4j121.6.6.jar" Component_="core3.2.0.jar" FileName="slf4j-~2.jar|slf4j-log4j12-1.6.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\slf4j-log4j12-1.6.6.jar" SelfReg="false" NextFile="staxex1.7.8.jar"/>

-    <ROW File="staxex1.7.8.jar" Component_="core3.2.0.jar" FileName="stax-e~1.jar|stax-ex-1.7.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\stax-ex-1.7.8.jar" SelfReg="false" NextFile="txw22.3.0.jar"/>

-    <ROW File="swtwindows32.jar" Component_="swtwindows64.jar" FileName="swt-wi~2.jar|swt-windows-32.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib-swt\swt-windows-32.jar" SelfReg="false"/>

+    <ROW File="pdfovergui4.2.2.jar" Component_="FastInfoset1.2.13.jar" FileName="pdf-ov~1.jar|pdf-over-gui-4.2.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-gui-4.2.2.jar" SelfReg="false" NextFile="pdfoverinstallhelper.jar"/>

+    <ROW File="pdfoverinstallhelper.jar" Component_="FastInfoset1.2.13.jar" FileName="pdf-ov~2.jar|pdf-over-install-helper.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-install-helper.jar" SelfReg="false" NextFile="pdfoversignator4.2.2.jar"/>

+    <ROW File="pdfoversignator4.2.2.jar" Component_="FastInfoset1.2.13.jar" FileName="pdf-ov~3.jar|pdf-over-signator-4.2.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-signator-4.2.2.jar" SelfReg="false" NextFile="pdfoversigpdfas44.2.2.jar"/>

+    <ROW File="pdfoversigpdfas44.2.2.jar" Component_="FastInfoset1.2.13.jar" FileName="pdf-ov~4.jar|pdf-over-sigpdfas4-4.2.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-sigpdfas4-4.2.2.jar" SelfReg="false" NextFile="pdfview0.9.3CyBot.jar"/>

+    <ROW File="pdfview0.9.3CyBot.jar" Component_="FastInfoset1.2.13.jar" FileName="pdfvie~1.jar|pdfview-0.9.3-CyBot.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfview-0.9.3-CyBot.jar" SelfReg="false" NextFile="sigspades4.1.5.jar"/>

+    <ROW File="sigspades4.1.5.jar" Component_="FastInfoset1.2.13.jar" FileName="sigs-p~1.jar|sigs-pades-4.1.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\sigs-pades-4.1.5.jar" SelfReg="false" NextFile="slf4japi1.6.6.jar"/>

+    <ROW File="slf4japi1.6.6.jar" Component_="FastInfoset1.2.13.jar" FileName="slf4j-~1.jar|slf4j-api-1.6.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\slf4j-api-1.6.6.jar" SelfReg="false" NextFile="slf4jlog4j121.6.6.jar"/>

+    <ROW File="slf4jlog4j121.6.6.jar" Component_="FastInfoset1.2.13.jar" FileName="slf4j-~2.jar|slf4j-log4j12-1.6.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\slf4j-log4j12-1.6.6.jar" SelfReg="false" NextFile="staxex1.7.8.jar"/>

+    <ROW File="staxex1.7.8.jar" Component_="FastInfoset1.2.13.jar" FileName="stax-e~1.jar|stax-ex-1.7.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\stax-ex-1.7.8.jar" SelfReg="false" NextFile="txw22.3.0.jar"/>

+    <ROW File="swtwindows32.jar" Component_="swtwindows64.jar" FileName="swt-wi~2.jar|swt-windows-32.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib-swt\swt-windows-32.jar" SelfReg="false" NextFile="FastInfoset1.2.13.jar"/>

     <ROW File="swtwindows64.jar" Component_="swtwindows64.jar" FileName="swt-wi~1.jar|swt-windows-64.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib-swt\swt-windows-64.jar" SelfReg="false" NextFile="swtwindows32.jar"/>

-    <ROW File="txw22.3.0.jar" Component_="core3.2.0.jar" FileName="txw2-2~1.jar|txw2-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\txw2-2.3.0.jar" SelfReg="false" NextFile="xmpcore5.1.2.jar"/>

-    <ROW File="xmpcore5.1.2.jar" Component_="core3.2.0.jar" FileName="xmpcor~1.jar|xmpcore-5.1.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\xmpcore-5.1.2.jar" SelfReg="false" NextFile="activation1.1.1.jar"/>

+    <ROW File="txw22.3.0.jar" Component_="FastInfoset1.2.13.jar" FileName="txw2-2~1.jar|txw2-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\txw2-2.3.0.jar" SelfReg="false" NextFile="xmpcore5.1.2.jar"/>

+    <ROW File="xmpcore5.1.2.jar" Component_="FastInfoset1.2.13.jar" FileName="xmpcor~1.jar|xmpcore-5.1.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\xmpcore-5.1.2.jar" SelfReg="false" NextFile="activation1.1.1.jar"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">

-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" Languages="en;de" LangOpt="1" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" UseLargeSchema="true" UACExecutionLevel="2"/>

+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" Languages="en;de" LangOpt="1" InstallationType="4" UseLargeSchema="true" UACExecutionLevel="2"/>

     <ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">

@@ -148,22 +147,12 @@
     <ROW Fragment="VerifyRepairDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRepairDlg.aip"/>

     <ROW Fragment="WelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\WelcomeDlg.aip"/>

   </COMPONENT>

-  <COMPONENT cid="caphyon.advinst.msicomp.MsiActionTextComponent">

-    <ROW Action="AI_DeleteLzma" Description="Deleting files extracted from archive" DescriptionLocId="ActionText.Description.AI_DeleteLzma" TemplateLocId="-"/>

-    <ROW Action="AI_DeleteRLzma" Description="Deleting files extracted from archive" DescriptionLocId="ActionText.Description.AI_DeleteLzma" TemplateLocId="-"/>

-    <ROW Action="AI_ExtractFiles" Description="Extracting files from archive" DescriptionLocId="ActionText.Description.AI_ExtractLzma" TemplateLocId="-"/>

-    <ROW Action="AI_ExtractLzma" Description="Extracting files from archive" DescriptionLocId="ActionText.Description.AI_ExtractLzma" TemplateLocId="-"/>

-  </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiAppSearchComponent">

-    <ROW Property="AI_SETUPEXEPATH" Signature_="AI_EXE_PATH_CU" Builds="DefaultBuild"/>

-    <ROW Property="AI_SETUPEXEPATH" Signature_="AI_EXE_PATH_LM" Builds="DefaultBuild"/>

     <ROW Property="AI_SHORTCUTSREG" Signature_="AI_ShRegOptionMachine"/>

     <ROW Property="AI_SHORTCUTSREG" Signature_="AI_ShRegOptionUser"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">

-    <ROW Name="Prereq.dll" SourcePath="&lt;AI_CUSTACTS&gt;Prereq.dll"/>

     <ROW Name="aicustact.dll" SourcePath="&lt;AI_CUSTACTS&gt;aicustact.dll"/>

-    <ROW Name="lzmaextractor.dll" SourcePath="&lt;AI_CUSTACTS&gt;lzmaextractor.dll"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiControlComponent">

     <ATTRIBUTE name="FixedSizeBitmaps" value="2"/>

@@ -210,19 +199,9 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">

     <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>

     <ROW Action="AI_DATA_SETTER" Type="51" Source="AI_DEL_EMPTY_SHORTCUTDIR" Target="[SHORTCUTDIR]"/>

-    <ROW Action="AI_DATA_SETTER_1" Type="51" Source="AI_ExtractFiles" Target="[AI_SETUPEXEPATH]"/>

     <ROW Action="AI_DELETE_SHORTCUTS" Type="1" Source="aicustact.dll" Target="DeleteShortcuts"/>

     <ROW Action="AI_DEL_EMPTY_SHORTCUTDIR" Type="3073" Source="aicustact.dll" Target="DeleteEmptyDirectory" AdditionalSeq="AI_DATA_SETTER"/>

     <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>

-    <ROW Action="AI_DeleteCadLzma" Type="51" Source="AI_DeleteLzma" Target="[AI_SETUPEXEPATH]"/>

-    <ROW Action="AI_DeleteLzma" Type="1025" Source="lzmaextractor.dll" Target="DeleteLZMAFiles"/>

-    <ROW Action="AI_DeleteRCadLzma" Type="51" Source="AI_DeleteRLzma" Target="[AI_SETUPEXEPATH]"/>

-    <ROW Action="AI_DeleteRLzma" Type="1281" Source="lzmaextractor.dll" Target="DeleteLZMAFiles"/>

-    <ROW Action="AI_EstimateExtractFiles" Type="1" Source="Prereq.dll" Target="EstimateExtractFiles"/>

-    <ROW Action="AI_ExtractCadLzma" Type="51" Source="AI_ExtractLzma" Target="[AI_SETUPEXEPATH]"/>

-    <ROW Action="AI_ExtractFiles" Type="1025" Source="Prereq.dll" Target="ExtractSourceFiles" AdditionalSeq="AI_DATA_SETTER_1"/>

-    <ROW Action="AI_ExtractLzma" Type="1025" Source="lzmaextractor.dll" Target="ExtractLZMAFiles"/>

-    <ROW Action="AI_FindExeLzma" Type="1" Source="lzmaextractor.dll" Target="FindEXE"/>

     <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>

     <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>

     <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH" Target="[AI_SETUPEXEPATH_ORIGINAL]"/>

@@ -250,18 +229,6 @@
     <ROW Action="AI_DELETE_SHORTCUTS" Condition="NOT (REMOVE=&quot;ALL&quot;)" Sequence="1401"/>

     <ROW Action="AI_DEL_EMPTY_SHORTCUTDIR" Condition="NOT (REMOVE=&quot;ALL&quot;)" Sequence="6402"/>

     <ROW Action="AI_DATA_SETTER" Condition="NOT (REMOVE=&quot;ALL&quot;)" Sequence="6401"/>

-    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99" Builds="DefaultBuild"/>

-    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="101" Builds="DefaultBuild"/>

-    <ROW Action="AI_DeleteCadLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (NOT PATCH)" Sequence="199" Builds="DefaultBuild"/>

-    <ROW Action="AI_DeleteRCadLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (NOT PATCH)" Sequence="198" Builds="DefaultBuild"/>

-    <ROW Action="AI_ExtractCadLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (NOT PATCH)" Sequence="197" Builds="DefaultBuild"/>

-    <ROW Action="AI_FindExeLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (NOT PATCH)" Sequence="196" Builds="DefaultBuild"/>

-    <ROW Action="AI_ExtractLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (NOT PATCH)" Sequence="1549" Builds="DefaultBuild"/>

-    <ROW Action="AI_DeleteRLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (NOT PATCH)" Sequence="1548" Builds="DefaultBuild"/>

-    <ROW Action="AI_DeleteLzma" Condition="SETUPEXEDIR=&quot;&quot; AND Installed AND (REMOVE&lt;&gt;&quot;ALL&quot;) AND (NOT PATCH)" Sequence="6599" Builds="DefaultBuild"/>

-    <ROW Action="AI_ExtractFiles" Sequence="3998" Builds="DefaultBuild"/>

-    <ROW Action="AI_DATA_SETTER_1" Sequence="3997"/>

-    <ROW Action="AI_EstimateExtractFiles" Sequence="3999" Builds="DefaultBuild"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">

     <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>

@@ -280,14 +247,11 @@
     <ROW LockObject="libswt_1_Dir" Table="CreateFolder" User="Everyone" Permission="1610809791"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiRegLocatorComponent">

-    <ROW Signature_="AI_EXE_PATH_CU" Root="1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Type="2"/>

-    <ROW Signature_="AI_EXE_PATH_LM" Root="2" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Type="2"/>

     <ROW Signature_="AI_ShRegOptionMachine" Root="2" Key="Software\Caphyon\Advanced Installer\Installs\[ProductCode]" Name="AIShRegAnswer" Type="2"/>

     <ROW Signature_="AI_ShRegOptionUser" Root="1" Key="Software\Caphyon\Advanced Installer\Installs\[ProductCode]" Name="AIShRegAnswer" Type="2"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">

     <ROW Registry="AIShRegAnswer" Root="-1" Key="Software\Caphyon\Advanced Installer\Installs\[ProductCode]" Name="AIShRegAnswer" Value="[AI_SHORTCUTSREG]" Component_="AIShRegAnswer"/>

-    <ROW Registry="AI_ExePath" Root="-1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Value="[AI_SETUPEXEPATH]" Component_="AI_ExePath"/>

     <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>

     <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>

   </COMPONENT>

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
index a67ea019..19def107 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
@@ -94,8 +94,20 @@ public class MobileBKUConnector implements BkuSlConnector {
 					if (responseData.contains("undecided.aspx?sid="))	{ //$NON-NLS-1$

 						

 						// handle polling 

-						this.state.showOpenAppMessage();

-						handler.handlePolling(responseData);

+						//this.state.showOpenAppMessage();

+						this.state.showOpenAppMessageWithSMSandCancel();

+

+						if (((ATrustStatus) this.state.getStatus()).isSmsTan()) {

+							//((ATrustStatus)this.state.getStatus()).setSmsTan(false);

+							ATrustHandler aHandler = (ATrustHandler) handler;

+							String response = aHandler.postSMSRequest();

+							aHandler.handleCredentialsResponse(response);

+							((ATrustStatus)this.state.getStatus()).setIsAPPTan("sms"); //$NON-NLS-1$

+							this.state.checkTAN();

+						} else {

+							handler.handlePolling(responseData);

+						}

+

 						

 					} else {

 

@@ -146,7 +158,7 @@ public class MobileBKUConnector implements BkuSlConnector {
 							enterTAN = false;

 						}

 					} 

-					if (enterTAN && !aStatus.getTanField()) {

+					if (enterTAN && !aStatus.getTanField() && !aStatus.isSmsTan()) {

 						try {

 							 

 							this.state.showFingerPrintInformation();

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java
index e95121b2..2c6f0e55 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java
@@ -444,6 +444,22 @@ public class ATrustHandler extends MobileBKUHandler {
 

 		return executeGet(client, get);

 	}

+	

+	/**

+	 * @param responseData

+	 * @return a boolean

+	 */

+	public Boolean handleWaitforAppResponse(String responseData) {

+		

+		getStatus().setErrorMessage(null); 

+		if (!responseData.contains("Bitte starten Sie Ihre")) { //$NON-NLS-1$

+			//getSigningState().setSignatureResponse(

+				//	new SLResponse(responseData, getStatus().getServer(), null, null));

+			return true;

+			

+		}

+		return false; 

+	}

 

 	/**

 	 * Parse QR code response

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java
index b34322b8..4c8b42e8 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java
@@ -47,6 +47,7 @@ public class ATrustStatus extends AbstractMobileBKUStatusImpl {
 	private String dynAttrBtnId; 

 	private String dynAttrTan; 

 	private String dynAttrSignButton; 

+	private boolean smsTan = false;

 

 	/**

 	 * Constructor

@@ -240,4 +241,18 @@ public class ATrustStatus extends AbstractMobileBKUStatusImpl {
 		this.dynAttrSignButton = dynAttrSignButton;

 	}

 

+	/**

+	 * @return the smsTan

+	 */

+	public boolean isSmsTan() {

+		return smsTan;

+	}

+

+	/**

+	 * @param smsTan the smsTan to set

+	 */

+	public void setSmsTan(boolean smsTan) {

+		this.smsTan = smsTan;

+	}

+

 }

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java
index 360786d4..14d257bd 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java
@@ -26,12 +26,33 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.ProgressBar;

 import at.asit.pdfover.gui.utils.Messages;

 import at.asit.pdfover.gui.workflow.states.State;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.events.SelectionAdapter;

+import org.eclipse.swt.events.SelectionEvent;

 

 /**

  * 

  */

 public class WaitingForAppComposite extends StateComposite {

 	private Label lbl_description;

+	private Button btn_sms; 

+	private Boolean isUserSMS = false; 

+	private Boolean userCancel = false; 

+	private Boolean isDone = false; 

+

+	/**

+	 * @return the isDone

+	 */

+	public Boolean getIsDone() {

+		return isDone;

+	}

+

+	/**

+	 * @param isDone the isDone to set

+	 */

+	public void setIsDone(Boolean isDone) {

+		this.isDone = isDone;

+	}

 

 	/**

 	 * Create the composite.

@@ -60,9 +81,40 @@ public class WaitingForAppComposite extends StateComposite {
 		fd_progressBar.right = new FormAttachment(50, +100);

 		progressBar.setLayoutData(fd_progressBar);

 		

+		this.btn_sms = new Button(this, SWT.NONE);

+		this.btn_sms.addSelectionListener(new SMSSelectionListener());

+		

+		FormData fd_btnNewButton = new FormData();

+		fd_btnNewButton.bottom = new FormAttachment(100, -26);

+		fd_btnNewButton.right = new FormAttachment(100, -40);

+		this.btn_sms.setLayoutData(fd_btnNewButton);

+		this.btn_sms.setText(Messages.getString("SMS tan")); //$NON-NLS-1$

+		

 		reloadResources();

 

 	}

+	

+	private final class SMSSelectionListener extends SelectionAdapter {

+		/**

+		 * Empty constructor

+		 */

+		public SMSSelectionListener() {

+		}

+

+		@Override

+		public void widgetSelected(SelectionEvent e) {

+			if(!WaitingForAppComposite.this.btn_sms.getEnabled()) {

+				return;

+			}

+

+			WaitingForAppComposite.this.setUserSMS(true);

+			WaitingForAppComposite.this.btn_sms.setEnabled(false);

+		}

+	}

+	

+	public void setUserSMS(boolean b) {

+		this.isUserSMS = b; 

+	}

 

 	@Override

 	protected void checkSubclass() {

@@ -83,5 +135,28 @@ public class WaitingForAppComposite extends StateComposite {
 	@Override

 	public void reloadResources() {

 		this.lbl_description.setText(Messages.getString("waiting_for_app.message")); //$NON-NLS-1$

+		this.btn_sms.setText("SMS tan"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @return

+	 */

+	public boolean getUserCancel() {

+		return userCancel;

+	}

+

+	/**

+	 * @param b

+	 */

+	public void setUserCancel(boolean b) {

+		userCancel = b; 

+		

+	}

+

+	/**

+	 * @return

+	 */

+	public boolean getUserSMS() {

+		return this.isUserSMS;

 	}

 }

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
index 9d2fb32f..cf107b58 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
@@ -445,49 +445,74 @@ public class MobileBKUState extends State {
 		

 	}

 	

-//	/**

-//	 * 

-//	 */

-//	public void showOpenAppMessageWithSMSandCancel() {

-//			

-//			final ATrustStatus status = (ATrustStatus) this.getStatus();

-//			final ATrustHandler handler = (ATrustHandler) this.getHandler();

-//

-//			Display.getDefault().syncExec(new Runnable() {

-//				@Override

-//				public void run() {

-//					WaitingForAppComposite waitingForAppcomposite = getWaitingForAppComposite();

-//					getStateMachine().getGUIProvider().display(waitingForAppcomposite);

-//

-//					Display display = getStateMachine().getGUIProvider().getMainShell().getDisplay(); 

-//					while (!waitingForAppcomposite.getUserCancel() && !waitingForAppcomposite.getUserSMS() && !waitingForAppcomposite.getDone()) {

-//						if (!display.readAndDispatch()) {

-//							display.sleep();

-//						}

-//					}

-//

-//					if (waitingForAppcomposite.getUserCancel()) {

-//						waitingForAppcomposite.setUserCancel(false);

-//						status.setErrorMessage("cancel"); //$NON-NLS-1$

-//						return;

-//					}

-//

-//					if (waitingForAppcomposite.getUserSMS()) {

-//						status.setQRCode(null);

-//						status.setErrorMessage(null);

-//						return; 

-//						

-//					}

-//

-//					if (waitingForAppcomposite.getDone())

-//						waitingForAppcomposite.setDone(false);

-//

-//					// show waiting composite

-//					getStateMachine().getGUIProvider().display(

-//							MobileBKUState.this.getWaitingComposite());

-//				}

-//			});

-//	}

+	/**

+	 * 

+	 */

+	public void showOpenAppMessageWithSMSandCancel() {

+

+		final ATrustStatus status = (ATrustStatus) this.getStatus();

+		final ATrustHandler handler = (ATrustHandler) this.getHandler();

+

+		final Timer checkDone = new Timer(true);

+		checkDone.scheduleAtFixedRate(new TimerTask() {

+

+			@Override

+			public void run() {

+				// ping signature page to see if code has been scanned

+				try {

+					String resp = handler.getSignaturePage();

+					if (handler.handleWaitforAppResponse(resp)) {

+						log.debug("Signature page response: " + resp); //$NON-NLS-1$

+						getWaitingForAppComposite().setIsDone(true);

+						Display display = getStateMachine().getGUIProvider().getMainShell().getDisplay();

+						display.wake();

+					}

+					Display.getDefault().wake();

+				} catch (Exception e) {

+					log.error("Error getting signature page", e); //$NON-NLS-1$

+				}

+			}

+		}, 0, 5000);

+

+		Display.getDefault().syncExec(new Runnable() {

+			@Override

+			public void run() {

+				WaitingForAppComposite waitingForAppcomposite = MobileBKUState.this.getWaitingForAppComposite();// getWaitingForAppComposite();

+				getStateMachine().getGUIProvider().display(waitingForAppcomposite);

+

+				Display display = getStateMachine().getGUIProvider().getMainShell().getDisplay();

+				while (!waitingForAppcomposite.getUserCancel() && !waitingForAppcomposite.getUserSMS()

+						&& !waitingForAppcomposite.getIsDone()) {

+					if (!display.readAndDispatch()) {

+						display.sleep();

+					}

+				}

+

+				if (waitingForAppcomposite.getUserCancel()) {

+					waitingForAppcomposite.setUserCancel(false);

+					status.setErrorMessage("cancel"); //$NON-NLS-1$

+					return;

+				}

+

+				if (waitingForAppcomposite.getUserSMS()) {

+					status.setQRCode(null);

+					waitingForAppcomposite.setUserSMS(false);

+					status.setErrorMessage("sms"); //$NON-NLS-1$

+					status.setSmsTan(true);

+					// show waiting composite

+					getStateMachine().getGUIProvider().display(MobileBKUState.this.getWaitingComposite());

+					return;

+

+				}

+

+				if (waitingForAppcomposite.getIsDone())

+					waitingForAppcomposite.setIsDone(false);

+

+				// show waiting composite

+				getStateMachine().getGUIProvider().display(MobileBKUState.this.getWaitingComposite());

+			}

+		});

+	}

 

 	/**

 	 *  when fingerprint or faceid is selected in the app 

diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
index 4e0d101b..7d6b625f 100644
--- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
+++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
@@ -1,5 +1,5 @@
 #Eclipse messages class

-#Thu Aug 01 14:54:36 CEST 2019

+#Wed Oct 30 13:33:54 CET 2019

 BKU.KS=Keystore

 BKU.LOCAL=Local CCE

 BKU.MOBILE=Mobile CCE

@@ -7,6 +7,7 @@ BKU.NONE=no default
 BKUSelectionComposite.btnMobile.text=MOBILE

 TrustedSocketFactory.FailedToCreateSecureConnection=Failed to create secure network connection

 WaitingForAppComposite.btnCancel_1.text=Cancel

+WaitingForAppComposite.btnNewButton.text=New Button

 WaitingForAppComposite.btnRequestSms.text=Request SMS

 WaitingForAppComposite.lblNewLabel.text=New Label

 advanced_config.AutoPosition=Automatic positioning