From 2f46a54ba9302a9d05f998d48ec7a29f5fd9479d Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Mon, 20 Jul 2015 16:07:25 +0300 Subject: [PATCH 1/2] Fix permission denied when live syncing to android device --- lib/common | 2 +- lib/services/usb-livesync-service.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/common b/lib/common index 689f53d7d2..bd52df0347 160000 --- a/lib/common +++ b/lib/common @@ -1 +1 @@ -Subproject commit 689f53d7d222bf80fa1dbf80ed7053eb68105d7f +Subproject commit bd52df03471d65128b241a62d7ad7169acf43b1a diff --git a/lib/services/usb-livesync-service.ts b/lib/services/usb-livesync-service.ts index 8005c83002..0b762e3241 100644 --- a/lib/services/usb-livesync-service.ts +++ b/lib/services/usb-livesync-service.ts @@ -107,7 +107,9 @@ export class AndroidUsbLiveSyncService extends androidLiveSyncServiceLib.Android let devicePathRoot = `/data/data/${deviceAppData.appIdentifier}/files`; _.each(localToDevicePaths, localToDevicePath => { let devicePath = this.$mobileHelper.correctDevicePath(path.join(devicePathRoot, localToDevicePath.getRelativeToProjectBasePath())); - commands.push(`mv "${localToDevicePath.getDevicePath()}" "${devicePath}"`); + if(this.$fs.getFsStats(localToDevicePath.getLocalPath()).wait().isFile()) { + commands.push(`mv "${localToDevicePath.getDevicePath()}" "${devicePath}"`); + } }); commands.push(`rm -rf ${this.$mobileHelper.buildDevicePath(devicePathRoot, "code_cache", "secondary_dexes", "proxyThumb")}`); From bbbe8e7e1a8999dde79f64ba171e4848396a4389 Mon Sep 17 00:00:00 2001 From: Fatme Havaluova Date: Mon, 20 Jul 2015 17:10:15 +0300 Subject: [PATCH 2/2] Fix livesync ios when having both iOS and Android devices connected at the same time --- lib/common | 2 +- lib/services/usb-livesync-service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/common b/lib/common index bd52df0347..5e6ac645bf 160000 --- a/lib/common +++ b/lib/common @@ -1 +1 @@ -Subproject commit bd52df03471d65128b241a62d7ad7169acf43b1a +Subproject commit 5e6ac645bf45ccf7cd47d002a3a4b3044df5c0ad diff --git a/lib/services/usb-livesync-service.ts b/lib/services/usb-livesync-service.ts index 0b762e3241..fb2d542528 100644 --- a/lib/services/usb-livesync-service.ts +++ b/lib/services/usb-livesync-service.ts @@ -30,7 +30,7 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer public liveSync(platform: string): IFuture { return (() => { - platform = this.initialize(platform).wait(); + platform = platform || this.initialize(platform).wait(); this.$platformService.preparePlatform(platform).wait(); let platformData = this.$platformsData.getPlatformData(platform.toLowerCase());