new version 1.0.3

prrvchr · Nov 8, 2023 · f0cdb4b · f0cdb4b
1 parent 9695613
commit f0cdb4b
Show file tree

Hide file tree

Showing 14 changed files with 62 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 **The use of this software subjects you to our [Terms Of Use][3] and [Data Protection Policy][4].**
 
-# version [1.0.2][5]
+# version [1.0.3][5]
 
 ## Introduction:
 
@@ -42,15 +42,15 @@ ___
 It seems important that the file was not renamed when it was downloaded.
 If necessary, rename it before installing it.
 
-- Install ![OAuth2OOo logo][17] **[OAuth2OOo.oxt][18]** extension version 1.2.0.
+- Install ![OAuth2OOo logo][17] **[OAuth2OOo.oxt][18]** extension version 1.2.1.
 
 You must install this extension, if it is not already installed.
 
 - Install ![jdbcDriverOOo logo][19] **[jdbcDriverOOo.oxt][20]** extension version 1.0.5.
 
 You must install this extension, if it is not already installed.
 
-- Install ![mContactOOo logo][1] **[mContactOOo.oxt][21]** extension version 1.0.2.
+- Install ![mContactOOo logo][1] **[mContactOOo.oxt][21]** extension version [![Version][0]][21]
 
 Restart LibreOffice / OpenOffice after installation.
 
@@ -134,12 +134,17 @@ It will give you access to an information system that only larges companies are
 
 - Support for version **1.2.0** of the **OAuth2OOo** extension. Previous versions will not work with **OAuth2OOo** extension 1.2.0 or higher.
 
-### What remains to be done for version 1.0.2:
+### What has been done for version 1.0.3:
+
+- Support for version **1.2.1** of the **OAuth2OOo** extension. Previous versions will not work with **OAuth2OOo** extension 1.2.1 or higher.
+
+### What remains to be done for version 1.0.3:
 
 - Add new languages for internationalization...
 
 - Anything welcome...
 
+[0]: <https://img.shields.io/github/downloads/prrvchr/mContactOOo/latest/total?label=v1.0.3>
 [1]: <img/mContactOOo.svg>
 [2]: <https://prrvchr.github.io/mContactOOo/README_fr>
 [3]: <https://prrvchr.github.io/mContactOOo/source/mContactOOo/registration/TermsOfUse_en>
@@ -157,10 +162,10 @@ It will give you access to an information system that only larges companies are
 [15]: <https://bugs.documentfoundation.org/show_bug.cgi?id=139538>
 [16]: <https://prrvchr.github.io/HyperSQLOOo/>
 [17]: <https://prrvchr.github.io/OAuth2OOo/img/OAuth2OOo.svg>
-[18]: <https://github.com/prrvchr/OAuth2OOo/raw/master/OAuth2OOo.oxt>
+[18]: <https://github.com/prrvchr/OAuth2OOo/releases/latest/download/OAuth2OOo.oxt>
 [19]: <https://prrvchr.github.io/jdbcDriverOOo/img/jdbcDriverOOo.svg>
-[20]: <https://github.com/prrvchr/jdbcDriverOOo/raw/master/source/jdbcDriverOOo/dist/jdbcDriverOOo.oxt>
-[21]: <https://github.com/prrvchr/mContactOOo/raw/main/source/mContactOOo/dist/mContactOOo.oxt>
+[20]: <https://github.com/prrvchr/jdbcDriverOOo/releases/latest/download/jdbcDriverOOo.oxt>
+[21]: <https://github.com/prrvchr/mContactOOo/releases/latest/download/mContactOOo.oxt>
 [22]: <img/mContactOOo-1.png>
 [23]: <img/mContactOOo-2.png>
 [24]: <img/mContactOOo-3.png>

diff --git a/README_fr.md b/README_fr.md
@@ -4,7 +4,7 @@
 
 **L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][3] et à notre [Politique de protection des données][4].**
 
-# version [1.0.2][5]
+# version [1.0.3][5]
 
 ## Introduction:
 
@@ -42,15 +42,15 @@ ___
 Il semble important que le fichier n'ait pas été renommé lors de son téléchargement.  
 Si nécessaire, renommez-le avant de l'installer.
 
-- Installer l'extension ![OAuth2OOo logo][17] **[OAuth2OOo.oxt][18]** version 1.2.0.
+- Installer l'extension ![OAuth2OOo logo][17] **[OAuth2OOo.oxt][18]** version 1.2.1.
 
 Vous devez installer cette extension, si elle n'est pas déjà installée.
 
 - Installer l'extension ![jdbcDriverOOo logo][19] **[jdbcDriverOOo.oxt][20]** version 1.0.5.
 
 Vous devez installer cette extension, si elle n'est pas déjà installée.
 
-- Installer l'extension ![mContactOOo logo][1] **[mContactOOo.oxt][21]** version 1.0.2.
+- Installer l'extension ![mContactOOo logo][1] **[mContactOOo.oxt][21]** version [![Version][0]][21]
 
 Redémarrez LibreOffice / OpenOffice après l'installation.
 
@@ -134,12 +134,17 @@ Elle vous donnera accès à un système d'information que seules les grandes ent
 
 - Prise en charge de la version 1.2.0 de l'extension **OAuth2OOo**. Les versions précédentes ne fonctionneront pas avec l'extension **OAuth2OOo** 1.2.0 ou ultérieure.
 
-### Que reste-t-il à faire pour la version 1.0.2:
+### Ce qui a été fait pour la version 1.0.3:
+
+- Prise en charge de la version 1.2.1 de l'extension **OAuth2OOo**. Les versions précédentes ne fonctionneront pas avec l'extension **OAuth2OOo** 1.2.1 ou ultérieure.
+
+### Que reste-t-il à faire pour la version 1.0.3:
 
 - Ajouter de nouvelles langues pour l’internationalisation...
 
 - Tout ce qui est bienvenu...
 
+[0]: <https://img.shields.io/github/downloads/prrvchr/mContactOOo/latest/total?label=v1.0.3>
 [1]: <img/mContactOOo.svg>
 [2]: <https://prrvchr.github.io/mContactOOo>
 [3]: <https://prrvchr.github.io/mContactOOo/source/mContactOOo/registration/TermsOfUse_fr>
@@ -157,10 +162,10 @@ Elle vous donnera accès à un système d'information que seules les grandes ent
 [15]: <https://bugs.documentfoundation.org/show_bug.cgi?id=139538>
 [16]: <https://prrvchr.github.io/HyperSQLOOo/README_fr>
 [17]: <https://prrvchr.github.io/OAuth2OOo/img/OAuth2OOo.svg>
-[18]: <https://github.com/prrvchr/OAuth2OOo/raw/master/OAuth2OOo.oxt>
+[18]: <https://github.com/prrvchr/OAuth2OOo/releases/latest/download/OAuth2OOo.oxt>
 [19]: <https://prrvchr.github.io/jdbcDriverOOo/img/jdbcDriverOOo.svg>
-[20]: <https://github.com/prrvchr/jdbcDriverOOo/raw/master/source/jdbcDriverOOo/dist/jdbcDriverOOo.oxt>
-[21]: <https://github.com/prrvchr/mContactOOo/raw/main/source/mContactOOo/dist/mContactOOo.oxt>
+[20]: <https://github.com/prrvchr/jdbcDriverOOo/releases/latest/download/jdbcDriverOOo.oxt>
+[21]: <https://github.com/prrvchr/mContactOOo/releases/latest/download/mContactOOo.oxt>
 [22]: <img/mContactOOo-1_fr.png>
 [23]: <img/mContactOOo-2_fr.png>
 [24]: <img/mContactOOo-3_fr.png>

diff --git a/_config.yml b/_config.yml
@@ -13,7 +13,7 @@ description: Your contacts from your Android phone as an HsqlDB database in Libr
 sidebar:
   - name: Download
     icon: <svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" style="vertical-align:-0.125em;" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path stroke-dasharray="14" stroke-dashoffset="14" d="M6 19h12"><animate fill="freeze" attributeName="stroke-dashoffset" begin="0.5s" dur="0.4s" values="14;0"/></path><path stroke-dasharray="18" stroke-dashoffset="18" d="M12 4 h2 v6 h2.5 L12 14.5M12 4 h-2 v6 h-2.5 L12 14.5"><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.4s" values="18;0"/><animate attributeName="d" calcMode="linear" dur="1.5s" keyTimes="0;0.7;1" repeatCount="indefinite" values="M12 4 h2 v6 h2.5 L12 14.5M12 4 h-2 v6 h-2.5 L12 14.5;M12 4 h2 v3 h2.5 L12 11.5M12 4 h-2 v3 h-2.5 L12 11.5;M12 4 h2 v6 h2.5 L12 14.5M12 4 h-2 v6 h-2.5 L12 14.5"/></path></g></svg>
-    link: https://github.com/prrvchr/mContactOOo/raw/main/mContactOOo.oxt
+    link: https://github.com/prrvchr/mContactOOo/releases/latest/download/mContactOOo.oxt
   - name: Repository
     icon: <svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" style="vertical-align:-0.125em;" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 16 16"><g fill="currentColor"><path d="M12.643 15C13.979 15 15 13.845 15 12.5V5H1v7.5C1 13.845 2.021 15 3.357 15h9.286zM5.5 7h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1 0-1zM.8 1a.8.8 0 0 0-.8.8V3a.8.8 0 0 0 .8.8h14.4A.8.8 0 0 0 16 3V1.8a.8.8 0 0 0-.8-.8H.8z"/></g></svg>
     link: https://github.com/prrvchr/mContactOOo

diff --git a/mContactOOo.oxt b/mContactOOo.oxt
diff --git a/mContactOOo.update.xml b/mContactOOo.update.xml
@@ -1,11 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+╔════════════════════════════════════════════════════════════════════════════════════╗
+║                                                                                    ║
+║   Copyright (c) 2020 https://prrvchr.github.io                                     ║
+║                                                                                    ║
+║   Permission is hereby granted, free of charge, to any person obtaining            ║
+║   a copy of this software and associated documentation files (the "Software"),     ║
+║   to deal in the Software without restriction, including without limitation        ║
+║   the rights to use, copy, modify, merge, publish, distribute, sublicense,         ║
+║   and/or sell copies of the Software, and to permit persons to whom the Software   ║
+║   is furnished to do so, subject to the following conditions:                      ║
+║                                                                                    ║
+║   The above copyright notice and this permission notice shall be included in       ║
+║   all copies or substantial portions of the Software.                              ║
+║                                                                                    ║
+║   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,                  ║
+║   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES                  ║
+║   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.        ║
+║   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY             ║
+║   CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,             ║
+║   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE       ║
+║   OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                    ║
+║                                                                                    ║
+╚════════════════════════════════════════════════════════════════════════════════════╝
+-->
 <description
   xmlns="http://openoffice.org/extensions/update/2006"
   xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="io.github.prrvchr.mContactOOo" />
-    <version value="0.0.1" />
+    <version value="1.0.3" />
     <update-download>
-        <src xlink:href="https://github.com/prrvchr/mContactOOo/blob/master/mContactOOo.oxt" />
+        <src xlink:href="https://github.com/prrvchr/mContactOOo/releases/latest/download/mContactOOo.oxt" />
     </update-download>
     <dependencies xmlns:dep="http://openoffice.org/extensions/description/2006">
         <dep:OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice.org 4.0"/>
@@ -14,7 +39,7 @@
         <name xlink:href="https://github.com/prrvchr/mContactOOo" lang="en">mContactOOo</name>
     </publisher>
     <release-notes>
-        <src xlink:href="https://github.com/prrvchr/mContactOOo/blob/master/README.md" lang="en" />
-        <src xlink:href="https://github.com/prrvchr/mContactOOo/blob/master/README_fr.md" lang="fr" />
+        <src xlink:href="https://prrvchr.github.io/mContactOOo/#historical" lang="en" />
+        <src xlink:href="https://prrvchr.github.io/mContactOOo/README_fr#historique" lang="fr" />
     </release-notes>
 </description>
diff --git a/source/mContactOOo/.gitignore b/source/mContactOOo/.gitignore
@@ -1,2 +1,6 @@
 /.settings/
 /build/
+/dist/
+.project
+.pydevproject
+.unoproject
diff --git a/source/mContactOOo/.project b/source/mContactOOo/.project
diff --git a/source/mContactOOo/.pydevproject b/source/mContactOOo/.pydevproject
diff --git a/source/mContactOOo/.unoproject b/source/mContactOOo/.unoproject
diff --git a/source/mContactOOo/description.xml b/source/mContactOOo/description.xml
@@ -28,7 +28,7 @@
   xmlns="http://openoffice.org/extensions/description/2006"
   xmlns:d="http://openoffice.org/extensions/description/2006"
   xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="1.0.2"/>
+    <version value="1.0.3"/>
     <identifier value="io.github.prrvchr.mContactOOo"/>
     <platform value="all"/>
     <dependencies>

diff --git a/source/mContactOOo/dist/.gitignore b/source/mContactOOo/dist/.gitignore
diff --git a/source/mContactOOo/dist/mContactOOo.oxt b/source/mContactOOo/dist/mContactOOo.oxt
diff --git a/source/mContactOOo/service/Driver.py b/source/mContactOOo/service/Driver.py
@@ -123,7 +123,7 @@ def connect(self, url, infos):
             if not validators.email(username):
                 self._logSqlException(1102, username)
                 raise self._getSqlException(113, 1102, username)
-            connection = self.DataSource.getConnection(g_scheme, g_host, username, password)
+            connection = self.DataSource.getConnection(self, g_scheme, g_host, username, password)
             version = self.DataSource.DataBase.Version
             name = connection.getMetaData().getUserName()
             self._logger.logprb(INFO, 'Driver', 'connect()', 114, version, name)

diff --git a/source/mContactOOo/service/pythonpath/mcontact/provider.py b/source/mContactOOo/service/pythonpath/mcontact/provider.py
@@ -98,11 +98,11 @@ def _parseUser(self, response):
         response.close()
         return userid
 
-    def initAddressbooks(self, database, user):
+    def initAddressbooks(self, source, database, user):
         print("Provider.initAddressbooks() 1 %s" % (user.Name, ))
         parameter = self._getRequestParameter(user.Request, 'getBooks')
         iterator = self._parseAllBooks(user.Request.execute(parameter))
-        self.initUserBooks(database, user, iterator)
+        self.initUserBooks(source, database, user, iterator)
 
     def _parseAllBooks(self, response):
         if response.Ok: