From 3380c3f9688ec3f0d16ed3f269cc4a8d8f80f826 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 17 May 2024 11:44:11 +0200
Subject: [PATCH] Android: Make enum parsing readable

Fix tr() messages so that they don't contain newlines.

Change-Id: I705e56796393501da1a2917adb6673a24c1cbcf6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androiddeployqtstep.cpp | 42 +++++++--------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 0791ce5a884..9f40de4d2a3 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -444,35 +444,21 @@ void AndroidDeployQtStep::slotAskForUninstall(DeployErrorCode errorCode)
 {
     Q_ASSERT(errorCode > 0);
 
-    QString uninstallMsg = Tr::tr("Deployment failed with the following errors:\n\n");
-    uint errorCodeFlags = errorCode;
-    uint mask = 1;
-    while (errorCodeFlags) {
-      switch (errorCodeFlags & mask) {
-      case DeployErrorCode::PermissionModelDowngrade:
-          uninstallMsg += InstallFailedPermissionModelDowngrade+"\n";
-          break;
-      case InconsistentCertificates:
-          uninstallMsg += InstallFailedInconsistentCertificatesString+"\n";
-          break;
-      case UpdateIncompatible:
-          uninstallMsg += InstallFailedUpdateIncompatible+"\n";
-          break;
-      case VersionDowngrade:
-          uninstallMsg += InstallFailedVersionDowngrade+"\n";
-          break;
-      default:
-          break;
-      }
-      errorCodeFlags &= ~mask;
-      mask <<= 1;
-    }
+    QString uninstallMsg = Tr::tr("Deployment failed with the following errors:") + "\n\n";
+    if (errorCode & InconsistentCertificates)
+        uninstallMsg += InstallFailedInconsistentCertificatesString + '\n';
+    if (errorCode & UpdateIncompatible)
+        uninstallMsg += InstallFailedUpdateIncompatible + '\n';
+    if (errorCode & PermissionModelDowngrade)
+        uninstallMsg += InstallFailedPermissionModelDowngrade + '\n';
+    if (errorCode & VersionDowngrade)
+        uninstallMsg += InstallFailedVersionDowngrade + '\n';
+    uninstallMsg += '\n';
+    uninstallMsg.append(Tr::tr("Uninstalling the installed package may solve the issue.") + '\n');
+    uninstallMsg.append(Tr::tr("Do you want to uninstall the existing package?"));
 
-    uninstallMsg.append(Tr::tr("\nUninstalling the installed package may solve the issue.\n"
-                               "Do you want to uninstall the existing package?"));
-    int button = QMessageBox::critical(nullptr, Tr::tr("Install failed"), uninstallMsg,
-                                       QMessageBox::Yes, QMessageBox::No);
-    m_askForUninstall = button == QMessageBox::Yes;
+    m_askForUninstall = QMessageBox::critical(nullptr, Tr::tr("Install failed"), uninstallMsg,
+                        QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes;
 }
 
 // TODO: This implementation is not thread safe.