diff options
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt | 7 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt index 124f2d0a..a2b4e2a8 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.kt @@ -32,7 +32,9 @@ class GitAsyncTask( activity: Activity, private val refreshListOnEnd: Boolean, private val operation: GitOperation, - private val finishWithResultOnEnd: Intent?) : AsyncTask<GitCommand<*>, Int, GitAsyncTask.Result>() { + private val finishWithResultOnEnd: Intent?, + private val silentlyExecute: Boolean = false +) : AsyncTask<GitCommand<*>, Int, GitAsyncTask.Result>() { private val activityWeakReference: WeakReference<Activity> = WeakReference(activity) private val activity: Activity? @@ -46,6 +48,7 @@ class GitAsyncTask( } override fun onPreExecute() { + if (silentlyExecute) return dialog.run { setMessage(activity!!.resources.getString(R.string.running_dialog_text)) setCancelable(false) @@ -141,7 +144,7 @@ class GitAsyncTask( } override fun onPostExecute(maybeResult: Result?) { - dialog.dismiss() + if (!silentlyExecute) dialog.dismiss() when (val result = maybeResult ?: Result.Err(IOException("Unexpected error"))) { is Result.Err -> { if (isExplicitlyUserInitiatedError(result.err)) { diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt index 1eac569b..1f5494fd 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt @@ -58,7 +58,7 @@ class GitServerConfigActivity : BaseGitActivity() { ConnectionMode.OpenKeychain -> check(R.id.connection_mode_open_keychain) ConnectionMode.None -> uncheck(checkedButtonId) } - addOnButtonCheckedListener { group, _, _ -> + addOnButtonCheckedListener { _, _, _ -> when (checkedButtonId) { R.id.connection_mode_ssh_key -> connectionMode = ConnectionMode.SshKey R.id.connection_mode_open_keychain -> connectionMode = ConnectionMode.OpenKeychain |