diff --git a/app/config/config.go b/app/config/config.go index bae5342d9..d4cb665ce 100644 --- a/app/config/config.go +++ b/app/config/config.go @@ -17,7 +17,7 @@ import ( var AppName = "textsecure.nanuc" -var AppVersion = "0.4.6" +var AppVersion = "0.6.0" // Do not allow sending attachments larger than 100M for now var MaxAttachmentSize int64 = 100 * 1024 * 1024 diff --git a/axolotl-web/src/App.vue b/axolotl-web/src/App.vue index 663f629ff..56a537e0b 100644 --- a/axolotl-web/src/App.vue +++ b/axolotl-web/src/App.vue @@ -45,47 +45,47 @@ export default { // "Your screen resolution is: " + screen.width + "x" + screen.height+"
"+navigator.userAgent; // const viewportmeta = document.querySelector('meta[name=viewport]'); // viewportmeta.setAttribute('content', "initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0"); - console.log('websocket: start injection'); - var that = this; - function initWebSocket() { - window.blobsaverSocket = new WebSocket('ws://localhost:12345'); - - window.blobsaverSocket.onclose = function() { - console.error('BlobSaver: websocket closed'); - }; - - window.blobsaverSocket.onerror = function(error) { - console.error('BlobSaver: websocket', error); - }; - - window.blobsaverSocket.onopen = function() { - console.log('BlobSaver: websocket opened'); - }; - window.blobsaverSocket.onmessage = function (event) { - console.log(event.data); - that.$store.dispatch("addDesktopSync",event.data); - } - } - - window.addEventListener('load', initWebSocket, false); - - window.URL.createObjectURL = function(obj) { - // TODO check if the obj is a blob - - console.log('BlobSaver: createObjectURL interceptor'); - - var reader = new FileReader(); - reader.readAsDataURL(obj); - reader.onloadend = function() { - console.log('BlobSaver: createObjectURL sending message'); - window.blobsaverSocket.send({type:file, - data:reader.result}); - }; - - throw 'stop'; // Throw an error here to stop execution (continuing execution would likely result in an error from the download manager) - }; - - console.log('websocket: end injection'); + // console.log('websocket: start injection'); + // var that = this; + // function initWebSocket() { + // window.blobsaverSocket = new WebSocket('ws://localhost:12345'); + // + // window.blobsaverSocket.onclose = function() { + // console.error('BlobSaver: websocket closed'); + // }; + // + // window.blobsaverSocket.onerror = function(error) { + // console.error('BlobSaver: websocket', error); + // }; + // + // window.blobsaverSocket.onopen = function() { + // console.log('BlobSaver: websocket opened'); + // }; + // window.blobsaverSocket.onmessage = function (event) { + // console.log(event.data); + // that.$store.dispatch("addDesktopSync",event.data); + // } + // } + // + // window.addEventListener('load', initWebSocket, false); + // + // window.URL.createObjectURL = function(obj) { + // // TODO check if the obj is a blob + // + // console.log('BlobSaver: createObjectURL interceptor'); + // + // var reader = new FileReader(); + // reader.readAsDataURL(obj); + // reader.onloadend = function() { + // console.log('BlobSaver: createObjectURL sending message'); + // window.blobsaverSocket.send({type:file, + // data:reader.result}); + // }; + // + // throw 'stop'; // Throw an error here to stop execution (continuing execution would likely result in an error from the download manager) + // }; + // + // console.log('websocket: end injection'); }, computed: { error () { diff --git a/axolotl-web/src/main.js b/axolotl-web/src/main.js index c60dc7bfe..67d3dc62d 100644 --- a/axolotl-web/src/main.js +++ b/axolotl-web/src/main.js @@ -21,7 +21,7 @@ Vue.use(BootstrapVue) Vue.config.productionTip = false var websocketAdress = "ws://[::1]:9080/ws"; if(process.env.NODE_ENV=="development") - websocketAdress = 'ws://localhost:9080/ws'; + websocketAdress = 'ws://10.0.10.196:9080/ws'; Vue.use(VueNativeSock, websocketAdress, { store: store, // format: 'json', diff --git a/axolotl-web/src/pages/MessageList.vue b/axolotl-web/src/pages/MessageList.vue index 8140944ff..8071fc722 100644 --- a/axolotl-web/src/pages/MessageList.vue +++ b/axolotl-web/src/pages/MessageList.vue @@ -2,7 +2,7 @@