Issue mozilla-mobile#10140 - Part 1: Refactor autocomplete extension …

…functions into ext/Login.kt - Moves `Autocomplete.LoginEntry.toLogin()` and `Login.toLoginEntry()` extension functions into `ext/Login.kt` - Remove duplicates of `Autocomplete.LoginEntry.toLogin()` and `Login.toLoginEntry()`.
gabrielluong · May 4, 2021 · 4c04d08 · 4c04d08
1 parent 7d53e94
commit 4c04d08
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 54 deletions.
diff --git a/...c/main/java/mozilla/components/browser/engine/gecko/autofill/GeckoLoginDelegateWrapper.kt b/...c/main/java/mozilla/components/browser/engine/gecko/autofill/GeckoLoginDelegateWrapper.kt
@@ -7,6 +7,8 @@ package mozilla.components.browser.engine.gecko.autofill
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import mozilla.components.browser.engine.gecko.ext.toLogin
+import mozilla.components.browser.engine.gecko.ext.toLoginEntry
 import mozilla.components.concept.storage.Login
 import mozilla.components.concept.storage.LoginStorageDelegate
 import org.mozilla.geckoview.Autocomplete
@@ -42,27 +44,3 @@ class GeckoLoginDelegateWrapper(private val storageDelegate: LoginStorageDelegat
         return result
     }
 }
-
-/**
- * Converts a GeckoView [LoginStorage.LoginEntry] to an Android Components [Login]
- */
-private fun Autocomplete.LoginEntry.toLogin() = Login(
-    guid = guid,
-    origin = origin,
-    formActionOrigin = formActionOrigin,
-    httpRealm = httpRealm,
-    username = username,
-    password = password
-)
-
-/**
- * Converts an Android Components [Login] to a GeckoView [LoginStorage.LoginEntry]
- */
-private fun Login.toLoginEntry() = Autocomplete.LoginEntry.Builder()
-    .guid(guid)
-    .origin(origin)
-    .formActionOrigin(formActionOrigin)
-    .httpRealm(httpRealm)
-    .username(username)
-    .password(password)
-    .build()
diff --git a/...s/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/ext/Login.kt b/...s/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/ext/Login.kt
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.browser.engine.gecko.ext
+
+import mozilla.components.concept.storage.Login
+import org.mozilla.geckoview.Autocomplete
+
+/**
+ * Converts a GeckoView [Autocomplete.LoginEntry] to an Android Components [Login].
+ */
+fun Autocomplete.LoginEntry.toLogin() = Login(
+    guid = guid,
+    origin = origin,
+    formActionOrigin = formActionOrigin,
+    httpRealm = httpRealm,
+    username = username,
+    password = password
+)
+
+/**
+ * Converts an Android Components [Login] to a GeckoView [Autocomplete.LoginEntry].
+ */
+fun Login.toLoginEntry() = Autocomplete.LoginEntry.Builder()
+    .guid(guid)
+    .origin(origin)
+    .formActionOrigin(formActionOrigin)
+    .httpRealm(httpRealm)
+    .username(username)
+    .password(password)
+    .build()
diff --git a/...gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegate.kt b/...gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegate.kt
@@ -8,6 +8,8 @@ import android.content.Context
 import android.net.Uri
 import androidx.annotation.VisibleForTesting
 import mozilla.components.browser.engine.gecko.GeckoEngineSession
+import mozilla.components.browser.engine.gecko.ext.toLogin
+import mozilla.components.browser.engine.gecko.ext.toLoginEntry
 import mozilla.components.concept.engine.prompt.Choice
 import mozilla.components.concept.engine.prompt.PromptRequest
 import mozilla.components.concept.engine.prompt.PromptRequest.MenuChoice
@@ -57,24 +59,6 @@ typealias AC_FILE_FACING_MODE = PromptRequest.File.FacingMode
 internal class GeckoPromptDelegate(private val geckoEngineSession: GeckoEngineSession) :
     PromptDelegate {
 
-    private fun Autocomplete.LoginEntry.toLogin() = Login(
-        guid = guid,
-        origin = origin,
-        formActionOrigin = formActionOrigin,
-        httpRealm = httpRealm,
-        username = username,
-        password = password
-    )
-
-    private fun Login.toLoginEntry() = Autocomplete.LoginEntry.Builder()
-        .guid(guid)
-        .origin(origin)
-        .formActionOrigin(formActionOrigin)
-        .httpRealm(httpRealm)
-        .username(username)
-        .password(password)
-        .build()
-
     override fun onLoginSave(
         session: GeckoSession,
         prompt: PromptDelegate.AutocompleteRequest<Autocomplete.LoginSaveOption>

diff --git a/...o/src/test/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegateTest.kt b/...o/src/test/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegateTest.kt
@@ -7,6 +7,7 @@ package mozilla.components.browser.engine.gecko.prompt
 import android.net.Uri
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import mozilla.components.browser.engine.gecko.GeckoEngineSession
+import mozilla.components.browser.engine.gecko.ext.toLoginEntry
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.prompt.Choice
 import mozilla.components.concept.engine.prompt.PromptRequest
@@ -754,18 +755,6 @@ class GeckoPromptDelegateTest {
         passwordField = passwordField
     )
 
-    /**
-     * Converts an Android Components [Login] to a GeckoView [LoginStorage.LoginEntry]
-     */
-    private fun Login.toLoginEntry() = Autocomplete.LoginEntry.Builder()
-        .guid(guid)
-        .origin(origin)
-        .formActionOrigin(formActionOrigin)
-        .httpRealm(httpRealm)
-        .username(username)
-        .password(password)
-        .build()
-
     @Test
     fun `Calling onAuthPrompt must provide an Authentication PromptRequest`() {
         val mockSession = GeckoEngineSession(runtime)