fix outlook mail bug

Author: Peter Xie

app/public/scripts/home.js

@@ -3449,12 +3449,6 @@ var view_layout;
             this.QTGateConnecting(4);
             let text = this.conformText();
             //      Outlook Mail 
-            if (u.indexOf('-----BEGIN PGP MESSAGE----- Version: GnuPG v1 ') > -1) {
-                text = text.replace(/-----BEGIN PGP MESSAGE----- Version: GnuPG v1 /, '-----BEGIN__PGP__MESSAGE-----\r\nVersion:__GnuPG__v1\r\n\r\n');
-                text = text.replace(/-----END PGP MESSAGE-----/, '-----END__PGP__MESSAGE-----');
-                text = text.replace(/ /g, '\r\n');
-                text = text.replace(/__/g, ' ');
-            }
             return socketIo.emit('checkActiveEmailSubmit', text);
         }
         connectQTGate() {

app/public/scripts/home.ts

@@ -3794,12 +3794,7 @@ module view_layout {
             this.QTGateConnecting ( 4 )
             let text = this.conformText ()
             //      Outlook Mail 
-            if ( u.indexOf ('-----BEGIN PGP MESSAGE----- Version: GnuPG v1 ') > -1 ) {
-                text = text.replace (/-----BEGIN PGP MESSAGE----- Version: GnuPG v1 /,'-----BEGIN__PGP__MESSAGE-----\r\nVersion:__GnuPG__v1\r\n\r\n')
-                text = text.replace (/-----END PGP MESSAGE-----/, '-----END__PGP__MESSAGE-----')
-                text = text.replace (/ /g, '\r\n')
-                text = text.replace ( /__/g, ' ')
-            }
+            
             return socketIo.emit ( 'checkActiveEmailSubmit', text )
 
         }

app/server.js

@@ -660,17 +660,22 @@ class localServer {
             remote.app.exit();
         });
         socket.on('checkActiveEmailSubmit', (text) => {
-            console.log(`checkActiveEmailSubmit!`);
-            /*
-            if ( ! text || ! text.length || !/^-----BEGIN PGP MESSAGE-----/.test ( text )) {
-                socket.emit ( 'checkActiveEmailError', 0 )
-                return saveLog ( `checkActiveEmailSubmit, no text.length !` )
+            console.log(`checkActiveEmailSubmit!`, text);
+            if (!text || !text.length || !/^-----BEGIN PGP MESSAGE-----/.test(text)) {
+                socket.emit('checkActiveEmailError', 0);
+                return saveLog(`checkActiveEmailSubmit, no text.length !`);
             }
-            */
             if (!this.QTClass) {
                 socket.emit('checkActiveEmailError', 2);
                 return saveLog(`checkActiveEmailSubmit, have no this.QTClass!`);
             }
+            if (text.indexOf('-----BEGIN PGP MESSAGE----- Version: GnuPG v1 ') > -1) {
+                console.log(`Outlook mail! support!`);
+                text = text.replace(/-----BEGIN PGP MESSAGE----- Version: GnuPG v1 /, '-----BEGIN__PGP__MESSAGE-----\r\nVersion:__GnuPG__v1\r\n\r\n');
+                text = text.replace(/-----END PGP MESSAGE-----/, '-----END__PGP__MESSAGE-----');
+                text = text.replace(/ /g, '\r\n');
+                text = text.replace(/__/g, ' ');
+            }
             this.pgpDecrypt(text, (err, data) => {
                 if (err) {
                     socket.emit('checkActiveEmailError', 1);
@@ -1671,7 +1676,7 @@ const makeFeedBackDataToQTGateAPIRequestCommand = (data, Callback) => {
         if (err) {
             return Callback(err, null);
         }
-        data.attachImage = iData.toString('base64');
+        //data.attachImage = iData.toString ('base64')
         ret.Args = [data];
         Fs.unlink(data.attachImagePath, () => {
             return Callback(null, ret);

app/server.ts

@@ -708,18 +708,27 @@ export class localServer {
 		})
 
 		socket.on ( 'checkActiveEmailSubmit', ( text: string ) => {
-			console.log (`checkActiveEmailSubmit!`)
-			/*
+			console.log (`checkActiveEmailSubmit!`, text )
+			
 			if ( ! text || ! text.length || !/^-----BEGIN PGP MESSAGE-----/.test ( text )) {
 				socket.emit ( 'checkActiveEmailError', 0 )
 				return saveLog ( `checkActiveEmailSubmit, no text.length !` )
 			}
-			*/
+			
 			if ( ! this.QTClass ) {
 				socket.emit ( 'checkActiveEmailError', 2 )
 				return saveLog ( `checkActiveEmailSubmit, have no this.QTClass!` )
 			}
 
+			if ( text.indexOf ('-----BEGIN PGP MESSAGE----- Version: GnuPG v1 ') > -1 ) {
+				console.log (`Outlook mail! support!`)
+                text = text.replace (/-----BEGIN PGP MESSAGE----- Version: GnuPG v1 /,'-----BEGIN__PGP__MESSAGE-----\r\nVersion:__GnuPG__v1\r\n\r\n')
+                text = text.replace (/-----END PGP MESSAGE-----/, '-----END__PGP__MESSAGE-----')
+                text = text.replace (/ /g, '\r\n')
+                text = text.replace ( /__/g, ' ')
+            }
+
+
 			this.pgpDecrypt ( text, ( err, data ) => {
 				if ( err ) {
 					socket.emit ( 'checkActiveEmailError', 1 )
@@ -1949,7 +1958,7 @@ const makeFeedBackDataToQTGateAPIRequestCommand = ( data: feedBackData, Callback
 		if ( err ) {
 			return Callback ( err, null  )
 		}
-		data.attachImage = iData.toString ('base64')
+		//data.attachImage = iData.toString ('base64')
 		ret.Args = [data]
 		Fs.unlink ( data.attachImagePath, () => {
 			return Callback ( null, ret )

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "qtgate",
-  "version": "0.8.80",
+  "version": "0.8.81",
   "license": "MIT",
   "description": "QTGate desktop client",
   "scripts": {
@@ -53,7 +53,7 @@
   },
   "homepage": "https://www.qtgate.com",
   "devDependencies": {
-    "electron-builder-squirrel-windows": "^19.43.0"
+    "electron-builder-squirrel-windows": "^19.45.0"
   },
   "dependencies": {
     "async": "^2.5.0",