From 3bc92bf6b1cf9e67ac33cc407a2217ae7e184ffb Mon Sep 17 00:00:00 2001
From: Aaron Kimmig <aaron@convive.io>
Date: Sat, 14 Sep 2019 22:54:34 +0200
Subject: [PATCH] version change 0.6.0, fix scrolling

---
 app/config/config.go                  |  2 +-
 axolotl-web/src/App.vue               | 82 +++++++++++++--------------
 axolotl-web/src/main.js               |  2 +-
 axolotl-web/src/pages/MessageList.vue | 25 ++++----
 click/manifest.json                   |  2 +-
 docs/CHANGELOG.md                     |  9 +++
 qml/ut/MainUt.qml                     | 38 ++++++-------
 7 files changed, 87 insertions(+), 73 deletions(-)

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+"<br>"+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 @@
 <template>
   <div class="chat">
     <div class="chatList-container">
-      <div id="messageList" class="chatList row" v-if="messages && messages.length>0" v-chat-scroll="{always: false, smooth: true}" v-on:scroll="handleScroll">
+      <div id="messageList" class="chatList row" v-if="messages && messages.length>0" v-chat-scroll="{always: false, smooth: true}" @scroll="handleScroll($event)">
 
           <div v-for="message in messages.slice().reverse()" :class="{'col-12':true, 'sent':message.Outgoing, 'reply':!message.Outgoing}" >
             <div class="row w-100">
@@ -88,8 +88,10 @@ export default {
       }
     },
     handleScroll (event) {
+      console.log(event)
 
-      if(event.target.scrollTop==0){
+      if(event.target.scrollTop<50){
+        console.log("load more messages")
         this.$store.dispatch("getMoreMessages");
       }
       // Any code to be executed when the window is scrolled
@@ -110,11 +112,7 @@ export default {
     back(){
       this.$router.go(-1)
     },scrollDown(){
-      if(!this.scrolled){
-        var objDiv = document.getElementById("messageList");
-        objDiv.scrollTop = objDiv.scrollHeight;
-        this.scrolled=true;
-      }
+      window.scrollTo(0,document.body.scrollHeight);
     }
 
   },
@@ -124,7 +122,15 @@ export default {
   mounted(){
     this.$store.dispatch("getMessageList", this.getId());
     setTimeout(this.scrollDown
-    , 500)
+    , 800)
+      document.addEventListener("scroll", (e) => {
+        var scrolled = document.scrollingElement.scrollTop;
+        console.log(scrolled)
+        if(scrolled==0){
+          console.log("load more messages")
+          this.$store.dispatch("getMoreMessages");
+        }
+      });
   },
   computed: {
     messages () {
@@ -140,7 +146,6 @@ export default {
   text-align: left;
 }
 .chatList{
-  height:calc(100vh - 200px);
   overflow: hidden auto;
   -ms-overflow-style: none;
   scrollbar-width: none;
@@ -160,7 +165,7 @@ export default {
   scrollbar-width: none;
 }
 .chatList > div:last-child {
-    padding-bottom: 50px;
+    padding-bottom: 100px;
 }
 .avatar {
     justify-content: center;
diff --git a/click/manifest.json b/click/manifest.json
index 6126a02d0..c1681ecf1 100644
--- a/click/manifest.json
+++ b/click/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "textsecure.nanuc",
-    "version": "0.5.0",
+    "version": "0.6.0",
     "description": "A Signal compatible messaging client for Ubuntu phones",
     "title": "Signal",
     "architecture": "armhf",
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 427d5054f..3432c2151 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,3 +1,12 @@
+0.6.0 (Sept 14 2019) Axolotl-Alpha
+--------------------
+* remove go-qml bindings
+* new ux
+* display attachments inline
+* know bugs because of the complete rewrite of the client:
+** no group creation, no notification config, no content hub integration(no contact import, no saving)
+** no support of encrypted db
+
 0.4.5 (Aug 31 2019)
 --------------------
 * import a singel contact thats not in the contact Book
diff --git a/qml/ut/MainUt.qml b/qml/ut/MainUt.qml
index 86129fc73..1f12ac940 100644
--- a/qml/ut/MainUt.qml
+++ b/qml/ut/MainUt.qml
@@ -14,25 +14,25 @@ UITK.Page {
   property QtObject requestTest
   property QtObject wsClient
   id: root
-  WebSocketServer {
-    id: server
-    listen: true
-    port: 12345
-
-    onClientConnected: {
-      console.log('BlobSaver: websocket server connected');
-      wsClient = webSocket
-      webSocket.onTextMessageReceived.connect(function(base64data) {
-        console.log('base64data');
-        var path = BlobSaver.write(base64data);
-        fileDownloaded(path);
-      });
-    }
-
-    onErrorStringChanged: {
-      console.log('BlobSaver: websocket server error', errorString);
-    }
-  }
+  // WebSocketServer {
+  //   id: server
+  //   listen: true
+  //   port: 12345
+  //
+  //   onClientConnected: {
+  //     console.log('BlobSaver: websocket server connected');
+  //     wsClient = webSocket
+  //     webSocket.onTextMessageReceived.connect(function(base64data) {
+  //       console.log('base64data');
+  //       var path = BlobSaver.write(base64data);
+  //       fileDownloaded(path);
+  //     });
+  //   }
+  //
+  //   onErrorStringChanged: {
+  //     console.log('BlobSaver: websocket server error', errorString);
+  //   }
+  // }
   WebEngineView {
     id: webView
     profile:webProfile