diff options
| author | zeapo <mohamed@zenadi.com> | 2014-12-18 21:52:38 +0100 |
|---|---|---|
| committer | zeapo <mohamed@zenadi.com> | 2015-01-04 14:53:59 +0100 |
| commit | 3ca806d699182f3233c2425bd407988540083758 (patch) | |
| tree | 7ce5ff71892fc8fcc9ab172fd4e4fcfcd834fc1e /app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java | |
| parent | 530453025c1b0b90eb559e5480d57584b94ba661 (diff) | |
| download | HardenedPass-3ca806d699182f3233c2425bd407988540083758.tar.gz HardenedPass-3ca806d699182f3233c2425bd407988540083758.zip | |
set credential after they've been intialized
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.java | 14 |
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); + } } |
