Code cleanup

.travis.yml

@@ -164,6 +164,7 @@ jobs:
 # ------------------------------------------------------
     - name: Linux
       os: linux
+      language: cpp
       dist: focal
 
       addons:

client/client.pro

@@ -11,9 +11,6 @@ IS_CI=$$(CI)
 }
 
 CONFIG += qtquickcompiler
-CONFIG += qzxing_multimedia \
-          enable_decoder_qr_code \
-          enable_encoder_qr_code
 
 include("3rd/QtSsh/src/ssh/qssh.pri")
 include("3rd/QtSsh/src/botan/botan.pri")
@@ -247,13 +244,11 @@ android {
    INCLUDEPATH += platforms/android
 
    HEADERS += \
-      platforms/android/native.h \
       platforms/android/android_controller.h \
       platforms/android/android_notificationhandler.h \
       protocols/android_vpnprotocol.h
 
    SOURCES += \
-      platforms/android/native.cpp \
       platforms/android/android_controller.cpp \
       platforms/android/android_notificationhandler.cpp \
       protocols/android_vpnprotocol.cpp

client/main.cpp

@@ -9,10 +9,6 @@
 #include "Windows.h"
 #endif
 
-#if defined(Q_OS_ANDROID)
-#include "native.h"
-#endif
-
 #if defined(Q_OS_IOS)
 #include "platforms/ios/QtAppDelegate-C-Interface.h"
 #endif
@@ -46,10 +42,6 @@ int main(int argc, char *argv[])
     AllowSetForegroundWindow(0);
 #endif
 
-#if defined(Q_OS_ANDROID)
-    NativeHelpers::registerApplicationInstance(&app);
-#endif
-
 #if defined(Q_OS_IOS)
     QtAppDelegateInitialize();
 #endif

client/platforms/android/native.cpp

@@ -1,54 +0,0 @@
-#include "native.h"
-#include <QMetaObject>
-#if defined(Q_OS_ANDROID)
-    #include <jni.h>
-#endif // Q_OS_ANDROID
-
-
-QObject *NativeHelpers::application_p_ = 0;
-
-#if defined(Q_OS_ANDROID)
-
-// define our native static functions
-// these are the functions that Java part will call directly from Android UI thread
-static void onPermissionsGranted(JNIEnv * /*env*/, jobject /*obj*/)
-{
-    QMetaObject::invokeMethod(NativeHelpers::getApplicationInstance(), "onPermissionsGranted"
-                              , Qt::QueuedConnection);
-}
-
-static void onPermissionsDenied(JNIEnv * /*env*/, jobject /*obj*/)
-{
-    QMetaObject::invokeMethod(NativeHelpers::getApplicationInstance(), "onPermissionsDenied"
-                              , Qt::QueuedConnection);
-}
-
-//create a vector with all our JNINativeMethod(s)
-static JNINativeMethod methods[] = {
-    {"onPermissionsGranted", "()V", (void *)onPermissionsGranted},
-    {"onPermissionsDenied", "()V", (void *)onPermissionsDenied},
-};
-
-// this method is called automatically by Java after the .so file is loaded
-JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/)
-{
-    JNIEnv* env;
-    // get the JNIEnv pointer.
-    if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK)
-      return JNI_ERR;
-
-    // search for Java class which declares the native methods
-    jclass javaClass = env->FindClass("org/ftylitak/qzxing/NativeFunctions");
-    if (!javaClass)
-      return JNI_ERR;
-
-    // register our native methods
-    if (env->RegisterNatives(javaClass, methods,
-                          sizeof(methods) / sizeof(methods[0])) < 0) {
-      return JNI_ERR;
-    }
-
-    return JNI_VERSION_1_6;
-}
-
-#endif // Q_OS_ANDROID

client/platforms/android/native.h

@@ -1,20 +0,0 @@
-#ifndef NATIVE_H
-#define NATIVE_H
-
-#include <QObject>
-
-class NativeHelpers {
-public:
-    static void registerApplicationInstance(QObject *app_p) {
-        application_p_ = app_p;
-    }
-
-    static QObject* getApplicationInstance() {
-        return application_p_;
-    }
-
-private:
-    static QObject *application_p_;
-};
-
-#endif // NATIVE_H

client/ui/qml/Pages/PageNetworkSetting.qml

@@ -87,7 +87,7 @@ If AmneziaDNS service is not installed on the same server, or this option is unc
         anchors.topMargin: 20
         width: parent.width - 60
         height: 21
-        text: qsTr("Secondray DNS server")
+        text: qsTr("Secondary DNS server")
     }
     TextFieldType {
         id: dns2

client/ui/qml/Pages/PageStart.qml

@@ -127,6 +127,7 @@ PageBase {
 
         BlueButtonType {
             id: qr_code_import
+            visible: GC.isMobile()
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.top: qr_code_import_open.bottom
             anchors.topMargin: 10