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, 81 insertions, 0 deletions

diff --git a/app/src/androidTest/java/com/zeapo/pwdstore/MigrationsTest.kt b/app/src/androidTest/java/com/zeapo/pwdstore/MigrationsTest.kt
new file mode 100644
index 00000000..d1b04fc3
--- /dev/null
+++ b/app/src/androidTest/java/com/zeapo/pwdstore/MigrationsTest.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+@file:Suppress("DEPRECATION")
+package com.zeapo.pwdstore
+
+import android.content.Context
+import androidx.core.content.edit
+import com.zeapo.pwdstore.utils.PreferenceKeys
+import com.zeapo.pwdstore.utils.getString
+import com.zeapo.pwdstore.utils.sharedPrefs
+import org.junit.Test
+
+import org.junit.Assert.*
+
+class MigrationsTest {
+
+    private fun checkOldKeysAreRemoved(context: Context) = with(context.sharedPrefs) {
+        assertNull(getString(PreferenceKeys.GIT_REMOTE_PORT))
+        assertNull(getString(PreferenceKeys.GIT_REMOTE_USERNAME))
+        assertNull(getString(PreferenceKeys.GIT_REMOTE_SERVER))
+        assertNull(getString(PreferenceKeys.GIT_REMOTE_LOCATION))
+    }
+
+    @Test
+    fun verifySshWithCustomPortMigration() {
+        val context = Application.instance.applicationContext
+        context.sharedPrefs.edit {
+            clear()
+            putString(PreferenceKeys.GIT_REMOTE_PORT, "2200")
+            putString(PreferenceKeys.GIT_REMOTE_USERNAME, "msfjarvis")
+            putString(PreferenceKeys.GIT_REMOTE_LOCATION, "/mnt/disk3/pass-repo")
+            putString(PreferenceKeys.GIT_REMOTE_SERVER, "192.168.0.102")
+            putString(PreferenceKeys.GIT_REMOTE_PROTOCOL, "ssh://")
+        }
+        runMigrations(context)
+        checkOldKeysAreRemoved(context)
+        assertEquals(
+            context.sharedPrefs.getString(PreferenceKeys.GIT_REMOTE_URL),
+            "ssh://msfjarvis@192.168.0.102:2200/mnt/disk3/pass-repo"
+        )
+    }
+
+    @Test
+    fun verifySshWithDefaultPortMigration() {
+        val context = Application.instance.applicationContext
+        context.sharedPrefs.edit {
+            clear()
+            putString(PreferenceKeys.GIT_REMOTE_USERNAME, "msfjarvis")
+            putString(PreferenceKeys.GIT_REMOTE_LOCATION, "/mnt/disk3/pass-repo")
+            putString(PreferenceKeys.GIT_REMOTE_SERVER, "192.168.0.102")
+            putString(PreferenceKeys.GIT_REMOTE_PROTOCOL, "ssh://")
+        }
+        runMigrations(context)
+        checkOldKeysAreRemoved(context)
+        assertEquals(
+            context.sharedPrefs.getString(PreferenceKeys.GIT_REMOTE_URL),
+            "msfjarvis@192.168.0.102:/mnt/disk3/pass-repo"
+        )
+    }
+
+    @Test
+    fun verifyHttpsWithGitHubMigration() {
+        val context = Application.instance.applicationContext
+        context.sharedPrefs.edit {
+            clear()
+            putString(PreferenceKeys.GIT_REMOTE_USERNAME, "msfjarvis")
+            putString(PreferenceKeys.GIT_REMOTE_LOCATION, "Android-Password-Store/pass-test")
+            putString(PreferenceKeys.GIT_REMOTE_SERVER, "github.com")
+            putString(PreferenceKeys.GIT_REMOTE_PROTOCOL, "https://")
+        }
+        runMigrations(context)
+        checkOldKeysAreRemoved(context)
+        assertEquals(
+            context.sharedPrefs.getString(PreferenceKeys.GIT_REMOTE_URL),
+            "https://github.com/Android-Password-Store/pass-test"
+        )
+    }
+}