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

[Benjamin Zeller]

Fix bug lp:1456627 "Almost unusuable while non-Ubuntu device connected through adb"

Fix bug lp:1456627 "Almost unusuable while non-Ubuntu device connected through adb"

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:391
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/544/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/5

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

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'src/ubuntu/ubuntudevice.cpp'
--- src/ubuntu/ubuntudevice.cpp	2015-05-05 09:38:13 +0000
+++ src/ubuntu/ubuntudevice.cpp	2015-05-21 08:14:58 +0000
@@ -159,14 +159,11 @@
 {
     Q_UNUSED(code)
 
-    if (code == 0) {
-        m_errorCount = 0;
-    } else {
-        if(m_errorCount > 3) {
-            setProcessState(UbuntuDevice::Failed);
-            m_reply.clear();
-            return;
-        }
+
+    if(m_errorCount > 3) {
+        setProcessState(UbuntuDevice::Failed);
+        m_reply.clear();
+        return;
     }
 
     switch(m_dev->m_processState) {
@@ -176,6 +173,8 @@
                 m_errorCount++;
                 waitForEmulatorStart();
                 break;
+            } else {
+                m_errorCount = 0;
             }
 
             m_dev->m_emulatorSerial = m_reply.trimmed();
@@ -191,6 +190,8 @@
                 m_errorCount++;
                 waitForBoot();
                 break;
+            } else {
+                m_errorCount = 0;
             }
             //for now the script will wait forever until the shell is available
             detect();
@@ -220,6 +221,8 @@
                 break;
             }
 
+            m_errorCount = 0;
+
             m_dev->m_framework = framework;
 
             //will trigger the device updated signal
@@ -235,6 +238,8 @@
                 m_errorCount++;
                 detectHasNetworkConnection();
                 break;
+            } else {
+                m_errorCount = 0;
             }
 
             if (m_reply.trimmed() == QString::fromLatin1(Constants::ONE_STR)) {
@@ -258,6 +263,7 @@
             break;
         }
         case UbuntuDevice::CloneNetwork:{
+            m_errorCount = 0;
             endAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_NETWORK_CONF_COPIED));
             detectHasNetworkConnection();
             break;
@@ -267,6 +273,8 @@
                 m_errorCount++;
                 detectOpenSsh();
                 break;
+            } else {
+                m_errorCount = 0;
             }
 
             if (m_reply.trimmed() != QLatin1String(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_NONE)
@@ -299,12 +307,14 @@
             break;
         }
         case UbuntuDevice::InstallOpenSSH:{
+            m_errorCount = 0;
             endAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_SSH_WAS_INSTALLED));
 
             detectOpenSsh();
             break;
         }
         case UbuntuDevice::RemoveOpenSSH:{
+            m_errorCount = 0;
             endAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_SSH_WAS_REMOVED));
 
             detectOpenSsh();
@@ -315,6 +325,8 @@
                 m_errorCount++;
                 startSshService();
                 break;
+            } else {
+                m_errorCount = 0;
             }
 
             if(m_dev->m_openSSHStarted != UbuntuDevice::Available) {
@@ -327,6 +339,7 @@
             break;
         }
         case UbuntuDevice::EnablePortForwarding:{
+            m_errorCount = 0;
             endAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_PORTS_FORWARDED));
 
             deployPublicKey();
@@ -337,6 +350,8 @@
                 m_errorCount++;
                 deployPublicKey();
                 break;
+            } else {
+                m_errorCount = 0;
             }
             //ready to use
             ProjectExplorer::DeviceManager::instance()->setDeviceState(m_dev->id(),ProjectExplorer::IDevice::DeviceReadyToUse);
@@ -350,6 +365,8 @@
                 m_errorCount++;
                 detectDeviceWritableImage();
                 break;
+            } else {
+                m_errorCount = 0;
             }
 
             if (m_reply.trimmed() == QLatin1String(Constants::ZERO_STR)) {
@@ -369,6 +386,8 @@
                 m_errorCount++;
                 detectDeveloperTools();
                 break;
+            } else {
+                m_errorCount = 0;
             }
 
             setProcessState(UbuntuDevice::Done);
@@ -385,18 +404,22 @@
             break;
         }
         case UbuntuDevice::EnableRWImage:
+            m_errorCount = 0;
             endAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_WRITABLE_ENABLED));
             detectDeviceWritableImage();
             break;
         case UbuntuDevice::DisableRWImage:
+            m_errorCount = 0;
             endAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_WRITABLE_DISABLED));
             detectDeviceWritableImage();
             break;
         case UbuntuDevice::InstallDevTools:
+            m_errorCount = 0;
             endAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_DEVELOPERTOOLS_WAS_INSTALLED));
             detectDeveloperTools();
             break;
         case UbuntuDevice::RemoveDevTools:
+            m_errorCount = 0;
             endAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_DEVELOPERTOOLS_REMOVED));
             detectDeveloperTools();
             break;