Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/services/livesync/android-livesync-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,18 @@ class AndroidLiveSyncService extends liveSyncServiceBaseLib.LiveSyncServiceBase<

public beforeLiveSyncAction(deviceAppData: Mobile.IDeviceAppData): IFuture<void> {
return (() => {
let deviceRootPath = this.getDeviceRootPath(deviceAppData.appIdentifier);
let deviceRootPath = this.getDeviceRootPath(deviceAppData.appIdentifier),
deviceRootDir = path.dirname(deviceRootPath),
deviceRootBasename = path.basename(deviceRootPath),
listResult = this.device.adb.executeShellCommand(["ls", "-l", deviceRootDir]).wait(),
regex = new RegExp(`^-.*${deviceRootBasename}$`, "m"),
matchingFile = (listResult || "").match(regex);

// Check if there is already a file with deviceRootBasename. If so, delete it as it breaks LiveSyncing.
if(matchingFile && matchingFile[0] && _.startsWith(matchingFile[0], '-')){
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add comment why the check is with - as after a week I'll not remember why do we need this and what's the reason to check if a string starts with -

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do not need the last check! In case the symbol is not - there will be no match :)

this.device.adb.executeShellCommand(["rm", "-f", deviceRootPath]).wait();
}

this.device.adb.executeShellCommand(["rm", "-rf", this.$mobileHelper.buildDevicePath(deviceRootPath, "fullsync"),
this.$mobileHelper.buildDevicePath(deviceRootPath, "sync"),
this.$mobileHelper.buildDevicePath(deviceRootPath, "removedsync")]).wait();
Expand Down