aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java
index 0d43216d..2d499b4e 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java
+++ b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java
@@ -2,9 +2,8 @@ package com.zeapo.pwdstore.git;
import android.app.Activity;
-import com.zeapo.pwdstore.utils.PasswordRepository;
-
import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.PullCommand;
import java.io.File;
@@ -29,8 +28,15 @@ public class PullOperation extends GitOperation {
this.command = new Git(repository)
.pull()
.setRebase(true)
- .setRemote("origin")
- .setCredentialsProvider(provider);
+ .setRemote("origin");
return this;
}
+
+ @Override
+ public void execute() throws Exception {
+ if (this.provider != null) {
+ ((PullCommand) this.command).setCredentialsProvider(this.provider);
+ }
+ new GitAsyncTask(callingActivity, true, false, PullCommand.class).execute(this.command);
+ }
}