Skip to content
This repository was archived by the owner on Jan 7, 2025. It is now read-only.
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import org.eclipse.jgit.util.FS;

import java.io.File;
import java.util.HashSet;
import java.util.Set;

public class SSHSynchronizer extends Synchronizer {
private final String LT = "SyncOrg";
Expand Down Expand Up @@ -78,12 +80,29 @@ public void connect() {

}

private HashSet<String> makeAbsolute(String folder, Set<String> relativePaths) {
HashSet<String> result = new HashSet<>();
for (String filePath : relativePaths) {
result.add(folder + "/" + filePath);
}
return result;
}

private SyncResult withAbsolutePaths(String folder, SyncResult relativePathsResult) {
SyncResult result = new SyncResult();
result.newFiles = makeAbsolute(folder, relativePathsResult.newFiles);
result.changedFiles = makeAbsolute(folder, relativePathsResult.changedFiles);
result.deletedFiles = makeAbsolute(folder, relativePathsResult.deletedFiles);
result.setState(relativePathsResult.state);
return result;
}

public SyncResult synchronize() {
if (PermissionManager.permissionGranted(context) == false) return new SyncResult();

if (isCredentialsRequired()) return new SyncResult();
String folder = Synchronizer.getSynchronizer(context).getAbsoluteFilesDir();
SyncResult pullResult = JGitWrapper.pull(context, folder);
SyncResult pullResult = withAbsolutePaths(folder, JGitWrapper.pull(context, folder));

new JGitWrapper.PushTask(context).execute();
return pullResult;
Expand Down