linters

Author: mcleinman

android/daemon/src/main/java/org/mozilla/firefox/vpn/daemon/Log.kt

@@ -5,10 +5,9 @@
 package org.mozilla.firefox.vpn.daemon
 
 import android.content.Context
+import android.util.Log as nativeLog
 import java.io.File
 import java.time.LocalDateTime
-import android.util.Log as nativeLog
-import org.mozilla.firefox.vpn.daemon.BuildConfig
 
 /*
  * Drop in replacement for android.util.Log

android/daemon/src/main/java/org/mozilla/firefox/vpn/daemon/VPNService.kt

@@ -28,7 +28,6 @@ import org.mozilla.firefox.vpn.daemon.GleanMetrics.Session
 import org.mozilla.guardian.tunnel.WireGuardGo
 import java.io.File
 import java.util.*
-import org.mozilla.firefox.vpn.daemon.BuildConfig
 
 class VPNService : android.net.VpnService() {
     private val tag = "VPNService"

nebula/ui/components/qmldir

@@ -1,9 +1,3 @@
-module components
-linktarget componentsplugin
-optional plugin qml_components_componentsplugin
-classname componentsPlugin
-typeinfo components.qmltypes
-prefer :/nebula/components/
 MZAlert 0.0 MZAlert.qml
 MZAnimatedRings 0.0 MZAnimatedRings.qml
 MZAvatar 0.0 MZAvatar.qml

src/commands/commandui.cpp

@@ -250,7 +250,7 @@ int CommandUI::run(QStringList& tokens) {
     TemporaryDir::cleanupAll();
 
     vpn->setStartMinimized(minimizedOption.m_set ||
-                          (qgetenv("MVPN_MINIMIZED") == "1"));
+                           (qgetenv("MVPN_MINIMIZED") == "1"));
 
 #ifndef Q_OS_WIN
     // Signal handling for a proper shutdown.
@@ -322,15 +322,16 @@ int CommandUI::run(QStringList& tokens) {
     QObject::connect(vpn->controller(), &Controller::readyToQuit, vpn,
                      &App::quit, Qt::QueuedConnection);
 
-    #ifdef MZ_ANDROID
-    // On Android we need to make sure when we load a QML application that the context
-    // is set. Qt ___should___ do this for us, but it seems that in some cases it does not.
-    // So we chant dark JNI magic to make sure the VPNActivity is set as context provider.
+#ifdef MZ_ANDROID
+    // On Android we need to make sure when we load a QML application that the
+    // context is set. Qt ___should___ do this for us, but it seems that in some
+    // cases it does not. So we chant dark JNI magic to make sure the
+    // VPNActivity is set as context provider.
     logger.debug() << "Forcing activity publish";
     AndroidCommons::forcePublishActivity();
     // In case we have a pending exception, clear it before loading main.qml
     AndroidCommons::clearPendingJavaException("before main.qml load");
-    #endif 
+#endif
     const QUrl url(QStringLiteral("qrc:/qt/qml/Mozilla/VPN/main.qml"));
     logger.debug() << "Loading main QML file:" << url.toString();
     engine->load(url);
@@ -364,11 +365,12 @@ int CommandUI::run(QStringList& tokens) {
                      &MacOSMenuBar::controllerStateChanged);
 
 #endif
-    NotificationHandler* notificationHandler = NotificationHandler::create(qApp);
-    QObject::connect(vpn->controller(), &Controller::stateChanged,notificationHandler,
+    NotificationHandler* notificationHandler =
+        NotificationHandler::create(qApp);
+    QObject::connect(vpn->controller(), &Controller::stateChanged,
+                     notificationHandler,
                      &NotificationHandler::showNotification);
 
-
     QObject::connect(
         SettingsHolder::instance(), &SettingsHolder::languageCodeChanged, []() {
           logger.debug() << "Retranslating";

src/mozillavpn.cpp

@@ -94,14 +94,14 @@
 
 #include <QApplication>
 #include <QBuffer>
-#include <QQmlContext>
 #include <QDir>
 #include <QFileInfo>
 #include <QGuiApplication>
 #include <QIcon>
 #include <QJsonDocument>
 #include <QLocale>
 #include <QQmlApplicationEngine>
+#include <QQmlContext>
 #include <QScreen>
 #include <QTimer>
 #include <QUrl>
@@ -307,17 +307,17 @@ void MozillaVPN::initialize() {
 #endif
 
   m_private->m_captivePortalDetection.initialize();
-    logger.debug() << "Captive Portal Detection initialized";
+  logger.debug() << "Captive Portal Detection initialized";
   m_private->m_networkWatcher.initialize();
-    logger.debug() << "Network Watcher initialized";
+  logger.debug() << "Network Watcher initialized";
 
   DNSHelper::maybeMigrateDNSProviderFlags();
-    logger.debug() << "DNS Helper initialized";
+  logger.debug() << "DNS Helper initialized";
 
   SettingsWatcher::instance();
-    logger.debug() << "Settings Watcher initialized";
+  logger.debug() << "Settings Watcher initialized";
 
-      logger.debug()<< "Checking token";
+  logger.debug() << "Checking token";
   if (!settingsHolder->hasToken()) {
     return;
   }
@@ -2311,11 +2311,12 @@ int MozillaVPN::runCommandLineApp(std::function<int()>&& a_callback) {
 }
 
 /**
-* This function instantiates a QMLApplication, MozillaVPN singleton and calles
-* the provided callback.
-* On Android, the callback is called when the Context is available, the Qt Eventloop is running in this case.
-* On other platforms, the callback is called before starting the Qt Eventloop.
-*/
+ * This function instantiates a QMLApplication, MozillaVPN singleton and calles
+ * the provided callback.
+ * On Android, the callback is called when the Context is available, the Qt
+ * Eventloop is running in this case. On other platforms, the callback is called
+ * before starting the Qt Eventloop.
+ */
 int MozillaVPN::runGuiApp(std::function<int()>&& a_callback) {
   std::function<int()> callback = std::move(a_callback);
 
@@ -2333,7 +2334,6 @@ int MozillaVPN::runGuiApp(std::function<int()>&& a_callback) {
   QQmlContext* ctx = engine->rootContext();
   ctx->setContextProperty("QT_QUICK_BACKEND", qgetenv("QT_QUICK_BACKEND"));
 
-
   if (SettingsHolder::instance()->stagingServer()) {
     Constants::setStaging();
     LogHandler::instance()->setStderr(true);
@@ -2352,11 +2352,11 @@ int MozillaVPN::runGuiApp(std::function<int()>&& a_callback) {
   QIcon icon(Constants::LOGO_URL);
   app.setWindowIcon(icon);
 
-  #ifdef MZ_ANDROID
-    AndroidCommons::runWhenUiViewConstructible(callback);
-  #else
-    callback();
-  #endif
+#ifdef MZ_ANDROID
+  AndroidCommons::runWhenUiViewConstructible(callback);
+#else
+  callback();
+#endif
 
   return app.exec();
 }

src/platforms/android/androidcommons.cpp

@@ -56,11 +56,9 @@ void AndroidCommons::forcePublishActivity() {
     // 2) Re-publish to Qt (if available in your Qt build)
     // Safe no-op if it's already the same:
     QJniObject::callStaticMethod<void>(
-          "org/qtproject/qt/android/QtNative",
-          "setActivity",
-          "(Landroid/app/Activity;)V",
-          activity.object<jobject>());
-      return true;
+        "org/qtproject/qt/android/QtNative", "setActivity",
+        "(Landroid/app/Activity;)V", activity.object<jobject>());
+    return true;
   });
   fut.waitForFinished();
 }
@@ -151,11 +149,9 @@ void AndroidCommons::launchPlayStore() {
                                      appActivity.object());
 }
 
-
-
 bool AndroidCommons::clearPendingJavaException(const char* where) {
   QJniEnvironment env;
-  if (!env->ExceptionCheck()){
+  if (!env->ExceptionCheck()) {
     logger.info() << "No pending exception at" << where;
     return false;
   }
@@ -165,9 +161,9 @@ bool AndroidCommons::clearPendingJavaException(const char* where) {
   return true;
 };
 
-
 // static
-void AndroidCommons::runWhenUiViewConstructible(std::function<void()> fn, int retryMs) {
+void AndroidCommons::runWhenUiViewConstructible(std::function<void()> fn,
+                                                int retryMs) {
   using QAA = QNativeInterface::QAndroidApplication;
   auto attempt = [fn = std::move(fn), retryMs]() mutable {
     // Do the probe on the Android UI thread
@@ -180,20 +176,30 @@ void AndroidCommons::runWhenUiViewConstructible(std::function<void()> fn, int re
 
       // 2) Actually try to construct a View with that Context
       QJniEnvironment env;
-      QJniObject dummyView("android/view/View", "(Landroid/content/Context;)V", ctx.object());
-      if (env->ExceptionCheck()) { env->ExceptionDescribe(); env->ExceptionClear(); return false; }
+      QJniObject dummyView("android/view/View", "(Landroid/content/Context;)V",
+                           ctx.object());
+      if (env->ExceptionCheck()) {
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        return false;
+      }
 
       if (clearPendingJavaException("gate-exit(UI)")) return false;
 
       // Success — run the work on the Qt thread
-      QMetaObject::invokeMethod(qApp, [fn = std::move(fn)]() mutable { fn(); }, Qt::QueuedConnection);
+      QMetaObject::invokeMethod(
+          qApp, [fn = std::move(fn)]() mutable { fn(); }, Qt::QueuedConnection);
       return true;
     }).then([retryMs, fn = std::move(fn)](QFuture<QVariant> f) mutable {
-      const bool ok = f.isValid() && f.result().isValid() && f.result().toBool();
-      if (!ok) QTimer::singleShot(retryMs, qApp, [fn = std::move(fn), retryMs]() mutable {
-        AndroidCommons::runWhenUiViewConstructible(std::move(fn), retryMs);
-      });
+      const bool ok =
+          f.isValid() && f.result().isValid() && f.result().toBool();
+      if (!ok)
+        QTimer::singleShot(retryMs, qApp,
+                           [fn = std::move(fn), retryMs]() mutable {
+                             AndroidCommons::runWhenUiViewConstructible(
+                                 std::move(fn), retryMs);
+                           });
     });
   };
   QTimer::singleShot(0, qApp, attempt);
-}
+}

src/platforms/android/androidcommons.h

@@ -12,9 +12,10 @@ class AndroidCommons final : public QObject {
   Q_OBJECT
   Q_DISABLE_COPY_MOVE(AndroidCommons)
 
-public:
-static bool clearPendingJavaException(const char* where);
-  static void runWhenUiViewConstructible(std::function<void()> fn, int retryMs = 50);
+ public:
+  static bool clearPendingJavaException(const char* where);
+  static void runWhenUiViewConstructible(std::function<void()> fn,
+                                         int retryMs = 50);
 
   static void forcePublishActivity();
   static QJniObject getActivity();

src/platforms/android/androidvpnactivity.cpp

@@ -223,10 +223,9 @@ void AndroidVPNActivity::onIntentInternal(JNIEnv* env, jobject thiz) {
   emit s_instance->onOpenedWithUrl(url);
 }
 
-
-bool AndroidVPNActivity::isReady(){
+bool AndroidVPNActivity::isReady() {
   QJniEnvironment env;
-  const bool res = QJniObject::callStaticMethod<bool>(
-      CLASSNAME, "isReady", "()Z");
+  const bool res =
+      QJniObject::callStaticMethod<bool>(CLASSNAME, "isReady", "()Z");
   return res;
-};
+};