Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/devbootmsg5 into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

More descriptive messages when waiting for the device to be ready LP:#1400843

More descriptive messages when waiting for the device to be ready LP:#1400843

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/505/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/39

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/505/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

let it fly

review: Approve

=== modified file 'share/qtcreator/ubuntu/scripts/device_wait_for_shell'
--- share/qtcreator/ubuntu/scripts/device_wait_for_shell	2014-05-14 14:18:55 +0000
+++ share/qtcreator/ubuntu/scripts/device_wait_for_shell	2015-01-27 07:34:20 +0000
@@ -22,13 +22,24 @@
 
 adb -s ${SERIALNUMBER} wait-for-device
 
-# The device is accesibale on ADB"
+# The device is accessible on ADB"
+set +e
+
+error=$(adb -s ${SERIALNUMBER} shell echo ok 2>&1)
+
+if [[ ${error} =~ "closed" ]]; then
+        echo "DevLocked"
+else
+        echo "DevUnLocked"
+fi
+
+set -e
 
 # Start waiting for Unity8"
 
-until pids=$(adb -s ${SERIALNUMBER} shell pidof unity8|egrep -v "^$"); 
+until pids=$(adb -s ${SERIALNUMBER} shell pidof unity8 2>/dev/null|egrep -v "^$"); 
 do
-	sleep 0.1;
+        sleep 0.1;
 done;
 
 echo "Unity8 is up with PID: ${pids}"

=== modified file 'src/ubuntu/ubuntudevice.cpp'
--- src/ubuntu/ubuntudevice.cpp	2014-11-27 16:23:51 +0000
+++ src/ubuntu/ubuntudevice.cpp	2015-01-27 07:34:20 +0000
@@ -146,7 +146,7 @@
     //at this point the serial ID should be known
     m_dev->setupPrivateKey();
 
-    setProcessState(UbuntuDevice::WaitForBoot);
+    setProcessState(UbuntuDevice::WaitForBootAdbAccess);
     beginAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_WAIT_FOR_BOOT_MESSAGE));
 
     stopProcess();
@@ -184,7 +184,9 @@
             waitForBoot();
             break;
         }
-        case UbuntuDevice::WaitForBoot: {
+        case UbuntuDevice::WaitForBoot:
+        case UbuntuDevice::WaitForBootAdbAccess:
+        case UbuntuDevice::WaitForBootDeviceLock: {
             if(code != 0) {
                 m_errorCount++;
                 waitForBoot();
@@ -397,6 +399,15 @@
 
 void UbuntuDeviceHelper::onMessage(const QString &msg) {
     m_reply.append(msg);
+
+    if(m_dev->m_processState == UbuntuDevice::WaitForBootAdbAccess) {
+        if(m_reply.contains(QStringLiteral("DevLocked"))) {
+            setProcessState(UbuntuDevice::WaitForBootDeviceLock);
+        }
+        else if(m_reply.contains(QStringLiteral("DevUnLocked"))) {
+            setProcessState(UbuntuDevice::WaitForBoot);
+        }
+    }
 }
 
 void UbuntuDeviceHelper::onError(const QString &error)
@@ -1206,6 +1217,10 @@
             return tr("Waiting for the emulator to start up");
         case WaitForBoot:
             return tr("Waiting for the device to finish booting");
+        case WaitForBootAdbAccess:
+            return tr("Waiting for adb access, make sure the developer mode is enabled");
+        case WaitForBootDeviceLock:
+            return tr("Waiting for the device, make sure it is unlocked");
         case DetectDeviceVersion:
             return tr("Detecting device version");
         case DetectNetworkConnection:

=== modified file 'src/ubuntu/ubuntudevice.h'
--- src/ubuntu/ubuntudevice.h	2014-08-06 16:00:53 +0000
+++ src/ubuntu/ubuntudevice.h	2015-01-27 07:34:20 +0000
@@ -126,6 +126,8 @@
     enum ProcessState {
         NotStarted,
         WaitForEmulatorStart,
+        WaitForBootAdbAccess,
+        WaitForBootDeviceLock,
         WaitForBoot,
         DetectDeviceVersion,
         DetectNetworkConnection,