Merge pull request #514 from amnezia-vpn/fix/android-camera

Hide "QR-code" button from config import menu for Android devices wit…

client/ui/controllers/settingsController.cpp

@@ -206,3 +206,14 @@ void SettingsController::toggleScreenshotsEnabled(bool enable)
     });
 #endif
 }
+
+bool SettingsController::isCameraPresent()
+{
+#if defined Q_OS_IOS
+    return true;
+#elif defined Q_OS_ANDROID
+    return AndroidController::instance()->isCameraPresent();
+#else
+    return false;
+#endif
+}

client/ui/controllers/settingsController.h

@@ -59,6 +59,8 @@ public slots:
     bool isScreenshotsEnabled();
     void toggleScreenshotsEnabled(bool enable);
 
+    bool isCameraPresent();
+
 signals:
     void primaryDnsChanged();
     void secondaryDnsChanged();

client/ui/qml/Pages2/PageSetupWizardConfigSource.qml

@@ -90,7 +90,7 @@ It's okay as long as it's from someone you trust.")
 
             LabelWithButtonType {
                 Layout.fillWidth: true
-                visible: GC.isMobile()
+                visible: SettingsController.isCameraPresent()
 
                 text: qsTr("QR-code")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
@@ -105,7 +105,7 @@ It's okay as long as it's from someone you trust.")
             }
 
             DividerType {
-                visible: GC.isMobile()
+                visible: SettingsController.isCameraPresent()
             }
 
             LabelWithButtonType {