From b2cb5182bcb6c691ea2c541ba31524c9cdd62611 Mon Sep 17 00:00:00 2001
From: Vincent BRIDIER <vincent.bridier@ldc.fr>
Date: Mon, 1 Sep 2025 18:57:23 +0200
Subject: [PATCH] feat: - Update Install and Download docs call to handle
 tenant changes

---
 ComApp/CHANGELOG.md                   | 6 ++++++
 ComApp/android/app/build.gradle       | 2 +-
 ComApp/src/App/Views/InstallScreen.js | 3 ++-
 ComApp/src/App/Views/SyncScreen.js    | 5 ++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ComApp/CHANGELOG.md b/ComApp/CHANGELOG.md
index ce14075..d83bf45 100644
--- a/ComApp/CHANGELOG.md
+++ b/ComApp/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 3.1.1
+
+### Évolution - 3.1.1
+
+- Update Install and Download docs call to handle tenant changes
+
 ## 3.0.1
 
 ### Bug - 3.0.1
diff --git a/ComApp/android/app/build.gradle b/ComApp/android/app/build.gradle
index dd864f2..98f50ee 100644
--- a/ComApp/android/app/build.gradle
+++ b/ComApp/android/app/build.gradle
@@ -139,7 +139,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "3.0.1"
+        versionName "3.1.1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ComApp/src/App/Views/InstallScreen.js b/ComApp/src/App/Views/InstallScreen.js
index d3c010c..1b8e460 100644
--- a/ComApp/src/App/Views/InstallScreen.js
+++ b/ComApp/src/App/Views/InstallScreen.js
@@ -136,6 +136,7 @@ class InstallScreen extends React.Component {
         let toDL = [];
         if (response.data) {
           if (response.data.status === 'OK') {
+            const rootUrl = url.substring(0, url.lastIndexOf('/'));
             _.forEach(response.data.datas, function (value, key) {
               switch (key) {
                 case 'MainColor':
@@ -147,7 +148,7 @@ class InstallScreen extends React.Component {
                 case 'BackgroundImage':
                 case 'HomeButtonImage':
                   toDL.push({
-                    source: url + '/' + value,
+                    source: rootUrl + '/' + value,
                     dest: FileSystem.documentDirectory + key + '.png',
                   });
                   break;
diff --git a/ComApp/src/App/Views/SyncScreen.js b/ComApp/src/App/Views/SyncScreen.js
index f8e04bd..a740aae 100644
--- a/ComApp/src/App/Views/SyncScreen.js
+++ b/ComApp/src/App/Views/SyncScreen.js
@@ -407,7 +407,10 @@ class SyncScreen extends React.Component {
     if (this.state.downloadingFile === false) {
       this.setState({ downloadingFile: true });
     }
-    const endpoint = SyncController.getUrlBo() + '/storage/docs/';
+    const tenantUrl = SyncController.getUrlBo();
+    const rootUrl = tenantUrl.substring(0, tenantUrl.lastIndexOf('/'));
+    const tenantId = tenantUrl.match(/[^\/]+$/)[0];
+    const endpoint = rootUrl + '/storage/docs/' + tenantId + "/";
     const doc = documents[i];
     this.setState({
       txtStep: