From e3a1d0d838407cee87a965fddd4ec4cfa30a13b6 Mon Sep 17 00:00:00 2001
From: ritwickrajmakhal <ritwickrajmakhal11@gmail.com>
Date: Mon, 27 Oct 2025 19:39:15 +0530
Subject: [PATCH] Refactor upload success logging to unify message display
 regardless of progress tracking

---
 .../lambdatest/gradle/LambdaTestTask.java     | 23 ++++++--------
 .../lambdatest/gradle/LambdaUploaderTask.java | 31 +++++++------------
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java b/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java
index 8c23636..afe5fd6 100644
--- a/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java
+++ b/src/main/java/io/github/lambdatest/gradle/LambdaTestTask.java
@@ -91,28 +91,23 @@ public void runLambdaTest() {
         try {
             if (appIdFuture != null) {
                 appId = appIdFuture.join();
-                if (!progressEnabled) {
-                    logger.info("App uploaded successfully with ID: {}", appId);
-                }
             }
 
             if (testSuiteIdFuture != null) {
                 testSuiteId = testSuiteIdFuture.join();
-                if (!progressEnabled) {
-                    logger.info("Test suite uploaded successfully with ID: {}", testSuiteId);
-                }
             }
 
-            // Clear progress display if enabled
+            // Clear progress display if enabled, then show success messages
             if (progressEnabled) {
                 ProgressTracker.cleanup();
-                // Show success messages after progress cleanup
-                if (appIdFuture != null) {
-                    logger.info("App uploaded successfully with ID: {}", appId);
-                }
-                if (testSuiteIdFuture != null) {
-                    logger.info("Test suite uploaded successfully with ID: {}", testSuiteId);
-                }
+            }
+
+            // Show success messages (unified flow for both progress and non-progress cases)
+            if (appIdFuture != null) {
+                logger.info("App uploaded successfully with ID: {}", appId);
+            }
+            if (testSuiteIdFuture != null) {
+                logger.info("Test suite uploaded successfully with ID: {}", testSuiteId);
             }
         } catch (CompletionException e) {
             // Cleanup progress display on error
diff --git a/src/main/java/io/github/lambdatest/gradle/LambdaUploaderTask.java b/src/main/java/io/github/lambdatest/gradle/LambdaUploaderTask.java
index 927b779..1807c84 100644
--- a/src/main/java/io/github/lambdatest/gradle/LambdaUploaderTask.java
+++ b/src/main/java/io/github/lambdatest/gradle/LambdaUploaderTask.java
@@ -59,34 +59,25 @@ public void uploadApkToLambdaTest() {
         try {
             if (appIdFuture != null) {
                 appId = appIdFuture.join();
-                if (!progressEnabled) {
-                    logger.lifecycle(
-                            "\u001B[32mApp uploaded successfully with ID: {}\u001B[0m", appId);
-                }
             }
 
             if (testSuiteIdFuture != null) {
                 testSuiteId = testSuiteIdFuture.join();
-                if (!progressEnabled) {
-                    logger.lifecycle(
-                            "\u001B[32mTest suite uploaded successfully with ID: {}\u001B[0m",
-                            testSuiteId);
-                }
             }
 
-            // Clear progress display if enabled
+            // Clear progress display if enabled, then show success messages
             if (progressEnabled) {
                 ProgressTracker.cleanup();
-                // Show success messages after progress cleanup
-                if (appIdFuture != null) {
-                    logger.lifecycle(
-                            "\u001B[32mApp uploaded successfully with ID: {}\u001B[0m", appId);
-                }
-                if (testSuiteIdFuture != null) {
-                    logger.lifecycle(
-                            "\u001B[32mTest suite uploaded successfully with ID: {}\u001B[0m",
-                            testSuiteId);
-                }
+            }
+
+            // Show success messages (unified flow for both progress and non-progress cases)
+            if (appIdFuture != null) {
+                logger.lifecycle("\u001B[32mApp uploaded successfully with ID: {}\u001B[0m", appId);
+            }
+            if (testSuiteIdFuture != null) {
+                logger.lifecycle(
+                        "\u001B[32mTest suite uploaded successfully with ID: {}\u001B[0m",
+                        testSuiteId);
             }
         } catch (CompletionException e) {
             // Cleanup progress display on error