chore: mobile MVP fixes

- fixup Android permissions and local file access
- tooltip metrics
- Browser settings subsection properly enabled/disabled

Author: caybro

mobile/android/qt6/AndroidManifest.xml

@@ -21,10 +21,13 @@
     <uses-feature android:name="android.hardware.fingerprint" android:required="false" />
 
     <!-- dangerous permissions -->
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <supports-screens
         android:anyDensity="true"

src/app/modules/main/profile_section/advanced/module.nim

@@ -63,7 +63,7 @@ method onFleetSet*(self: Module) =
   quit(QuitSuccess) # quits the app TODO: change this to logout instead when supported
 
 method getLogDir*(self: Module): string =
-  return url_fromLocalFile(constants.LOGDIR)
+  return constants.LOGDIR
 
 method getWakuV2LightClientEnabled*(self: Module): bool =
   return self.controller.getWakuV2LightClientEnabled()

ui/StatusQ/include/StatusQ/urlutils.h

@@ -40,4 +40,8 @@ class UrlUtils : public QObject
     // ["jpg", "jpe", "jp", "jpeg", "png", "webp", "gif", "svg"]
     QStringList m_allImgExtensions;
     QStringList allValidImageExtensions() const { return m_allImgExtensions; }
+
+#ifdef Q_OS_ANDROID
+    QString resolveAndroidContentUrl(const QString& urlPath) const;
+#endif
 };

ui/StatusQ/src/StatusQ/Controls/StatusToolTip.qml

@@ -25,8 +25,8 @@ ToolTip {
                             Math.max(implicitBackgroundWidth + leftInset + rightInset,
                                      implicitContentWidth + leftPadding + rightPadding)
                             )
-    padding: Theme.halfPadding
-    horizontalPadding: padding + 4
+    horizontalPadding: Theme.padding
+    verticalPadding: Theme.halfPadding
     margins: Theme.halfPadding
     delay: Utils.isMobile ? Application.styleHints.mousePressAndHoldInterval
                           : 200
@@ -43,8 +43,8 @@ ToolTip {
         Rectangle {
             id: arrow
             color: statusToolTipContentBackground.color
-            height: 20
-            width: 20
+            height: Theme.padding
+            width: Theme.padding
             rotation: 45
             radius: 1
             x: {

ui/StatusQ/src/StatusQ/Popups/Dialog/StatusFileDialog.qml

@@ -18,7 +18,7 @@ QObject {
     property alias currentFolder: dlg.currentFolder
 
     property string picturesShortcut: Utils.isIOS ? "assets-library://" :
-                            StandardPaths.writableLocation(StandardPaths.PicturesLocation)
+                            StandardPaths.standardLocations(StandardPaths.PicturesLocation)[0]
 
     signal accepted
     signal rejected
@@ -45,6 +45,7 @@ QObject {
                 resolvedLocalFile = "file:" + resolvedLocalFile
             return resolvedLocalFile
         }
+
         function resolveSelectedFiles(selectedFiles) {
             if (selectedFiles.length === 0)
                 return []

ui/StatusQ/src/systemutilsinternal.cpp

@@ -1,23 +1,21 @@
-#ifdef Q_OS_ANDROID
-#include <QJniObject>
-#include <QtCore/qnativeinterface.h>
-#endif
 #include "StatusQ/systemutilsinternal.h"
 
-#include <QDir>
 #include <QGuiApplication>
 #include <QMimeDatabase>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QProcess>
 #include <QSaveFile>
+#include <QStandardPaths>
 
 #ifdef Q_OS_ANDROID
 #include <QJniObject>
 #include <QtCore/qnativeinterface.h>
 #endif
 
+#ifdef Q_OS_IOS
 #include "ios_utils.h"
+#endif
 
 class QuitFilter : public QObject
 {
@@ -26,7 +24,7 @@ class QuitFilter : public QObject
 public:
     using QObject::QObject;
 
-    bool eventFilter(QObject* obj, QEvent* ev)
+    bool eventFilter(QObject* obj, QEvent* ev) override
     {
         if (ev->type() == QEvent::Quit)
             emit quit(ev->spontaneous());
@@ -60,12 +58,6 @@ void SystemUtilsInternal::restartApplication() const
     QMetaObject::invokeMethod(QCoreApplication::instance(), &QCoreApplication::exit, Qt::QueuedConnection, EXIT_SUCCESS);
 }
 
-#if defined(Q_OS_IOS)
-void save(const QByteArray& imageData)
-{
-    saveImageToPhotosAlbum(imageData);
-}
-#else
 void save(const QByteArray& imageData, const QString& targetDir)
 {
 
@@ -99,7 +91,6 @@ void save(const QByteArray& imageData, const QString& targetDir)
                         "Downloading image failed while saving to file:"
                     << targetFile;
 }
-#endif
 
 void SystemUtilsInternal::downloadImageByUrl(
         const QUrl& url, const QString& path) const
@@ -110,10 +101,15 @@ void SystemUtilsInternal::downloadImageByUrl(
     QNetworkReply *reply = manager.get(QNetworkRequest(url));
 
     // accept both "file:/foo/bar" and "/foo/bar"
-    auto targetDir = QUrl::fromUserInput(path).toLocalFile();
+    auto targetDir = QUrl::fromUserInput(path)
+#ifndef Q_OS_ANDROID
+                         .toLocalFile();
+#else
+                         .toString(); // don't touch the "content://" URI
+#endif
 
     if (targetDir.isEmpty())
-        targetDir = QDir::homePath();
+        targetDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
 
     QObject::connect(reply, &QNetworkReply::finished, this, [reply, targetDir] {
         if(reply->error() != QNetworkReply::NoError) {
@@ -125,11 +121,11 @@ void SystemUtilsInternal::downloadImageByUrl(
         // Extract the image data to be able to load and save it
         const auto btArray = reply->readAll();
         Q_ASSERT(!btArray.isEmpty());
-        #ifdef Q_OS_IOS
-        save(btArray);
-        #else
+#ifdef Q_OS_IOS
+        saveImageToPhotosAlbum(btArray);
+#else
         save(btArray, targetDir);
-        #endif
+#endif
     });
 }
 

ui/StatusQ/src/urlutils.cpp

@@ -1,10 +1,14 @@
 #include "StatusQ/urlutils.h"
 
+#include <QDir>
 #include <QFile>
 #include <QImageReader>
+#include <QStandardPaths>
 #include <QUrl>
 
+#ifdef Q_OS_IOS
 #include "ios_utils.h"
+#endif
 
 namespace {
 constexpr auto webpMime = "image/webp";
@@ -30,34 +34,57 @@ UrlUtils::UrlUtils(QObject *parent): QObject(parent) {
 
 bool UrlUtils::isValidImageUrl(const QUrl &url) const
 {
-    QString mimeType;
-    if (url.isLocalFile())
-        mimeType = m_mimeDb.mimeTypeForFile(url.toLocalFile(), QMimeDatabase::MatchContent).name();
-    else
-        mimeType = m_mimeDb.mimeTypeForUrl(url).name();
+    // don't convert "content:/" like URLs to an empty path
+    const auto filePath = url.isLocalFile() ? url.toLocalFile() : url.toString();
+    const auto mimeType = m_mimeDb.mimeTypeForFile(filePath, QMimeDatabase::MatchContent).name();
 
     return m_validImageMimeTypes.contains(mimeType);
 }
 
 qint64 UrlUtils::getFileSize(const QUrl& url)
 {
-    if (url.isLocalFile())
-        return QFile(url.toLocalFile()).size();
-
-    return 0;
+    // don't convert "content:/" like URLs to an empty path
+    const auto filePath = url.isLocalFile() ? url.toLocalFile() : url.toString();
+    return QFile(filePath).size(); // will return 0 for unknown file paths
 }
 
 QString UrlUtils::convertUrlToLocalPath(const QString &url) const {
+#ifdef Q_OS_ANDROID
+    return resolveAndroidContentUrl(url);
+#endif
+
     const auto localFileOrUrl = urlFromUserInput(url); // accept both "file:/foo/bar" and "/foo/bar"
     if (localFileOrUrl.isLocalFile()) {
-        #ifdef Q_OS_IOS
+#ifdef Q_OS_IOS
         return resolveIOSPhotoAsset(localFileOrUrl.toLocalFile());
-        #endif // Q_OS_IOS
+#endif
         return localFileOrUrl.toLocalFile();
     }
     return {};
 }
 
+#ifdef Q_OS_ANDROID
+QString UrlUtils::resolveAndroidContentUrl(const QString& urlPath) const {
+    QDir dir(urlPath);
+    if (urlPath.endsWith('/') || dir.exists())
+        return urlPath; // a directory, just return it
+
+    QFile fileIn(urlPath);
+    if (!fileIn.open(QIODevice::ReadOnly))
+        return urlPath;
+
+    // save to a temp file, and return the filepath
+    const auto newFilePath = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + '/' + QUuid::createUuid().toString(QUuid::WithoutBraces);
+    QFile fileOut(newFilePath);
+    if (!fileOut.open(QIODevice::WriteOnly | QIODevice::Truncate))
+        return urlPath;
+    if (fileOut.write(fileIn.readAll()) != -1)
+        return fileOut.fileName(); // return the real filename, not the virtual "content:/" URI
+
+    return urlPath;
+}
+#endif
+
 QStringList UrlUtils::convertUrlsToLocalPaths(const QStringList &urls) const {
     QStringList result;
     for (const auto& url: urls) {

ui/app/AppLayouts/Profile/ProfileLayout.qml

@@ -150,7 +150,7 @@ StatusSectionLayout {
         id: settingsEntriesModel
 
         showWalletEntries: root.walletStore.isWalletEnabled
-        showBrowserEntries: root.isBrowserEnabled
+        showBrowserEntries: root.isBrowserEnabled && localAccountSensitiveSettings.isBrowserEnabled
         showBackUpSeed: !root.privacyStore.mnemonicBackedUp
         backUpSeedBadgeCount: root.profileStore.userDeclinedBackupBanner ? 0 : showBackUpSeed
         isKeycardEnabled: root.isKeycardEnabled

ui/app/AppLayouts/Profile/helpers/SettingsEntriesModel.qml

@@ -217,7 +217,7 @@ SortFilterProxyModel {
                     case Constants.settingsSubsection.ensUsernames:
                     case Constants.settingsSubsection.wallet:
                         return root.showWalletEntries
-                    case Constants.settingsSubsection.browser:
+                    case Constants.settingsSubsection.browserSettings:
                         return root.showBrowserEntries
                     case Constants.settingsSubsection.backUpSeed:
                         return root.showBackUpSeed

ui/app/AppLayouts/Profile/views/AdvancedView.qml

@@ -11,6 +11,7 @@ import shared.popups
 import shared.status
 import shared.controls
 
+import StatusQ
 import StatusQ.Components
 import StatusQ.Controls
 import StatusQ.Controls.Validators
@@ -104,7 +105,7 @@ SettingsContentBase {
                     cursorShape: Qt.PointingHandCursor
                     hoverEnabled: true
                     onClicked: {
-                        Qt.openUrlExternally(root.advancedStore.logDir())
+                        Qt.openUrlExternally(UrlUtils.urlFromUserInput(root.advancedStore.logDir()));
                     }
                 }
             }