Skip to content

Commit

Permalink
Merge pull request #993 from ubports/fastboot_boot_continue
Browse files Browse the repository at this point in the history
Fastboot boot continue
  • Loading branch information
NeoTheThird authored Nov 2, 2019
2 parents 1828501 + ca13390 commit f51b8b5
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 5 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"jquery": "^3.1.1",
"jquery-i18next": "^1.2.0",
"mkdirp": "^0.5.1",
"promise-android-tools": "^1.0.7",
"promise-android-tools": "^1.0.8",
"request": "^2.79.0",
"system-image-node-module": "^1.0.10",
"ubports-api-node-module": "^2.0.1",
Expand Down
24 changes: 23 additions & 1 deletion src/devices.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,36 @@ function installStep(step) {
case "fastboot:reboot_bootloader":
return new Promise(function(resolve, reject) {
global.mainEvent.emit("user:write:working", "particles");
global.mainEvent.emit("user:write:status", "Rebooting");
global.mainEvent.emit("user:write:status", "Rebooting", true);
global.mainEvent.emit("user:write:under", "Rebooting to bootloader");
fastboot
.rebootBootloader()
.then(resolve)
.catch(reject);
});
break;
case "fastboot:reboot":
return new Promise(function(resolve, reject) {
global.mainEvent.emit("user:write:working", "particles");
global.mainEvent.emit("user:write:status", "Rebooting", true);
global.mainEvent.emit("user:write:under", "Rebooting system");
fastboot
.reboot()
.then(resolve)
.catch(reject);
});
break;
case "fastboot:continue":
return new Promise(function(resolve, reject) {
global.mainEvent.emit("user:write:working", "particles");
global.mainEvent.emit("user:write:status", "Continuing boot", true);
global.mainEvent.emit("user:write:under", "Resuming boot");
fastboot
.continue()
.then(resolve)
.catch(reject);
});
break;
case "user_action":
return new Promise(function(resolve, reject) {
global.mainEvent.emit(
Expand Down

0 comments on commit f51b8b5

Please sign in to comment.