[pkg] build snap from scratch

this is mainly a workaround for #497

3 files changed, 31 insertions, 16 deletions

diff --git a/gui/build.sh b/gui/build.sh
index 0a6e681..56e3d66 100755
--- a/gui/build.sh
+++ b/gui/build.sh
@@ -6,6 +6,7 @@ set -e
 # --------------------
 
 XBUILD=${XBUILD-no}
+LRELEASE=${LRELEASE-lrelease}
 VENDOR_PATH=${VENDOR_PATH-providers/riseup}
 
 OSX_TARGET=10.11
@@ -18,6 +19,7 @@ SOURCE_GOLIB=gui/backend.go
 
 QTBUILD=build/qt
 RELEASE=$QTBUILD/release
+DEBUGP=$QTBUILD/debug
 
 PLATFORM=$(uname -s)
 LDFLAGS=""
@@ -75,29 +77,37 @@ function buildQmake {
     echo "[+] Now building Qml app with Qt qmake"
     echo "[+] Using qmake in:" $QMAKE
     mkdir -p $QTBUILD
-    $QMAKE -o "$QTBUILD/Makefile" CONFIG-=debug CONFIG+=release VENDOR_PATH=${VENDOR_PATH} $PROJECT
+    $QMAKE -o "$QTBUILD/Makefile" CONFIG+=release VENDOR_PATH=${VENDOR_PATH} $PROJECT
+    #CONFIG=+force_debug_info CONFIG+=debug CONFIG+=debug_and_release
 }
 
 function renameOutput {
     # i would expect that passing QMAKE_TARGET would produce the right output, but nope.
     if [ "$PLATFORM" == "Linux" ]
     then
-    	mv $RELEASE/bitmask $RELEASE/$TARGET
-    	strip $RELEASE/$TARGET
-    	echo "[+] Binary is in" $RELEASE/$TARGET
+        if [ "$DEBUG" == "1" ]
+        then
+          echo "[+] Selecting DEBUG build"
+          mv $DEBUGP/bitmask $RELEASE/$TARGET
+        else
+          echo "[+] Selecting RELEASE build"
+          mv $RELEASE/bitmask $RELEASE/$TARGET
+          strip $RELEASE/$TARGET
+        fi
+        echo "[+] Binary is in" $RELEASE/$TARGET
     elif  [ "$PLATFORM" == "Darwin" ]
     then
-    	rm -rf $RELEASE/$TARGET.app
-    	mv $RELEASE/bitmask.app/ $RELEASE/$TARGET.app/
-    	echo "[+] App is in" $RELEASE/$TARGET
+        rm -rf $RELEASE/$TARGET.app
+        mv $RELEASE/bitmask.app/ $RELEASE/$TARGET.app/
+        echo "[+] App is in" $RELEASE/$TARGET
     else # for MINGWIN or CYGWIN
-    	mv $RELEASE/bitmask.exe $RELEASE/$TARGET.exe
+        mv $RELEASE/bitmask.exe $RELEASE/$TARGET.exe
     fi
 }
 
 function buildDefault {
     echo "[+] Building BitmaskVPN"
-    lrelease bitmask.pro
+    $LRELEASE bitmask.pro
     if [ "$BUILD_GOLIB" == "yes" ]
     then
         buildGoLib
diff --git a/gui/providers/providers.json b/gui/providers/providers.json
index d0d3a62..0de5900 100644
--- a/gui/providers/providers.json
+++ b/gui/providers/providers.json
@@ -15,7 +15,7 @@
             "apiURL": "https://api.black.riseup.net/",
             "geolocationAPI": "https://api.black.riseup.net:9001/json",
             "caCertString": "-----BEGIN CERTIFICATE-----\nMIIFjTCCA3WgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBZMRgwFgYDVQQKDA9SaXNl\ndXAgTmV0d29ya3MxGzAZBgNVBAsMEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UE\nAwwXUmlzZXVwIE5ldHdvcmtzIFJvb3QgQ0EwHhcNMTQwNDI4MDAwMDAwWhcNMjQw\nNDI4MDAwMDAwWjBZMRgwFgYDVQQKDA9SaXNldXAgTmV0d29ya3MxGzAZBgNVBAsM\nEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UEAwwXUmlzZXVwIE5ldHdvcmtzIFJv\nb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC76J4ciMJ8Sg0m\nTP7DF2DT9zNe0Csk4myoMFC57rfJeqsAlJCv1XMzBmXrw8wq/9z7XHv6n/0sWU7a\n7cF2hLR33ktjwODlx7vorU39/lXLndo492ZBhXQtG1INMShyv+nlmzO6GT7ESfNE\nLliFitEzwIegpMqxCIHXFuobGSCWF4N0qLHkq/SYUMoOJ96O3hmPSl1kFDRMtWXY\niw1SEKjUvpyDJpVs3NGxeLCaA7bAWhDY5s5Yb2fA1o8ICAqhowurowJpW7n5ZuLK\n5VNTlNy6nZpkjt1QycYvNycffyPOFm/Q/RKDlvnorJIrihPkyniV3YY5cGgP+Qkx\nHUOT0uLA6LHtzfiyaOqkXwc4b0ZcQD5Vbf6Prd20Ppt6ei0zazkUPwxld3hgyw58\nm/4UIjG3PInWTNf293GngK2Bnz8Qx9e/6TueMSAn/3JBLem56E0WtmbLVjvko+LF\nPM5xA+m0BmuSJtrD1MUCXMhqYTtiOvgLBlUm5zkNxALzG+cXB28k6XikXt6MRG7q\nhzIPG38zwkooM55yy5i1YfcIi5NjMH6A+t4IJxxwb67MSb6UFOwg5kFokdONZcwj\nshczHdG9gLKSBIvrKa03Nd3W2dF9hMbRu//STcQxOailDBQCnXXfAATj9pYzdY4k\nha8VCAREGAKTDAex9oXf1yRuktES4QIDAQABo2AwXjAdBgNVHQ4EFgQUC4tdmLVu\nf9hwfK4AGliaet5KkcgwDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMBAf8wHwYD\nVR0jBBgwFoAUC4tdmLVuf9hwfK4AGliaet5KkcgwDQYJKoZIhvcNAQENBQADggIB\nAGzL+GRnYu99zFoy0bXJKOGCF5XUXP/3gIXPRDqQf5g7Cu/jYMID9dB3No4Zmf7v\nqHjiSXiS8jx1j/6/Luk6PpFbT7QYm4QLs1f4BlfZOti2KE8r7KRDPIecUsUXW6P/\n3GJAVYH/+7OjA39za9AieM7+H5BELGccGrM5wfl7JeEz8in+V2ZWDzHQO4hMkiTQ\n4ZckuaL201F68YpiItBNnJ9N5nHr1MRiGyApHmLXY/wvlrOpclh95qn+lG6/2jk7\n3AmihLOKYMlPwPakJg4PYczm3icFLgTpjV5sq2md9bRyAg3oPGfAuWHmKj2Ikqch\nTd5CHKGxEEWbGUWEMP0s1A/JHWiCbDigc4Cfxhy56CWG4q0tYtnc2GMw8OAUO6Wf\nXu5pYKNkzKSEtT/MrNJt44tTZWbKV/Pi/N2Fx36my7TgTUj7g3xcE9eF4JV2H/sg\ntsK3pwE0FEqGnT4qMFbixQmc8bGyuakr23wjMvfO7eZUxBuWYR2SkcP26sozF9PF\ntGhbZHQVGZUTVPyvwahMUEhbPGVerOW0IYpxkm0x/eaWdTc4vPpf/rIlgbAjarnJ\nUN9SaWRlWKSdP4haujnzCoJbM7dU9bjvlGZNyXEekgeT0W2qFeGGp+yyUWw8tNsp\n0BuC1b7uW/bBn/xKm319wXVDvBgZgcktMolak39V7DVO\n-----END CERTIFICATE-----",
-            "timeStamp": "2021-02-08 23:57:09"
+            "timeStamp": "2021-05-04 12:59:11"
         }
     ]
 }
\ No newline at end of file
diff --git a/gui/qml/main.qml b/gui/qml/main.qml
index cc984f0..5ea3c27 100644
--- a/gui/qml/main.qml
+++ b/gui/qml/main.qml
@@ -1,12 +1,11 @@
 import QtQuick 2.9
-import QtQuick.Window 2.2
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs 1.2 // TODO use native dialogs in labs.platform
 import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick.Controls 2.4
 
 import Qt.labs.platform 1.0
 
-Window {
+ApplicationWindow {
     id: app
     visible: true
     width: 500
@@ -20,6 +19,11 @@ Window {
     property var loginDone
     property var allowEmptyPass
 
+    onSceneGraphError: function(error, msg) {
+        console.debug("ERROR while initializing scene")
+        console.debug(msg)
+    }
+
     // TODO get a nice background color for this mainwindow. It should be customizable.
     // TODO refactorize all this mess into discrete components.
     TabBar {
@@ -165,6 +169,7 @@ Window {
                         backend.useLocation(currentText.toString())
                     }
 
+
                     delegate: ItemDelegate {
                         // TODO: we could use icons
                         // https://doc.qt.io/qt-5/qml-qtquick-controls2-abstractbutton.html#icon-prop
@@ -482,10 +487,10 @@ Window {
             systray.icon.source = icons["off"]
             tooltip = qsTr("Checking status…")
             console.debug("systray init completed")
-            hide()
+            //hide()
             if (systrayVisible) {
                 console.log("show systray")
-                show()
+                //show()
                 if (Qt.platform.os === "windows") {
                     let appname = ctx ? ctx.appName : "VPN"
                     showNotification(