diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-09-14 22:37:22 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-14 22:37:22 +0530 |
| commit | a34f749e9ac1d6112a42b0f4ded3ae801d8c583c (patch) | |
| tree | 0bab8a806c64af04fe7422dcb6f906515278cdb7 /app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt | |
| parent | eef809760c7359a34b414af45165b157813e78af (diff) | |
| download | HardenedPass-a34f749e9ac1d6112a42b0f4ded3ae801d8c583c.tar.gz HardenedPass-a34f749e9ac1d6112a42b0f4ded3ae801d8c583c.zip | |
Add tentative workaround for dialog crashes and refactor Git-related code (#1100)
* Ensure we're creating dialogs on the main thread
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Remove unused operation type
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Refactor launchGitOperation to use an enum
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt index 013a922d..7c1dae9b 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt @@ -5,7 +5,6 @@ package com.zeapo.pwdstore import android.content.Context -import android.content.Intent import android.content.SharedPreferences import android.os.Bundle import android.os.Parcelable @@ -90,9 +89,7 @@ class PasswordFragment : Fragment(R.layout.password_recycler_view) { } else if (!PasswordRepository.isGitRepo()) { Snackbar.make(binding.root, getString(R.string.clone_git_repo), Snackbar.LENGTH_INDEFINITE) .setAction(R.string.clone_button) { - val intent = Intent(context, GitServerConfigActivity::class.java) - intent.putExtra(BaseGitActivity.REQUEST_ARG_OP, BaseGitActivity.REQUEST_CLONE) - swipeResult.launch(intent) + swipeResult.launch(GitServerConfigActivity.createCloneIntent(requireContext())) } .show() binding.swipeRefresher.isRefreshing = false @@ -100,8 +97,8 @@ class PasswordFragment : Fragment(R.layout.password_recycler_view) { // When authentication is set to AuthMode.None then the only git operation we can // run is a pull, so automatically fallback to that. val operationId = when (GitSettings.authMode) { - AuthMode.None -> BaseGitActivity.REQUEST_PULL - else -> BaseGitActivity.REQUEST_SYNC + AuthMode.None -> BaseGitActivity.GitOp.PULL + else -> BaseGitActivity.GitOp.SYNC } requireStore().apply { lifecycleScope.launch { |