Put the rebase abort in an async task
uhum... there was network operation
This commit is contained in:
parent
040f000d99
commit
552f3fe5a5
1 changed files with 14 additions and 9 deletions
|
@ -520,16 +520,21 @@ public class GitActivity extends AppCompatActivity {
|
|||
}
|
||||
|
||||
public void abortRebase(View view) {
|
||||
Repository repo = PasswordRepository.getRepository(PasswordRepository.getRepositoryDirectory(getApplicationContext()));
|
||||
final Repository repo = PasswordRepository.getRepository(PasswordRepository.getRepositoryDirectory(getApplicationContext()));
|
||||
if (repo != null) {
|
||||
try {
|
||||
// no network or heavy computation done, it's ok to do it on the ui-thread
|
||||
new Git(repo).rebase().setOperation(RebaseCommand.Operation.ABORT).call();
|
||||
} catch (Exception e) {
|
||||
//ignore
|
||||
} finally {
|
||||
showGitConfig();
|
||||
}
|
||||
new GitOperation(PasswordRepository.getRepositoryDirectory(activity), activity) {
|
||||
@Override
|
||||
public void execute() {
|
||||
Log.d(TAG, "Resetting the repository");
|
||||
assert repository != null;
|
||||
GitAsyncTask tasks = new GitAsyncTask(activity, false, true, this);
|
||||
tasks.execute(new Git(repo).rebase().setOperation(RebaseCommand.Operation.ABORT));
|
||||
}
|
||||
@Override
|
||||
public void onSuccess() {
|
||||
showGitConfig();
|
||||
}
|
||||
}.execute();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue