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 --- .../zeapo/pwdstore/git/ResetToRemoteOperation.kt | 69 ---------------------- 1 file changed, 69 deletions(-) delete mode 100644 app/src/main/java/com/zeapo/pwdstore/git/ResetToRemoteOperation.kt (limited to 'app/src/main/java/com/zeapo/pwdstore/git/ResetToRemoteOperation.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/git/ResetToRemoteOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/ResetToRemoteOperation.kt deleted file mode 100644 index 60a9fbf3..00000000 --- a/app/src/main/java/com/zeapo/pwdstore/git/ResetToRemoteOperation.kt +++ /dev/null @@ -1,69 +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 androidx.preference.PreferenceManager -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.zeapo.pwdstore.R -import com.zeapo.pwdstore.utils.PreferenceKeys -import java.io.File -import org.eclipse.jgit.api.Git -import org.eclipse.jgit.api.GitCommand -import org.eclipse.jgit.api.ResetCommand -import org.eclipse.jgit.api.TransportCommand - -/** - * Creates a new git operation - * - * @param fileDir the git working tree directory - * @param callingActivity the calling activity - */ -class ResetToRemoteOperation(fileDir: File, callingActivity: AppCompatActivity) : GitOperation(fileDir, callingActivity) { - - private lateinit var commands: List> - - /** - * Sets the command - * - * @return the current object - */ - fun setCommands(): ResetToRemoteOperation { - val remoteBranch = PreferenceManager - .getDefaultSharedPreferences(callingActivity.applicationContext) - .getString(PreferenceKeys.GIT_BRANCH_NAME, "master") - val git = Git(repository) - val cmds = arrayListOf( - git.add().addFilepattern("."), - git.fetch().setRemote("origin"), - git.reset().setRef("origin/$remoteBranch").setMode(ResetCommand.ResetType.HARD) - ) - if (git.branchList().call().none { it.name == remoteBranch }) { - cmds.add( - git.branchCreate().setName(remoteBranch).setForce(true) - ) - } - commands = cmds - return this - } - - override fun execute() { - commands.filterIsInstance>().map { it.setCredentialsProvider(provider) } - GitAsyncTask(callingActivity, this, Intent()).execute(*commands.toTypedArray()) - } - - 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)) { _, _ -> } - .show() - } -} -- cgit v1.2.3