De-duplicate the credential-column writer; tighten a test

updateApplicationPasswordCredentials and clearApplicationPasswordCredentials
hand-wrote the same four-column ContentValues, so the column set lived in
two places — a future column change has to touch both or clear leaves a
stale column. Route both through one private writeApplicationPasswordCredentialColumns.

ApplicationPasswordViewModelSliceTest: the xmlRpc-rediscovery-success
assertion was pre-satisfied by @before seeding siteTest.xmlRpcUrl to the
same value; reset it to null first so the assertion proves rediscovery
assigned it.

Author: jkmassel

WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/applicationpassword/ApplicationPasswordViewModelSliceTest.kt

@@ -377,6 +377,8 @@ class ApplicationPasswordViewModelSliceTest : BaseUnitTest() {
     @Test
     fun `given xmlRpc rediscovery and auth check succeed, then persist the discovered xmlRpcUrl`() =
         runTest {
+            // @Before seeds siteTest.xmlRpcUrl; clear it so the final assertion proves rediscovery set it.
+            siteTest.xmlRpcUrl = null
             val xmlRpcUrl = "https://www.test.com/xmlrpc.php"
             whenever(
                 selfHostedEndpointFinder

libs/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/SiteSqlUtils.kt

@@ -334,32 +334,39 @@ class SiteSqlUtils
     fun updateApplicationPasswordCredentials(localId: Int, usernamePlain: String, passwordPlain: String): Int {
         val username = encryptionUtils.encrypt(usernamePlain)
         val password = encryptionUtils.encrypt(passwordPlain)
-        return WellSql.update(SiteModel::class.java)
-                .whereId(localId)
-                .put(localId, { _ ->
-                    val cv = ContentValues()
-                    cv.put(SiteModelTable.API_REST_USERNAME, username.first)
-                    cv.put(SiteModelTable.API_REST_USERNAME_IV, username.second)
-                    cv.put(SiteModelTable.API_REST_PASSWORD, password.first)
-                    cv.put(SiteModelTable.API_REST_PASSWORD_IV, password.second)
-                    cv
-                }).execute()
+        return writeApplicationPasswordCredentialColumns(
+                localId, username.first, username.second, password.first, password.second
+        )
     }
 
     /**
      * Clears the application-password credential columns (encrypted username/password and their IVs) for the
      * given local id. Companion to [updateApplicationPasswordCredentials] for the sign-out / revoke paths,
      * since the generic update path no longer touches these columns.
      */
-    fun clearApplicationPasswordCredentials(localId: Int): Int {
+    fun clearApplicationPasswordCredentials(localId: Int): Int =
+            writeApplicationPasswordCredentialColumns(localId, "", "", "", "")
+
+    /**
+     * The single place that maps the four application-password credential columns to their values, so the
+     * column set lives in one spot. Callers pass already-encrypted values (or empty strings to clear); each
+     * IV always travels with its ciphertext, so a row can never be left holding one without the other.
+     */
+    private fun writeApplicationPasswordCredentialColumns(
+        localId: Int,
+        usernameCipher: String,
+        usernameIv: String,
+        passwordCipher: String,
+        passwordIv: String
+    ): Int {
         return WellSql.update(SiteModel::class.java)
                 .whereId(localId)
                 .put(localId, { _ ->
                     val cv = ContentValues()
-                    cv.put(SiteModelTable.API_REST_USERNAME, "")
-                    cv.put(SiteModelTable.API_REST_USERNAME_IV, "")
-                    cv.put(SiteModelTable.API_REST_PASSWORD, "")
-                    cv.put(SiteModelTable.API_REST_PASSWORD_IV, "")
+                    cv.put(SiteModelTable.API_REST_USERNAME, usernameCipher)
+                    cv.put(SiteModelTable.API_REST_USERNAME_IV, usernameIv)
+                    cv.put(SiteModelTable.API_REST_PASSWORD, passwordCipher)
+                    cv.put(SiteModelTable.API_REST_PASSWORD_IV, passwordIv)
                     cv
                 }).execute()
     }