[pkg] put desktop place in gui folder for snaps

this was left out of the packaging refactor by mistake.

- Resolves: #368

Makefile

@@ -237,7 +237,6 @@ ifeq (${PLATFORM}, linux)
 	@mkdir -p build/${PROVIDER}/snap/gui
 ifeq (${VENDOR_PATH}, providers)
 	@cp ${VENDOR_PATH}/${PROVIDER}/assets/icon.svg build/${PROVIDER}/snap/gui/icon.svg
-	# FIXME is this png needed?? then add it to ASSETS_REQUIRED
 	@cp ${VENDOR_PATH}/${PROVIDER}/assets/icon.png build/${PROVIDER}/snap/gui/${PROVIDER}-vpn.png
 else
 	@cp ${VENDOR_PATH}/assets/icon.svg build/${PROVIDER}/snap/gui/icon.svg
@@ -262,6 +261,7 @@ package_snap_in_docker:
 
 package_snap:
 	@unlink snap || true
+	@cp build/${PROVIDER}/snap/local/${TARGET}.desktop build/${PROVIDER}/snap/gui/
 	@ln -s build/${PROVIDER}/snap snap
 	@make -C build/${PROVIDER} pkg_snap
 

bitmask.pro

@@ -64,3 +64,8 @@ CONFIG += lrelease embed_translations
 
 TRANSLATIONS += $$files(gui/i18n/*.ts, true)
 RESOURCES += $$files(gui/i18n/*.qm, true)
+
+# see https://stackoverflow.com/questions/5960192/qml-qt-openurlexternally#5960581
+# Needed for bringing browser from background to foreground using
+# QDesktopServices: https://bugreports.qt.io/browse/QTBUG-8336
+TARGET.CAPABILITY += SwEvent

branding/templates/snap/local/app.desktop

@@ -6,7 +6,7 @@ Comment=Anonymous VPN
 Comment[es]=VPN Anonima
 Comment[de]=Anonymous VPN
 Path=/snap/bin/
-Exec="/snap/bin/${binaryName}.launcher"
+Exec=${binaryName}.launcher
 Terminal=false
 Icon=${SNAP}/meta/gui/${binaryName}.png
 Categories=Network;Application;

gui/providers/providers.json

@@ -6,7 +6,7 @@
             "applicationName": "RiseupVPN",
             "binaryName": "riseup-vpn",
             "auth": "anon",
-            "authEmptyPass": null,
+            "authEmptyPass": false,
             "providerURL": "riseup.net",
             "tosURL": "https://riseup.net/tos",
             "helpURL": "https://riseup.net/support",
@@ -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": "2020-10-09 22:41:19"
+            "timeStamp": "2020-11-03 19:53:36"
         }
     ]
 }
\ No newline at end of file

gui/qml/DonateDialog.qml

@@ -18,7 +18,7 @@ MessageDialog {
 
     onAccepted: {
         if (backend) {
-            Qt.openUrlExternally(ctx.donateURL)
+            Qt.openUrlExternally(Qt.resolvedUrl(ctx.donateURL))
             backend.donateAccepted()
         }
     }

gui/qml/main.qml

@@ -242,7 +242,11 @@ ApplicationWindow {
 
             MenuItem {
                 text: qsTr("Help...")
-                onTriggered: Qt.openUrlExternally(ctx.helpURL)
+
+                onTriggered: {
+                    console.debug(Qt.resolvedUrl(ctx.helpURL));
+                    Qt.openUrlExternally(Qt.resolvedUrl(ctx.helpURL))
+                }
             }
 
             MenuItem {

tests/test_ui.cpp

 // test_ui.cpp
-#include <QtQuickTest>
+#include <QtQuickTest/quicktest.h>
 #include <QQmlEngine>
 #include <QQmlContext>