gui: set application name as Bitmask instead of BitmaskVPN

the android app is called as Bitmask, this renames the desktop
app to use the same name and keep the naming consistent across
platforms

branding/templates/qtinstaller/installer.pro

-!defined(INSTALLER, var):INSTALLER= "BitmaskVPN-Installer-git"
+!defined(INSTALLER, var):INSTALLER= "Bitmask-Installer-git"
 !defined(TARGET, var):TARGET= "bitmask-vpn"
 TEMPLATE = aux
 CONFIG -= debug_and_release

gui/build.sh

@@ -8,7 +8,7 @@ set -e
 XBUILD="${XBUILD:-no}"
 LRELEASE="${LRELEASE:-lrelease}"
 VENDOR_PATH="${VENDOR_PATH:-providers/riseup}"
-APPNAME="${APPNAME:-BitmaskVPN}"
+APPNAME="${APPNAME:-Bitmask}"
 LDFLAGS_VER="-X 0xacab.org/leap/bitmask-vpn/pkg/config/version.appVersion=${VERSION}"
 
 OSX_TARGET=12
@@ -124,7 +124,7 @@ function renameOutput {
 }
 
 function buildDefault {
-    echo "[+] Building BitmaskVPN"
+    echo "[+] Building Bitmask"
     if [ "$LRELEASE" != "no" ]
     then
         $LRELEASE bitmask.pro

gui/main.cpp

@@ -128,7 +128,7 @@ int main(int argc, char **argv) {
     providers->loadJson(providerJsonBytes);
     QJsonValue defaultProvider = providers->json().object().value("default");
     QJsonValue providersInfo = providers->json().object().value("providers");
-    QString appName = getProviderConfig(providersInfo, defaultProvider.toString(), "applicationName", "BitmaskVPN");
+    QString appName = getProviderConfig(providersInfo, defaultProvider.toString(), "applicationName", "Bitmask");
     QString organizationDomain = getProviderConfig(providersInfo, defaultProvider.toString(), "providerURL", "riseup.net");
 
     QApplication::setApplicationName(appName);
@@ -230,7 +230,7 @@ int main(int argc, char **argv) {
         app.setWindowIcon(QIcon(":/vendor/calyx.svg"));
     } else if (appName == "RiseupVPN") {
         app.setWindowIcon(QIcon(":/vendor/riseup.svg"));
-    } else if (appName == "BitmaskVPN") {
+    } else if (appName == "Bitmask") {
         app.setWindowIcon(QIcon(":/vendor/bitmask.svg"));
     }
 

gui/main.qml

@@ -167,7 +167,7 @@ ApplicationWindow {
             return "qrc:/themes/Riseup.qml"
         } else if (providerFlavor.startsWith("calyx-vpn") || providerFlavor == "CalyxVPN") {
             return "qrc:/themes/Calyx.qml"
-        } else if (providerFlavor.startsWith("bitmask-vpn") || providerFlavor == "BitmaskVPN") {
+        } else if (providerFlavor.startsWith("bitmask-vpn") || providerFlavor == "Bitmask") {
             return "qrc:/themes/Bitmask.qml"
         } else {
             // we should do a Default theme, with a fallback

providers/vendor.conf

@@ -107,7 +107,7 @@ donateURL           =
 [bitmask]
 
 name                = bitmask
-applicationName     = BitmaskVPN
+applicationName     = Bitmask
 binaryName          = bitmask-vpn
 
 providerURL         = https://demo.bitmask.net