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/PullOperation.kt | 52 ---------------------- 1 file changed, 52 deletions(-) delete mode 100644 app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt (limited to 'app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt deleted file mode 100644 index 0e36f46a..00000000 --- a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt +++ /dev/null @@ -1,52 +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.Git -import org.eclipse.jgit.api.PullCommand - -/** - * Creates a new git operation - * - * @param fileDir the git working tree directory - * @param callingActivity the calling activity - */ -class PullOperation(fileDir: File, callingActivity: AppCompatActivity) : GitOperation(fileDir, callingActivity) { - - /** - * Sets the command - * - * @return the current object - */ - fun setCommand(): PullOperation { - this.command = Git(repository) - .pull() - .setRebase(true) - .setRemote("origin") - return this - } - - override fun execute() { - (this.command as? PullCommand)?.setCredentialsProvider(this.provider) - GitAsyncTask(callingActivity, this, Intent()).execute(this.command) - } - - 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 pull operation, " + - callingActivity.resources.getString(R.string.jgit_error_dialog_text) + - err.message + - "\nPlease check the FAQ for possible reasons why this error might occur.") - .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ -> callingActivity.finish() } - .show() - } -} -- cgit v1.2.3