From 57d3cec2f942fba61806d6107293a8e6c0835a70 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Fri, 25 Jan 2019 14:34:11 -0800
Subject: [PATCH] Completed - downloading Installer (APK)

---
 tools/nitpick/src/Nitpick.cpp          | 3 ++-
 tools/nitpick/src/TestRunnerMobile.cpp | 9 ++++++++-
 tools/nitpick/src/TestRunnerMobile.h   | 1 +
 tools/nitpick/ui/Nitpick.ui            | 4 ++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tools/nitpick/src/Nitpick.cpp b/tools/nitpick/src/Nitpick.cpp
index 6db107b9a7..61e5d1d8d4 100644
--- a/tools/nitpick/src/Nitpick.cpp
+++ b/tools/nitpick/src/Nitpick.cpp
@@ -113,7 +113,8 @@ void Nitpick::setup() {
         _ui.folderLineEdit,
         _ui.downloadAPKPushbutton,
         _ui.runLatestOnMobileCheckBox,
-        _ui.urlOnMobileLineEdit
+        _ui.urlOnMobileLineEdit,
+        _ui.statusLabelOnMobile
     );
 }
 
diff --git a/tools/nitpick/src/TestRunnerMobile.cpp b/tools/nitpick/src/TestRunnerMobile.cpp
index 85aaeec609..31e293cd45 100644
--- a/tools/nitpick/src/TestRunnerMobile.cpp
+++ b/tools/nitpick/src/TestRunnerMobile.cpp
@@ -25,6 +25,7 @@ TestRunnerMobile::TestRunnerMobile(
     QPushButton* downloadAPKPushbutton,
     QCheckBox* runLatest,
     QLineEdit* url,
+    QLabel* statusLabel,
 
     QObject* parent
 ) : QObject(parent) 
@@ -37,6 +38,7 @@ TestRunnerMobile::TestRunnerMobile(
     _downloadAPKPushbutton = downloadAPKPushbutton;
     _runLatest = runLatest;
     _url = url;
+    _statusLabel = statusLabel;
 
     folderLineEdit->setText("/sdcard/DCIM/TEST");
 }
@@ -124,6 +126,11 @@ void TestRunnerMobile::downloadComplete() {
 
             _installerFilename = INSTALLER_FILENAME_LATEST;
 
+
+            // Replace the `exe` extension with `apk`
+            _installerFilename = _installerFilename.replace(_installerFilename.length() - 3, 3, "apk");
+            _buildInformation.url = _buildInformation.url.replace(_buildInformation.url.length() - 3, 3, "apk");
+
             urls << _buildInformation.url;
             filenames << _installerFilename;
         } else {
@@ -135,7 +142,7 @@ void TestRunnerMobile::downloadComplete() {
 
        _statusLabel->setText("Downloading installer");
 
-       //// nitpick->downloadFiles(urls, _workingFolder, filenames, (void*)this);
+        nitpick->downloadFiles(urls, _workingFolder, filenames, (void*)this);
 
         // `downloadComplete` will run again after download has completed
 
diff --git a/tools/nitpick/src/TestRunnerMobile.h b/tools/nitpick/src/TestRunnerMobile.h
index 8d08eda191..65999439b9 100644
--- a/tools/nitpick/src/TestRunnerMobile.h
+++ b/tools/nitpick/src/TestRunnerMobile.h
@@ -29,6 +29,7 @@ public:
         QPushButton* downloadAPKPushbutton,
         QCheckBox* runLatest,
         QLineEdit* url,
+        QLabel* statusLabel,
 
         QObject* parent = 0
     );
diff --git a/tools/nitpick/ui/Nitpick.ui b/tools/nitpick/ui/Nitpick.ui
index 50d6a1f661..480d0f87f5 100644
--- a/tools/nitpick/ui/Nitpick.ui
+++ b/tools/nitpick/ui/Nitpick.ui
@@ -630,8 +630,8 @@
        <rect>
         <x>10</x>
         <y>350</y>
-        <width>441</width>
-        <height>31</height>
+        <width>440</width>
+        <height>30</height>
        </rect>
       </property>
      </widget>