kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

set credential after they've been intialized

Browse source
This commit is contained in:
zeapo 2014-12-18 21:52:38 +01:00
parent 530453025c
commit 3ca806d699
4 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/zeapo/pwdstore/git/CloneOperation.java
View file

@ -4,7 +4,6 @@ import android.app.Activity;
import org.eclipse.jgit.api.CloneCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import java.io.File;
@ -27,7 +26,6 @@ public class CloneOperation extends GitOperation {
*/
public CloneOperation setCommand(String uri) {
this.command = Git.cloneRepository().
setCredentialsProvider(provider).
setCloneAllBranches(true).
setDirectory(repository.getWorkTree()).
setURI(uri);
@ -58,4 +56,12 @@ public class CloneOperation extends GitOperation {
super.setAuthentication(sshKey, username, passphrase);
return this;
}
@Override
public void execute() throws Exception {
if (this.provider != null) {
((CloneCommand) this.command).setCredentialsProvider(this.provider);
}
new GitAsyncTask(callingActivity, true, false, CloneCommand.class).execute(this.command);
}
}

4
app/src/main/java/com/zeapo/pwdstore/git/GitOperation.java
View file

@ -78,9 +78,7 @@ public abstract class GitOperation {
*
* @throws Exception
*/
public void execute() throws Exception {
new GitAsyncTask(callingActivity, true, false, GitCommand.class).execute(command);
}
public abstract void execute() throws Exception;
/**
* Executes the GitCommand in an async task after creating the authentication

14
app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java
View file

@ -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);
}
}

12
app/src/main/java/com/zeapo/pwdstore/git/PushOperation.java
View file

@ -3,6 +3,7 @@ package com.zeapo.pwdstore.git;
import android.app.Activity;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.PushCommand;
import java.io.File;
@ -27,8 +28,15 @@ public class PushOperation extends GitOperation {
this.command = new Git(repository)
.push()
.setPushAll()
.setRemote("origin")
.setCredentialsProvider(provider);
.setRemote("origin");
return this;
}
@Override
public void execute() throws Exception {
if (this.provider != null) {
((PushCommand) this.command).setCredentialsProvider(this.provider);
}
new GitAsyncTask(callingActivity, true, false, PushCommand.class).execute(this.command);
}
}