Merge pull request #3127 from ONLYOFFICE/feature/fix-bugs

[DE PE SSE mobile] Fix Bug 61642
ONLYOFFICE · Aug 19, 2024 · 200eb0b · 200eb0b
2 parents 5132ab5 + cbe6be3
commit 200eb0b
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 0 deletions.
diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -389,6 +389,7 @@ class MainController extends Component {
                 Common.Gateway.on('downloadas', this.onDownloadAs.bind(this));
                 Common.Gateway.on('requestclose', this.onRequestClose.bind(this));
                 Common.Gateway.on('setfavorite', this.onSetFavorite.bind(this));
+                Common.Gateway.on('insertimage', this.insertImage.bind(this));
 
                 Common.Gateway.sendInfo({
                     mode: appOptions.isEdit ? 'edit' : 'view'
@@ -499,6 +500,30 @@ class MainController extends Component {
         }
     }
 
+    insertImage (data) {
+        if (data && (data.url || data.images)) {
+            if (data.url) {
+                console.log("Obsolete: The 'url' parameter of the 'insertImage' method is deprecated. Please use 'images' parameter instead.");
+            }
+
+            let arr = [];
+
+            if (data.images && data.images.length > 0) {
+                for (let i = 0; i < data.images.length; i++) {
+                    if (data.images[i] && data.images[i].url) {
+                        arr.push(data.images[i].url);
+                    }
+                }
+            } else if (data.url) {
+                arr.push(data.url);
+            }
+
+            data._urls = arr;
+        }
+
+        this.insertImageFromStorage(data);
+    }
+
     loadDefaultMetricSettings() {
         const appOptions = this.props.storeAppOptions;
         let region = '';
@@ -934,6 +959,12 @@ class MainController extends Component {
         Common.Notifications.on('markfavorite', this.markFavorite.bind(this));
     }
 
+    insertImageFromStorage(data) {
+        if (data && data._urls && (!data.c || data.c === 'add') && data._urls.length > 0) {
+            this.api.AddImageUrl(data._urls, undefined, data.token);
+        }
+    }
+
     markFavorite(favorite) {
         Common.Gateway.metaChange({ favorite });
     }

diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx
@@ -521,6 +521,12 @@ class MainController extends Component {
         });
     }
 
+    insertImageFromStorage(data) {
+        if (data && data._urls && (!data.c || data.c === 'add') && data._urls.length > 0) {
+            this.api.AddImageUrl(data._urls, undefined, data.token);
+        }
+    }
+
     onApiTextReplaced(found, replaced) {
         const { t } = this.props;
 
@@ -563,6 +569,7 @@ class MainController extends Component {
         Common.Gateway.on('processrightschange', this.onProcessRightsChange.bind(this));
         Common.Gateway.on('downloadas', this.onDownloadAs.bind(this));
         Common.Gateway.on('requestclose', this.onRequestClose.bind(this));
+        Common.Gateway.on('insertimage', this.insertImage.bind(this));
 
         Common.Gateway.sendInfo({
             mode: appOptions.isEdit ? 'edit' : 'view'
@@ -582,6 +589,30 @@ class MainController extends Component {
         appOptions.changeDocReady(true);
     }
 
+    insertImage (data) {
+        if (data && (data.url || data.images)) {
+            if (data.url) {
+                console.log("Obsolete: The 'url' parameter of the 'insertImage' method is deprecated. Please use 'images' parameter instead.");
+            }
+
+            let arr = [];
+
+            if (data.images && data.images.length > 0) {
+                for (let i = 0; i < data.images.length; i++) {
+                    if (data.images[i] && data.images[i].url) {
+                        arr.push(data.images[i].url);
+                    }
+                }
+            } else if (data.url) {
+                arr.push(data.url);
+            }
+
+            data._urls = arr;
+        }
+
+        this.insertImageFromStorage(data);
+    }
+
     onLicenseChanged (params) {
         const appOptions = this.props.storeAppOptions;
         const licType = params.asc_getLicenseType();

diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
@@ -585,6 +585,12 @@ class MainController extends Component {
         this.api.asc_setFilteringMode && this.api.asc_setFilteringMode(storeAppOptions.canModifyFilter);
     }
 
+    insertImageFromStorage (data) {
+        if (data && data._urls && (!data.c || data.c === 'add') && data._urls.length > 0) {
+            this.api.asc_addImageDrawingObject(data._urls, undefined, data.token);
+        }
+    }
+
     onNeedUpdateExternalReference() {
         const { t } = this.props;
 
@@ -732,6 +738,7 @@ class MainController extends Component {
         Common.Gateway.on('processrightschange',    this.onProcessRightsChange.bind(this));
         Common.Gateway.on('downloadas',             this.onDownloadAs.bind(this));
         Common.Gateway.on('requestclose',           this.onRequestClose.bind(this));
+        Common.Gateway.on('insertimage',            this.insertImage.bind(this));
 
         Common.Gateway.sendInfo({
             mode: appOptions.isEdit ? 'edit' : 'view'
@@ -750,6 +757,30 @@ class MainController extends Component {
         appOptions.changeDocReady(true);
     }
 
+    insertImage (data) {
+        if (data && (data.url || data.images)) {
+            if (data.url) { 
+                console.log("Obsolete: The 'url' parameter of the 'insertImage' method is deprecated. Please use 'images' parameter instead.");
+            }
+
+            let arr = [];
+
+            if (data.images && data.images.length > 0) {
+                for (let i = 0; i < data.images.length; i++) {
+                    if (data.images[i] && data.images[i].url) {
+                        arr.push(data.images[i].url);
+                    }
+                }
+            } else if (data.url) {
+                arr.push(data.url);
+            }
+
+            data._urls = arr;
+        }
+
+        this.insertImageFromStorage(data);
+    }
+
     applyMode (appOptions) {
         this.api.asc_enableKeyEvents(appOptions.isEdit);