Switch to URL-based Git config and refactor Git settings (#1008)

* Make Git config URL-based and refactor

* Use Kotlin style null handling for string prefs

* Also show an error if generated URL can't be parsed

* Add some testcases for migration strategy

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>

1 files changed, 3 insertions, 2 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt
index 121a3402..eda2a8fe 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt
@@ -12,6 +12,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.zeapo.pwdstore.R
 import com.zeapo.pwdstore.UserPreference
+import com.zeapo.pwdstore.git.config.GitSettings
 import com.zeapo.pwdstore.utils.PasswordRepository
 import kotlinx.coroutines.launch
 
@@ -57,7 +58,7 @@ open class GitOperationActivity : BaseGitActivity() {
      * @param operation the operation to execute can be REQUEST_PULL or REQUEST_PUSH
      */
     private suspend fun syncRepository(operation: Int) {
-        if (serverUser.isEmpty() || serverHostname.isEmpty() || url.isNullOrEmpty())
+        if (GitSettings.url.isNullOrEmpty())
             MaterialAlertDialogBuilder(this)
                 .setMessage(getString(R.string.set_information_dialog_text))
                 .setPositiveButton(getString(R.string.dialog_positive)) { _, _ ->
@@ -72,7 +73,7 @@ open class GitOperationActivity : BaseGitActivity() {
                 .show()
         else {
             // check that the remote origin is here, else add it
-            PasswordRepository.addRemote("origin", url!!, true)
+            PasswordRepository.addRemote("origin", GitSettings.url!!, true)
             launchGitOperation(operation)
         }
     }