[DE PE SSE mobile] Fix Bug 50794

apps/documenteditor/mobile/locale/en.json

@@ -330,6 +330,7 @@
     "advDRMOptions": "Protected File",
     "txtProtected": "Once you enter the password and open the file, the current password to the file will be reset",
     "textOpenFile": "Enter a password to open the file",
+    "txtIncorrectPwd": "Password is incorrect",
     "textNoTextFound": "Text not found",
     "textReplace": "Replace",
     "textReplaceAll": "Replace All",

apps/documenteditor/mobile/src/controller/Main.jsx

@@ -611,7 +611,8 @@ class MainController extends Component {
         this.api.asc_registerCallback('asc_onAdvancedOptions', (type, advOptions, mode, formatOptions) => {
             const {t} = this.props;
             const _t = t("Settings", { returnObjects: true });
-            onAdvancedOptions(type, advOptions, mode, formatOptions, _t, this._isDocReady, this.props.storeAppOptions.canRequestClose);
+            onAdvancedOptions(type, advOptions, mode, formatOptions, _t, this._isDocReady, this.props.storeAppOptions.canRequestClose, this.isDRM);
+            if(type == Asc.c_oAscAdvancedOptionsID.DRM) this.isDRM = true;
         });
     }
 

apps/documenteditor/mobile/src/controller/settings/Download.jsx

@@ -32,7 +32,7 @@ class DownloadController extends Component {
                     () => {
                         if (format == Asc.c_oAscFileType.TXT) {
                             const isDocReady = this.props.storeAppOptions.isDocReady;
-                            onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.TXT, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, isDocReady);
+                            onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.TXT, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, isDocReady, isDRM);
                         }
                         else {
                             api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
@@ -57,7 +57,7 @@ class DownloadController extends Component {
 
 const DownloadWithTranslation = inject("storeAppOptions")(observer(withTranslation()(DownloadController)));
 
-const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady, canRequestClose) => {
+const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady, canRequestClose, isDRM) => {
     if ($$('.dlg-adv-options.modal-in').length > 0) return;
 
     const api = Common.EditorApi.get();
@@ -134,6 +134,17 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady
                 }
             }
         }];
+
+        if(isDRM) {
+            f7.dialog.create({
+                text: _t.txtIncorrectPwd,
+                buttons : [{
+                    text: 'OK',
+                    bold: true,
+                }]
+            }).open();
+        }
+
         if (canRequestClose)
             buttons.push({
                 text: _t.closeButtonText,

apps/presentationeditor/mobile/locale/en.json

@@ -29,6 +29,7 @@
       "advDRMPassword": "Password",
       "txtProtected": "Once you enter the password and open the file, the current password to the file will be reset",
       "textOpenFile": "Enter a password to open the file",
+      "txtIncorrectPwd": "Password is incorrect",
       "leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
       "titleLicenseExp": "License expired",
       "warnLicenseExp": "Your license has expired. Please update your license and refresh the page.",

apps/presentationeditor/mobile/src/controller/Main.jsx

@@ -300,7 +300,6 @@ class MainController extends Component {
         this.api.asc_registerCallback('asc_onDocumentContentReady', this.onDocumentContentReady.bind(this));
         this.api.asc_registerCallback('asc_onDocumentUpdateVersion', this.onUpdateVersion.bind(this));
         this.api.asc_registerCallback('asc_onServerVersion', this.onServerVersion.bind(this));
-        this.api.asc_registerCallback('asc_onAdvancedOptions', this.onAdvancedOptions.bind(this));
         this.api.asc_registerCallback('asc_onDocumentName', this.onDocumentName.bind(this));
         this.api.asc_registerCallback('asc_onPrintUrl', this.onPrintUrl.bind(this));
         this.api.asc_registerCallback('asc_onPrint', this.onPrint.bind(this));
@@ -310,6 +309,10 @@ class MainController extends Component {
 
         const storePresentationSettings = this.props.storePresentationSettings;
 
+        this.api.asc_registerCallback('asc_onAdvancedOptions', (type, advOptions) => {
+            this.onAdvancedOptions(type, advOptions);
+        });
+
         this.api.asc_registerCallback('asc_onPresentationSize', (width, height) => {
             storePresentationSettings.changeSizeIndex(width, height);
         });
@@ -604,6 +607,17 @@ class MainController extends Component {
                     }
                 }
             }];
+
+            if(this.isDRM) {
+                f7.dialog.create({
+                    text: _t.txtIncorrectPwd,
+                    buttons : [{
+                        text: 'OK',
+                        bold: true,
+                    }]
+                }).open();
+            }
+
             if (this.props.storeAppOptions.canRequestClose)
                 buttons.push({
                     text: _t.closeButtonText,
@@ -620,6 +634,7 @@ class MainController extends Component {
                 buttons: buttons,
                 cssClass: 'dlg-adv-options'
             }).open();
+            this.isDRM = true;
         }
     }
 

apps/spreadsheeteditor/mobile/locale/en.json

@@ -460,6 +460,7 @@
             "closeButtonText": "Close File",
             "txtProtected": "Once you enter the password and open the file, the current password to the file will be reset",
             "textOpenFile": "Enter a password to open the file",
+            "txtIncorrectPwd": "Password is incorrect",
             "textCancel": "Cancel",
             "textUnitOfMeasurement": "Unit Of Measurement",
             "textCentimeter": "Centimeter",

apps/spreadsheeteditor/mobile/src/controller/Main.jsx

@@ -323,7 +323,8 @@ class MainController extends Component {
         this.api.asc_registerCallback('asc_onAdvancedOptions', (type, advOptions, mode, formatOptions) => {
             const {t} = this.props;
             const _t = t("View.Settings", { returnObjects: true });
-            onAdvancedOptions(type, advOptions, mode, formatOptions, _t, this._isDocReady, this.props.storeAppOptions.canRequestClose);
+            onAdvancedOptions(type, advOptions, mode, formatOptions, _t, this._isDocReady, this.props.storeAppOptions.canRequestClose,this.isDRM);
+            if(type == Asc.c_oAscAdvancedOptionsID.DRM) this.isDRM = true;
         });
 
     }

apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx

@@ -39,7 +39,7 @@ class DownloadController extends Component {
 
 const DownloadWithTranslation = withTranslation()(DownloadController);
 
-const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady, canRequestClose) => {
+const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady, canRequestClose, isDRM) => {
     const api = Common.EditorApi.get();
 
     if (type == Asc.c_oAscAdvancedOptionsID.CSV) {
@@ -136,6 +136,16 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady
             }
         }];
 
+        if(isDRM) {
+            f7.dialog.create({
+                text: _t.txtIncorrectPwd,
+                buttons : [{
+                    text: 'OK',
+                    bold: true,
+                }]
+            }).open();
+        }
+
         if (canRequestClose)
             buttons.push({
                 text: _t.closeButtonText,