Refactor Git related activities (#685)

* Refactor git logic into separate parts

* Extract hardcoded strings

* Add KDoc to updateHostname, remove unused field

* Cleanups

* Fix dialog message

* Wire in repository clone flow

* spotless

* Remove unused method

* Cleanup GitActivity

- Rename to GitOperationActivity.
- Ensure identityBuilder is always closed regardless of what fragment uses it.
- Remove hardcoded "Operation" strings and replace with REQUEST_ARG_OP.
- Apply a transparent theme to GitOperationActivity make the UI less jarring.

* Tweak some stupidly worded dialog messages

As pointed out in #629, these strings are shoddily worded and do not express any clear intent to the
user, leaving them confused and angry.

* GitOperationActivity: wrap Context to ensure right theme is used

* spotless

* undo build.gradle change

* Use correct parent theme, remove now useless wrapping

* GitServerConfigActivity: fix repository clone flow

* temp: disable leakcanary

framework leaks on Samsung are pissing me off

* Make system bars transparent in git activity

* Tweak HTTPS password layout

* Unhardcode wrong passphrase string

* Store SSH passphrase in EncryptedSharedPreferences

Also revamp the dialog to look a bit better

* Implement support for remembering HTTPS password

Fixes #521

* Try to patch HTTPS remote creation logic

* Update security-crypto

* Clear saved passphrase/password on auth failure

* Revert "Update security-crypto"

Broken on R DP2.1

This reverts commit 4b20371dd42c512a3dd3b759859abb6c1ffd2961.

* Revert "temp: disable leakcanary"

This reverts commit 2db7d41bd67b79c6dc8c5b359a7b27100379f45f.

* Update CHANGELOG

* Remove spacer

* Remove useless override

* Wrap git server activity in a ScrollView

* GitOperation: always finish calling activity when dialogs are dismissed

* Wipe saved password/passphrase when hostname changes

* Don't commit prefs updates

* Don't call listFiles excessively

* Finish activity after saving configuration

* Make ConnectionMode and Protocol enum classes

* Change SSH key passphrase key, don't wipe on host change

* Reimplement BaseGitActivity.updateUrl (was updateHostname)

* Use SharedPreferences.edit KTX extension

* Disable inapplicable connection modes depending on scheme

* BaseGitActivity: annotate onDestroy with CallSuper

We'll leak the identityBuilder connection otherwise

* Move input hack for AlertDialog into an extension function

We re-use this in many places

* Fix protocol/mode toggle issue and consistenly name options

* Fix a crash when opening GitServerConfigActivity without a repo

* Fix OpenKeychain callbacks by moving onActivityResult to BaseGitActivity

* Run spotlessApply

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Co-authored-by: Fabian Henneke <fabian@henneke.me>

1 files changed, 62 insertions, 0 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
new file mode 100644
index 00000000..8a05ca40
--- /dev/null
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
@@ -0,0 +1,62 @@
+/*
+ * 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.os.Bundle
+import android.util.Patterns
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.zeapo.pwdstore.R
+import com.zeapo.pwdstore.databinding.ActivityGitConfigBinding
+import com.zeapo.pwdstore.utils.PasswordRepository
+import org.eclipse.jgit.lib.Constants
+
+class GitConfigActivity : BaseGitActivity() {
+
+    private lateinit var binding: ActivityGitConfigBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityGitConfigBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        binding.gitUserName.setText(username)
+        binding.gitUserEmail.setText(email)
+        val repo = PasswordRepository.getRepository(PasswordRepository.getRepositoryDirectory(this))
+        if (repo != null) {
+            try {
+                val objectId = repo.resolve(Constants.HEAD)
+                val ref = repo.getRef("refs/heads/master")
+                val head = if (ref.objectId.equals(objectId)) ref.name else "DETACHED"
+                binding.gitCommitHash.text = String.format("%s (%s)", objectId.abbreviate(8).name(), head)
+
+                // enable the abort button only if we're rebasing
+                val isRebasing = repo.repositoryState.isRebasing
+                binding.gitAbortRebase.isEnabled = isRebasing
+                binding.gitAbortRebase.alpha = if (isRebasing) 1.0f else 0.5f
+            } catch (ignored: Exception) {
+            }
+        }
+        binding.gitAbortRebase.setOnClickListener { launchGitOperation(BREAK_OUT_OF_DETACHED) }
+        binding.gitResetToRemote.setOnClickListener { launchGitOperation(REQUEST_RESET) }
+        binding.saveButton.setOnClickListener {
+            val email = binding.gitUserEmail.text.toString().trim()
+            val name = binding.gitUserName.text.toString().trim()
+            if (!email.matches(Patterns.EMAIL_ADDRESS.toRegex())) {
+                MaterialAlertDialogBuilder(this)
+                        .setMessage(getString(R.string.invalid_email_dialog_text))
+                        .setPositiveButton(getString(R.string.dialog_ok), null)
+                        .show()
+            } else {
+                val editor = settings.edit()
+                editor.putString("git_config_user_email", email)
+                editor.putString("git_config_user_name", name)
+                PasswordRepository.setUserName(name)
+                PasswordRepository.setUserEmail(email)
+                editor.apply()
+            }
+        }
+    }
+}