Browse Source

Removed electron from user agent, because whatsapp user agent parsing server side is poorly functional

pull/2205/head
mxb 6 years ago
parent
commit
4b35ecbd25
  1. 15
      app/ux/WebView.js

15
app/ux/WebView.js

@ -178,7 +178,7 @@ Ext.define('Rambox.ux.WebView',{
,autosize: 'on' ,autosize: 'on'
,webpreferences: '' //,nativeWindowOpen=yes ,webpreferences: '' //,nativeWindowOpen=yes
//,disablewebsecurity: 'on' // Disabled because some services (Like Google Drive) dont work with this enabled //,disablewebsecurity: 'on' // Disabled because some services (Like Google Drive) dont work with this enabled
,useragent: ipc.sendSync('getConfig').user_agent ? ipc.sendSync('getConfig').user_agent : Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent') ,useragent: me.getUserAgent()
,preload: './resources/js/rambox-service-api.js' ,preload: './resources/js/rambox-service-api.js'
} }
}]; }];
@ -188,6 +188,13 @@ Ext.define('Rambox.ux.WebView',{
return cfg; return cfg;
} }
,getUserAgent: function() {
var ua = ipc.sendSync('getConfig').user_agent ? ipc.sendSync('getConfig').user_agent : Ext.getStore('ServicesList').getById(this.record.get('type')).get('userAgent')
if(ua.length === 0) {
ua = window.clientInformation.userAgent.replace(/Electron\/([0-9]\.?)+\s/,'');
}
return ua;
}
,statusBarConstructor: function(floating) { ,statusBarConstructor: function(floating) {
var me = this; var me = this;
@ -300,7 +307,7 @@ Ext.define('Rambox.ux.WebView',{
,src: e.url ,src: e.url
,style: 'width:100%;height:100%;' ,style: 'width:100%;height:100%;'
,partition: me.getWebView().partition ,partition: me.getWebView().partition
,useragent: ipc.sendSync('getConfig').user_agent ? ipc.sendSync('getConfig').user_agent : Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent') ,useragent: me.getUserAgent()
} }
} }
}).show(); }).show();
@ -328,7 +335,7 @@ Ext.define('Rambox.ux.WebView',{
,src: e.url ,src: e.url
,style: 'width:100%;height:100%;' ,style: 'width:100%;height:100%;'
,partition: me.getWebView().partition ,partition: me.getWebView().partition
,useragent: ipc.sendSync('getConfig').user_agent ? ipc.sendSync('getConfig').user_agent : Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent') ,useragent: me.getUserAgent()
} }
} }
}).show(); }).show();
@ -358,7 +365,7 @@ Ext.define('Rambox.ux.WebView',{
,src: e.url ,src: e.url
,style: 'width:100%;height:100%;' ,style: 'width:100%;height:100%;'
,partition: me.getWebView().partition ,partition: me.getWebView().partition
,useragent: ipc.sendSync('getConfig').user_agent ? ipc.sendSync('getConfig').user_agent : Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent') ,useragent: me.getUserAgent()
,preload: './resources/js/rambox-modal-api.js' ,preload: './resources/js/rambox-modal-api.js'
} }
} }

Loading…
Cancel
Save