From 6032fde5e55fb6688f43f701fefcb20b132052d2 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Mon, 11 Mar 2019 12:43:34 -0700
Subject: [PATCH] Unique command line to run Interface on Quest.

---
 tools/nitpick/src/Nitpick.cpp          |  2 +-
 tools/nitpick/src/TestRunnerMobile.cpp | 28 +++++++++++++++++---------
 tools/nitpick/src/TestRunnerMobile.h   |  2 ++
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/tools/nitpick/src/Nitpick.cpp b/tools/nitpick/src/Nitpick.cpp
index cf50774617..e72de9d1ad 100644
--- a/tools/nitpick/src/Nitpick.cpp
+++ b/tools/nitpick/src/Nitpick.cpp
@@ -38,7 +38,7 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) {
  
     _ui.plainTextEdit->setReadOnly(true);
 
-    setWindowTitle("Nitpick - v3.1.2");
+    setWindowTitle("Nitpick - v3.1.3");
 
     clientProfiles << "VR-High" << "Desktop-High" << "Desktop-Low" << "Mobile-Touch" << "VR-Standalone";
     _ui.clientProfileComboBox->insertItems(0, clientProfiles);
diff --git a/tools/nitpick/src/TestRunnerMobile.cpp b/tools/nitpick/src/TestRunnerMobile.cpp
index 4d0d18ef3d..284b4de15c 100644
--- a/tools/nitpick/src/TestRunnerMobile.cpp
+++ b/tools/nitpick/src/TestRunnerMobile.cpp
@@ -98,12 +98,12 @@ void TestRunnerMobile::connectDevice() {
             QString deviceID = tokens[0];
             
             QString modelID = tokens[3].split(':')[1];
-            QString modelName = "UNKNOWN";
+            _modelName = "UNKNOWN";
             if (modelNames.count(modelID) == 1) {
-                modelName = modelNames[modelID];
+                _modelName = modelNames[modelID];
             }
 
-            _detectedDeviceLabel->setText(modelName + " [" + deviceID + "]");
+            _detectedDeviceLabel->setText(_modelName + " [" + deviceID + "]");
             _pullFolderButton->setEnabled(true);
             _folderLineEdit->setEnabled(true);
             _downloadAPKPushbutton->setEnabled(true);
@@ -198,14 +198,22 @@ void TestRunnerMobile::runInterface() {
         ? QString("https://raw.githubusercontent.com/") + nitpick->getSelectedUser() + "/hifi_tests/" + nitpick->getSelectedBranch() + "/tests/testRecursive.js"
         : _scriptURL->text();
  
+    // Quest and Android have different commands to run interface
+    QString startCommand;
+    if (_modelName == "Quest") {
+        startCommand = "io.highfidelity.questInterface/.PermissionsChecker";
+    } else {
+        startCommand = "io.highfidelity.hifiinterface/.PermissionChecker";
+    }
+
     QString command = _adbInterface->getAdbCommand() +
-        " shell am start -n io.highfidelity.hifiinterface/.PermissionChecker" + 
-        " --es args \\\"" + 
-            " --url file:///~/serverless/tutorial.json" + 
-            " --no-updater" + 
-            " --no-login-suggestion" + 
-            " --testScript " + testScript + " quitWhenFinished" + 
-            " --testResultsLocation /sdcard/snapshots" + 
+        " shell am start -n " + startCommand +
+        " --es args \\\"" +
+        " --url file:///~/serverless/tutorial.json" +
+        " --no-updater" +
+        " --no-login-suggestion" +
+        " --testScript " + testScript + " quitWhenFinished" +
+        " --testResultsLocation /sdcard/snapshots" +
         "\\\"";
 
     appendLog(command);
diff --git a/tools/nitpick/src/TestRunnerMobile.h b/tools/nitpick/src/TestRunnerMobile.h
index f7b16da6f8..7dbf5456b3 100644
--- a/tools/nitpick/src/TestRunnerMobile.h
+++ b/tools/nitpick/src/TestRunnerMobile.h
@@ -75,5 +75,7 @@ private:
     std::map<QString, QString> modelNames;
 
     AdbInterface* _adbInterface;
+
+    QString _modelName;
 };
 #endif