update CMake configuration for AUR build & add PrivateInfoLabel for masked display of sensitive information

CMakeLists.txt

@@ -22,17 +22,18 @@ if(WIN32)
     set(PKG_CONFIG_EXECUTABLE "C:/msys64/mingw64/bin/pkg-config.exe")
     list(APPEND CMAKE_PREFIX_PATH "C:/lxqt")
     set(CUSTOM_LIB_PATH "C:/msys64/mingw64/lib")
-    set(CUSTOM_BIN_PATH "C:/msys64/mingw64/bin")
     set(CUSTOM_INCLUDE_PATH "C:/msys64/mingw64/include")
     set(CUSTOM_PKGCONFIG_PATH "C:/msys64/mingw64/lib/pkgconfig")
-    # Use Windows path separator for environment variables
     set(ENV{PKG_CONFIG_PATH} "${CUSTOM_PKGCONFIG_PATH};$ENV{PKG_CONFIG_PATH}")
-else()
+elseif(APPLE)
     set(CUSTOM_LIB_PATH "/usr/local/lib")
     set(CUSTOM_INCLUDE_PATH "/usr/local/include")
     set(CUSTOM_PKGCONFIG_PATH "/usr/local/lib/pkgconfig")
-    # Use Unix path separator for environment variables
     set(ENV{PKG_CONFIG_PATH} "${CUSTOM_PKGCONFIG_PATH}:$ENV{PKG_CONFIG_PATH}")
+else ()
+    set(CUSTOM_LIB_PATH "/usr/local/lib")
+    set(CUSTOM_PKGCONFIG_PATH "/usr/local/lib/pkgconfig")
+    set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CUSTOM_PKGCONFIG_PATH}")
 endif()
 
 include_directories(${CUSTOM_INCLUDE_PATH})
@@ -80,24 +81,34 @@ if(WIN32)
     message(STATUS "Found Qt bin directory: ${QT_BIN_PATH}")
 endif()
 
+# Define library search behavior based on platform
+if(LINUX)
+    # On Linux (AUR builds), let CMake search default system paths first.
+    # The custom path /usr/local/lib will be checked if it's in the default search paths.
+    set(CUSTOM_FIND_LIB_ARGS "")
+else()
+    # On other platforms, only search the custom path for our specific libraries.
+    set(CUSTOM_FIND_LIB_ARGS
+        PATHS ${CUSTOM_LIB_PATH}
+        NO_DEFAULT_PATH
+    )
+endif()
+
 find_library(IMOBILEDEVICE_LIBRARY 
     NAMES imobiledevice-1.0
-    PATHS ${CUSTOM_LIB_PATH}
-    NO_DEFAULT_PATH
+    ${CUSTOM_FIND_LIB_ARGS}
     REQUIRED
 )
 
 find_library(IMOBILEDEVICE_GLUE_LIBRARY 
     NAMES imobiledevice-glue-1.0
-    PATHS ${CUSTOM_LIB_PATH}
-    NO_DEFAULT_PATH
+    ${CUSTOM_FIND_LIB_ARGS}
     REQUIRED
 )
 
 find_library(TATSU_LIBRARY 
     NAMES tatsu
-    PATHS ${CUSTOM_LIB_PATH}
-    NO_DEFAULT_PATH
+    ${CUSTOM_FIND_LIB_ARGS}
     REQUIRED
 )
 
@@ -120,8 +131,7 @@ endif()
 
 find_library(USBMUXD_LIBRARY 
     NAMES usbmuxd-2.0
-    PATHS ${CUSTOM_LIB_PATH}
-    NO_DEFAULT_PATH
+    ${CUSTOM_FIND_LIB_ARGS}
     REQUIRED
 )
 
@@ -130,17 +140,8 @@ if(WIN32)
     find_library(SSL_LIBRARY NAMES ssl PATHS C:/msys64/mingw64/lib REQUIRED)
     find_library(CRYPTO_LIBRARY NAMES crypto PATHS C:/msys64/mingw64/lib REQUIRED)
 else()
-    find_library(SSL_LIBRARY 
-        NAMES ssl
-        PATHS /usr/local/lib /usr/lib /usr/lib/x86_64-linux-gnu
-        REQUIRED
-    )
-
-    find_library(CRYPTO_LIBRARY 
-        NAMES crypto
-        PATHS /usr/local/lib /usr/lib /usr/lib/x86_64-linux-gnu
-        REQUIRED
-    )
+    find_library(SSL_LIBRARY NAMES ssl REQUIRED)
+    find_library(CRYPTO_LIBRARY NAMES crypto REQUIRED)
 endif()
 
 # Add libssh for SSH connections
@@ -322,10 +323,29 @@ set_target_properties(iDescriptor PROPERTIES
     MACOSX_BUNDLE TRUE
     WIN32_EXECUTABLE TRUE
     # Control library search order - system libs first, then /usr/local/lib
-    INSTALL_RPATH "/usr/local/lib:/usr/lib/x86_64-linux-gnu:/usr/lib:$ORIGIN"
-    # INSTALL_RPATH "/usr/local/lib:/usr/lib/"
+    INSTALL_RPATH "/usr/lib/x86_64-linux-gnu:/usr/lib:/usr/local/lib:$ORIGIN"
     BUILD_WITH_INSTALL_RPATH TRUE
 )
+if (UNIX AND NOT APPLE)
+# Add install rules for the project
+include(GNUInstallDirs)
+
+# Install the main executable
+install(TARGETS iDescriptor
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+# Install the .desktop file
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/iDescriptor.desktop
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
+)
+
+# Install the application icon
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/icons/app-icon/icon.png
+    RENAME iDescriptor.png
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/256x256/apps
+)
+endif()
 
 include(GNUInstallDirs)
 

resources.qrc

@@ -31,6 +31,9 @@
         <file>resources/icons/MaterialSymbolsAndroidWifi3BarPlus.png</file>
         <file>resources/icons/IconParkTwotoneMoreTwo.png</file>
         <file>resources/icons/BxBxsTerminal.png</file>
+        <file>resources/icons/ClarityEyeHideLine.png</file>
+        <file>resources/icons/ClarityEyeLine.png</file>
+        <file>resources/icons/MaterialSymbolsLightImageOutlineSharp.png</file>
         <file>qml/MapView.qml</file>
         <file>resources/iphone.png</file>
         <file>resources/ios-wallpapers/iphone-ios4.png</file>

src/core/services/init_device.cpp

@@ -104,7 +104,7 @@ void parseOldDevice(PlistNavigator &ioreg, DeviceInfo &d)
     int healthPercent =
         (designCapacity != 0) ? (maxCapacity * 100) / designCapacity : 0;
     healthPercent = std::min(healthPercent, 100);
-    d.batteryInfo.health = QString::number(healthPercent) + "%";
+    d.batteryInfo.health = QString::number(qBound(0, healthPercent, 100)) + "%";
     d.batteryInfo.cycleCount = cycleCount;
     d.batteryInfo.serialNumber = !batterySerialNumber.empty()
                                      ? batterySerialNumber
@@ -322,7 +322,9 @@ DeviceInfo fullDeviceInfo(const pugi::xml_document &doc,
 
         // seems to be to the most accurate way to get health
         d.batteryInfo.health =
-            QString::number((maxCapacity * 100) / designCapacity) + "%";
+            QString::number(
+                qBound<int>(0, (maxCapacity * 100) / designCapacity, 100)) +
+            "%";
         d.batteryInfo.cycleCount = cycleCount;
         d.batteryInfo.serialNumber = !batterySerialNumber.empty()
                                          ? batterySerialNumber

src/deviceinfowidget.cpp

@@ -24,6 +24,7 @@
 #include "iDescriptor-ui.h"
 #include "iDescriptor.h"
 #include "infolabel.h"
+#include "privateinfolabel.h"
 #include "toolboxwidget.h"
 #include <QApplication>
 #include <QDebug>
@@ -283,6 +284,24 @@ DeviceInfoWidget::DeviceInfoWidget(iDescriptorDevice *device, QWidget *parent)
          createValueLabel(QString::fromStdString(
              device->deviceInfo.productionDevice ? "Yes" : "No"))});
 
+    // Serial Number with privacy
+    if (!device->deviceInfo.serialNumber.empty()) {
+        infoItems.append(
+            {"Serial Number:",
+             new PrivateInfoLabel(
+                 QString::fromStdString(device->deviceInfo.serialNumber),
+                 this)});
+    }
+
+    // IMEI with privacy (Mobile Equipment Identifier)
+    if (!device->deviceInfo.mobileEquipmentIdentifier.empty()) {
+        infoItems.append(
+            {"IMEI:", new PrivateInfoLabel(
+                          QString::fromStdString(
+                              device->deviceInfo.mobileEquipmentIdentifier),
+                          this)});
+    }
+
     // Distribute items into the grid
     int numRows = (infoItems.size() + 1) / 2;
     for (int i = 0; i < numRows; ++i) {

src/infolabel.cpp

@@ -75,3 +75,5 @@ void InfoLabel::restoreOriginalText()
     setStyleSheet("QLabel:hover { background-color: rgba(255, 255, 255, 0.1); "
                   "border-radius: 2px; }");
 }
+
+void InfoLabel::setOriginalText(const QString &text) { m_originalText = text; }

src/infolabel.h

@@ -31,6 +31,9 @@ public:
     explicit InfoLabel(const QString &text = QString(),
                        QWidget *parent = nullptr);
 
+    // Allow updating the original text (useful for PrivateInfoLabel)
+    void setOriginalText(const QString &text);
+
 protected:
     void mousePressEvent(QMouseEvent *event) override;
     void enterEvent(QEnterEvent *event);

src/privateinfolabel.cpp

@@ -0,0 +1,68 @@
+/*
+ * iDescriptor: A free and open-source idevice management tool.
+ *
+ * Copyright (C) 2025 Uncore <https://github.com/uncor3>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "privateinfolabel.h"
+
+PrivateInfoLabel::PrivateInfoLabel(const QString &fullText, QWidget *parent)
+    : QWidget(parent), m_fullText(fullText), m_isVisible(false)
+{
+    m_maskedText = getMaskedText(fullText);
+
+    QHBoxLayout *layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(5);
+
+    m_textLabel = new InfoLabel(m_maskedText, this);
+    layout->addWidget(m_textLabel);
+
+    m_toggleButton = new ZIconWidget(
+        QIcon(":/resources/icons/ClarityEyeHideLine.png"), "Show", this);
+    m_toggleButton->setIconSize(QSize(20, 20));
+    connect(m_toggleButton, &ZIconWidget::clicked, this,
+            &PrivateInfoLabel::toggleVisibility);
+    layout->addWidget(m_toggleButton);
+
+    layout->addStretch();
+}
+
+QString PrivateInfoLabel::getMaskedText(const QString &text)
+{
+    if (text.length() <= 4) {
+        return QString("*").repeated(text.length());
+    }
+    // Show first 4 characters, hide the rest
+    return text.left(4) + QString("*").repeated(text.length() - 4);
+}
+
+void PrivateInfoLabel::toggleVisibility()
+{
+    m_isVisible = !m_isVisible;
+    if (m_isVisible) {
+        m_textLabel->setText(m_fullText);
+        m_textLabel->setOriginalText(m_fullText);
+        m_toggleButton->setIcon(QIcon(":/resources/icons/ClarityEyeLine.png"));
+        m_toggleButton->setToolTip("Hide");
+    } else {
+        m_textLabel->setText(m_maskedText);
+        m_textLabel->setOriginalText(m_fullText);
+        m_toggleButton->setIcon(
+            QIcon(":/resources/icons/ClarityEyeHideLine.png"));
+        m_toggleButton->setToolTip("Show");
+    }
+}

src/privateinfolabel.h

@@ -0,0 +1,49 @@
+/*
+ * iDescriptor: A free and open-source idevice management tool.
+ *
+ * Copyright (C) 2025 Uncore <https://github.com/uncor3>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef PRIVATEINFOLABEL_H
+#define PRIVATEINFOLABEL_H
+
+#include "iDescriptor-ui.h"
+#include "infolabel.h"
+#include <QHBoxLayout>
+#include <QWidget>
+
+class PrivateInfoLabel : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit PrivateInfoLabel(const QString &fullText,
+                              QWidget *parent = nullptr);
+
+private slots:
+    void toggleVisibility();
+
+private:
+    QString m_fullText;
+    QString m_maskedText;
+    bool m_isVisible;
+    InfoLabel *m_textLabel;
+    ZIconWidget *m_toggleButton;
+
+    QString getMaskedText(const QString &text);
+};
+
+#endif // PRIVATEINFOLABEL_H