From 14c44bf584cb7d13ada46b264419efca923ed65c Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 5 Aug 2020 19:02:24 +0530 Subject: Remove GitAsyncTask and replace with non-blocking coroutines (#865) Co-authored-by: Fabian Henneke --- .../java/com/zeapo/pwdstore/git/SyncOperation.kt | 67 ---------------------- 1 file changed, 67 deletions(-) delete mode 100644 app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.kt (limited to 'app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.kt deleted file mode 100644 index 386bdf1e..00000000 --- a/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.kt +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ -package com.zeapo.pwdstore.git - -import android.content.Intent -import androidx.appcompat.app.AppCompatActivity -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.zeapo.pwdstore.R -import java.io.File -import org.eclipse.jgit.api.AddCommand -import org.eclipse.jgit.api.CommitCommand -import org.eclipse.jgit.api.Git -import org.eclipse.jgit.api.PullCommand -import org.eclipse.jgit.api.PushCommand -import org.eclipse.jgit.api.StatusCommand - -/** - * Creates a new git operation - * - * @param fileDir the git working tree directory - * @param callingActivity the calling activity - */ -class SyncOperation(fileDir: File, callingActivity: AppCompatActivity) : GitOperation(fileDir, callingActivity) { - - private var addCommand: AddCommand? = null - private var statusCommand: StatusCommand? = null - private var commitCommand: CommitCommand? = null - private var pullCommand: PullCommand? = null - private var pushCommand: PushCommand? = null - - /** - * Sets the command - * - * @return the current object - */ - fun setCommands(): SyncOperation { - val git = Git(repository) - this.addCommand = git.add().addFilepattern(".") - this.statusCommand = git.status() - this.commitCommand = git.commit().setAll(true).setMessage("[Android Password Store] Sync") - this.pullCommand = git.pull().setRebase(true).setRemote("origin") - this.pushCommand = git.push().setPushAll().setRemote("origin") - return this - } - - override fun execute() { - if (this.provider != null) { - this.pullCommand?.setCredentialsProvider(this.provider) - this.pushCommand?.setCredentialsProvider(this.provider) - } - GitAsyncTask(callingActivity, this, Intent()).execute(this.addCommand, this.statusCommand, this.commitCommand, this.pullCommand, this.pushCommand) - } - - override fun onError(err: Exception) { - super.onError(err) - MaterialAlertDialogBuilder(callingActivity) - .setTitle(callingActivity.resources.getString(R.string.jgit_error_dialog_title)) - .setMessage("Error occurred during the sync operation, " + - "\nPlease check the FAQ for possible reasons why this error might occur." + - callingActivity.resources.getString(R.string.jgit_error_dialog_text) + - err) - .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ -> callingActivity.finish() } - .show() - } -} -- cgit v1.2.3