Integrate autofill repo

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "submodules/privacy-grade"]
 	path = submodules/privacy-grade
 	url = https://github.com/duckduckgo/privacy-grade
+[submodule "submodules/autofill"]
+	path = submodules/autofill
+	url = https://github.com/duckduckgo/duckduckgo-autofill

app/build.gradle

@@ -32,6 +32,13 @@ android {
         sourceSets {
             androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
             androidTest.resources.srcDirs += files("$projectDir/../submodules/".toString())
+            main {
+                java {
+                    resources {
+                        srcDirs += files("$projectDir/../submodules/autofill/dist/".toString())
+                    }
+                }
+            }
         }
     }
     compileOptions {

app/src/androidTest/java/com/duckduckgo/app/email/EmailInjectorJsTest.kt

@@ -24,6 +24,7 @@ import com.duckduckgo.app.browser.R
 import com.nhaarman.mockitokotlin2.*
 import org.junit.Before
 import org.junit.Test
+import java.io.BufferedReader
 
 class EmailInjectorJsTest {
 
@@ -121,9 +122,7 @@ class EmailInjectorJsTest {
     }
 
     private fun getJsToEvaluate(): String {
-        val js = InstrumentationRegistry.getInstrumentation().targetContext.resources.openRawResource(R.raw.autofill)
-            .bufferedReader()
-            .use { it.readText() }
+        val js = readResource().use { it?.readText() }.orEmpty()
         return "javascript:$js"
     }
 
@@ -133,4 +132,8 @@ class EmailInjectorJsTest {
             .use { it.readText() }
         return "javascript:$js"
     }
+
+    private fun readResource(): BufferedReader? {
+        return javaClass.classLoader?.getResource("autofill.js")?.openStream()?.bufferedReader()
+    }
 }

app/src/main/java/com/duckduckgo/app/email/EmailInjector.kt

@@ -22,6 +22,7 @@ import androidx.annotation.UiThread
 import com.duckduckgo.app.browser.DuckDuckGoUrlDetector
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.email.EmailJavascriptInterface.Companion.JAVASCRIPT_INTERFACE_NAME
+import java.io.BufferedReader
 
 interface EmailInjector {
     fun injectEmailAutofillJs(webView: WebView, url: String?)
@@ -42,7 +43,7 @@ class EmailInjectorJs(private val emailManager: EmailManager, private val urlDet
     override fun injectEmailAutofillJs(webView: WebView, url: String?) {
         if (!hasJsBeenInjected && (isDuckDuckGoUrl(url) || emailManager.isSignedIn())) {
             hasJsBeenInjected = true
-            webView.evaluateJavascript("javascript:${javaScriptInjector.getFunctionsJS(webView.context)}", null)
+            webView.evaluateJavascript("javascript:${javaScriptInjector.getFunctionsJS()}", null)
         }
     }
 
@@ -61,9 +62,9 @@ class EmailInjectorJs(private val emailManager: EmailManager, private val urlDet
         private lateinit var functions: String
         private lateinit var aliasFunctions: String
 
-        fun getFunctionsJS(context: Context): String {
+        fun getFunctionsJS(): String {
             if (!this::functions.isInitialized) {
-                functions = context.resources.openRawResource(R.raw.autofill).bufferedReader().use { it.readText() }
+                functions = loadJs("autofill.js")
             }
             return functions
         }
@@ -74,5 +75,11 @@ class EmailInjectorJs(private val emailManager: EmailManager, private val urlDet
             }
             return aliasFunctions.replace("%s", alias.orEmpty())
         }
+
+        fun loadJs(resourceName: String): String = readResource(resourceName).use { it?.readText() }.orEmpty()
+
+        private fun readResource(resourceName: String): BufferedReader? {
+            return javaClass.classLoader?.getResource(resourceName)?.openStream()?.bufferedReader()
+        }
     }
 }