Allow multiple connection retries after user actions

ubports · Nov 6, 2019 · d416a31 · d416a31
1 parent 2274045
commit d416a31
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/src/devices.js b/src/devices.js
@@ -253,11 +253,14 @@ function installStep(step) {
                   "user:write:under",
                   "Adb is scanning for devices"
                 );
-                adb
-                  .waitForDevice()
-                  .then(resolve)
-                  .catch(() => mainEvent.emit("user:connection-lost", resolve));
-                break;
+                function adbWait() {
+                  return adb
+                    .waitForDevice()
+                    .catch(() =>
+                      mainEvent.emit("user:connection-lost", adbWait)
+                    );
+                }
+                return adbWait();
               case "bootloader":
                 global.mainEvent.emit("user:write:working", "particles");
                 global.mainEvent.emit(
@@ -269,11 +272,14 @@ function installStep(step) {
                   "user:write:under",
                   "Fastboot is scanning for devices"
                 );
-                fastboot
-                  .waitForDevice()
-                  .then(resolve)
-                  .catch(() => mainEvent.emit("user:connection-lost", resolve));
-                break;
+                function fastbootWait() {
+                  return fastboot
+                    .waitForDevice()
+                    .catch(() =>
+                      mainEvent.emit("user:connection-lost", fastbootWait)
+                    );
+                }
+                return fastbootWait();
               default:
                 resolve();
                 break;