Release v1.1.4

README.md

@@ -22,6 +22,8 @@ This project is governed by a [Code Of Conduct][coc-link].
 To disclose potential a security vulnerability please see our
 [security][security-link] documentation.
 
+Localization happens on [Pontoon](https://pontoon.mozilla.org/projects/android-l10n/). Please get in touch with delphine (at) mozilla (dot) com directly for more information.
+
 ## [License][license-link]
 
 This module is licensed under the [Mozilla Public License,

app/build.gradle

@@ -84,9 +84,9 @@ configurations.all { config ->
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
+    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha07'
+    implementation 'com.google.android.material:material:1.1.0-alpha09'
     implementation "androidx.recyclerview:recyclerview:$recyclerview_version"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.0.0'
@@ -106,6 +106,7 @@ dependencies {
     implementation "org.mozilla.components:lib-dataprotect:${rootProject.ext.android_components_version}"
     implementation "org.mozilla.components:lib-fetch-httpurlconnection:${rootProject.ext.android_components_version}"
     implementation "org.mozilla.components:lib-publicsuffixlist:${rootProject.ext.android_components_version}"
+    implementation "org.mozilla.components:support-rusthttp:${rootProject.ext.android_components_version}"
     implementation "org.mozilla.components:support-rustlog:${rootProject.ext.android_components_version}"
     implementation "org.mozilla.components:concept-sync:${rootProject.ext.android_components_version}"
 
@@ -118,8 +119,8 @@ dependencies {
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
     testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0-alpha01'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0-alpha03'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha03'
     implementation "android.arch.navigation:navigation-fragment:$navigation_version"
     implementation "android.arch.navigation:navigation-ui-ktx:$navigation_version"
     implementation 'com.adjust.sdk:adjust-android:4.17.0'
@@ -151,6 +152,14 @@ dependencies {
     androidTestImplementation 'br.com.concretesolutions:kappuccino:1.2.1'
     ktlint "com.github.shyiko:ktlint:0.28.0"
     androidTestImplementation "tools.fastlane:screengrab:1.2.0"
+    modules {
+        module('org.mozilla.appservices:full-megazord') {
+            replacedBy('org.mozilla.appservices:lockbox-megazord', 'prefer the lockbox megazord, to reduce final application size')
+        }
+        module('org.mozilla.appservices:lockbox-megazord') {
+            replacedBy('org.mozilla.appservices:lockbox-megazord-forUnitTests', 'prefer the forUnitTests variant if present')
+        }
+    }
 }
 
 sentry {
@@ -254,35 +263,3 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 
 // Internal, but stable and convenient.
 import org.gradle.api.internal.artifacts.DefaultModuleIdentifier
-
-// This is the equivalent of what the `org.mozilla.appservices` Gradle plugin
-// achieved, minus asserting that the versions of all the megazord components
-// agree.  That assertion could be added if required.
-afterEvaluate {
-    // The definitions of the megazords themselves evolve: this set was determined from
-    // https://github.com/mozilla/application-services/blob/v0.27.0/megazords/lockbox/android/build.gradle#L79-L82,
-    // where the version in the URL is the tag corresponding to `mozilla_appservices_version`.  This
-    // will need to be bumped when `android_components_version` (and thus
-    // `mozilla_appservices_version`) is rolled forward.
-    def megazord = DefaultModuleIdentifier.newId('org.mozilla.appservices', 'lockbox-megazord')
-    def megazordComponents = [
-        DefaultModuleIdentifier.newId('org.mozilla.appservices', 'fxaclient'),
-        DefaultModuleIdentifier.newId('org.mozilla.appservices', 'logins'),
-        DefaultModuleIdentifier.newId('org.mozilla.appservices', 'rustlog'),
-    ]
-
-    configurations.each { configuration ->
-        configuration.resolutionStrategy.dependencySubstitution.all { dependency ->
-            if (dependency.requested instanceof ModuleComponentSelector) {
-                def moduleIdentifier = ((ModuleComponentSelector) dependency.requested).moduleIdentifier
-                if (megazordComponents.contains(moduleIdentifier)) {
-                    def megazordVersion = rootProject.ext.mozilla_appservices_version
-                    def substitution = "${megazord.group}:${megazord.name}:${megazordVersion}"
-                    logger.lifecycle("In ${configuration}: substituting megazord module '$substitution' for component module" +
-                                     " '${moduleIdentifier.group}:${moduleIdentifier.name}:${dependency.requested.version}'")
-                    dependency.useTarget(substitution)
-                }
-            }
-        }
-    }
-}

app/src/androidTest/java/mozilla/lockbox/robots/DeleteCredentialDisclaimerRobot.kt

@@ -0,0 +1,22 @@
+/*
+ * 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.lockbox.robots
+
+import br.com.concretesolutions.kappuccino.actions.ClickActions
+import br.com.concretesolutions.kappuccino.assertions.VisibilityAssertions
+import mozilla.lockbox.R
+
+// DeleteCredentialDisclaimer
+class DeleteCredentialDisclaimerRobot : BaseTestRobot {
+
+    override fun exists() = VisibilityAssertions.displayed { id(R.id.alertTitle) }
+
+        fun tapCancelButton() = ClickActions.click { text(R.string.cancel) }
+        fun tapDeleteButton() = ClickActions.click { text("DELETE") }
+    }
+
+fun deleteCredentialDisclaimer(f: DeleteCredentialDisclaimerRobot.() -> Unit) = DeleteCredentialDisclaimerRobot().apply(f)

app/src/androidTest/java/mozilla/lockbox/robots/ItemDetailRobot.kt

@@ -33,6 +33,8 @@ class ItemDetailRobot : BaseTestRobot {
     fun toastIsDisplayed(id: Int, activityRule: ActivityTestRule<RootActivity>) =
         onView(withText(id)).inRoot(withDecorView(not(`is`(activityRule.activity.getWindow().decorView))))
             .check(matches(isDisplayed()))
+
+    fun tapKebabMenu() = ClickActions.click { id(R.id.kebabMenuButton) }
 }
 
 fun itemDetail(f: ItemDetailRobot.() -> Unit) = ItemDetailRobot().apply(f)

app/src/androidTest/java/mozilla/lockbox/robots/KebabMenuRobot.kt

@@ -0,0 +1,21 @@
+/*
+ * 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.lockbox.robots
+
+import br.com.concretesolutions.kappuccino.actions.ClickActions
+import br.com.concretesolutions.kappuccino.assertions.VisibilityAssertions
+import mozilla.lockbox.R
+
+// KebabMenu
+class KebabMenuRobot : BaseTestRobot {
+    override fun exists() = VisibilityAssertions.displayed { text("Delete") }
+
+    fun tapEditButton() = ClickActions.click { text(R.string.edit) }
+    fun tapDeleteButton() = ClickActions.click { text(R.string.delete) }
+}
+
+fun kebabMenu(f: KebabMenuRobot.() -> Unit) = KebabMenuRobot().apply(f)

app/src/androidTest/java/mozilla/lockbox/robots/WelcomeRobot.kt

@@ -14,7 +14,7 @@ import mozilla.lockbox.R
 class WelcomeRobot : BaseTestRobot {
     override fun exists() = displayed { id(R.id.buttonGetStarted) }
 
-    fun tapGetStarted() = click { id(R.id.buttonGetStarted) }
+    fun tapGetStarted() = click { id(R.id.buttonGetStartedManually) }
 
     fun tapSkipSecureYourDevice() = click { id(android.R.id.button2) }
 }

app/src/androidTest/java/mozilla/lockbox/screenshots/ScreenshotsTest.kt

@@ -6,6 +6,7 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.rule.ActivityTestRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.espresso.Espresso.pressBack
@@ -76,6 +77,19 @@ open class ScreenshotsTest {
                 .check(matches(isDisplayed()))
         Screengrab.screenshot("item-detail-screen")
 
+        onView(withId(R.id.kebabMenuButton)).perform(click())
+        Screengrab.screenshot("item-menu")
+
+        onView(withText(R.string.delete)).perform(click())
+        Screengrab.screenshot("item-delete-disclaimer")
+
+        onView(withText(R.string.cancel)).perform(click())
+        /* Edit Menu Not developed yet
+        onView(withId(R.id.kebabMenu)).perform(click())
+        onView(withText(R.string.edit)).perform(click())
+        Screengrab.screenshot("item-edit-menu")
+        */
+
         onView(withId(R.id.inputUsername)).perform(click())
         Screengrab.screenshot("username-copied-screen")
 

app/src/androidTest/java/mozilla/lockbox/uiTests/AppRoutePresenterTest.kt

@@ -68,7 +68,6 @@ open class AppRoutePresenterTest {
         navigator.gotoSettings()
         navigator.back()
         navigator.checkAtItemList()
-        navigator.back()
     }
 
     @Test

app/src/androidTest/java/mozilla/lockbox/uiTests/ItemDetailsTest.kt

@@ -6,6 +6,8 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import mozilla.lockbox.R
 import mozilla.lockbox.robots.itemDetail
 import mozilla.lockbox.robots.itemList
+import mozilla.lockbox.robots.kebabMenu
+import mozilla.lockbox.robots.deleteCredentialDisclaimer
 import mozilla.lockbox.view.RootActivity
 import org.junit.Rule
 import org.junit.Test
@@ -40,4 +42,22 @@ open class ItemDetailsTest {
         itemDetail { tapCopyPass() }
         itemDetail { toastIsDisplayed(R.string.toast_password_copied, activityRule) }
     }
+
+    @Test
+    fun deleteItem() {
+        navigator.gotoItemDetailKebabMenu()
+        kebabMenu { tapDeleteButton() }
+        // First tap on Cancel delete credencial
+        deleteCredentialDisclaimer { tapCancelButton() }
+        itemDetail { exists() }
+        // Now delete the credential
+        // Disabled until issue #807 is fixed
+        // and logins can be added after removal
+        /*
+        itemDetail { tapKebabMenu() }
+        kebabMenu { tapDeleteButton() }
+        deleteCredentialDisclaimer { tapDeleteButton() }
+        itemList { exists() }
+        */
+    }
 }

app/src/androidTest/java/mozilla/lockbox/uiTests/Navigator.kt

@@ -31,6 +31,7 @@ import mozilla.lockbox.robots.fingerprintOnboardingScreen
 import mozilla.lockbox.robots.fxaLogin
 import mozilla.lockbox.robots.itemDetail
 import mozilla.lockbox.robots.itemList
+import mozilla.lockbox.robots.kebabMenu
 import mozilla.lockbox.robots.lockScreen
 import mozilla.lockbox.robots.onboardingConfirmationScreen
 import mozilla.lockbox.robots.securityDisclaimer
@@ -292,6 +293,13 @@ class Navigator {
         itemDetail { exists() }
     }
 
+    fun gotoItemDetailKebabMenu(position: Int = 0) {
+        gotoItemList()
+        gotoItemDetail_from_itemList(position)
+        itemDetail { tapKebabMenu() }
+        kebabMenu { exists() }
+    }
+
     fun back(remainInApplication: Boolean = true) {
         closeSoftKeyboard()
         try {

app/src/main/java/mozilla/lockbox/LockboxApplication.kt

@@ -13,7 +13,8 @@ import com.adjust.sdk.Adjust
 import com.adjust.sdk.AdjustConfig
 import com.squareup.leakcanary.LeakCanary
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import mozilla.appservices.LockboxMegazord
+import mozilla.appservices.Megazord
+import mozilla.components.support.rusthttp.RustHttpConfig
 import mozilla.components.lib.fetch.httpurlconnection.HttpURLConnectionClient
 import mozilla.components.support.base.log.Log
 import mozilla.components.support.base.log.logger.Logger
@@ -77,7 +78,8 @@ open class LockboxApplication : Application() {
     }
 
     private fun setupDataStoreSupport() {
-        LockboxMegazord.init(lazy { HttpURLConnectionClient() })
+        Megazord.init()
+        RustHttpConfig.setClient(lazy { HttpURLConnectionClient() })
         RustLog.enable()
 
         FxASyncDataStoreSupport.shared.injectContext(this)

app/src/main/java/mozilla/lockbox/LockboxAutofillService.kt

@@ -50,11 +50,11 @@ class LockboxAutofillService(
     lateinit var dataStore: DataStore
 
     override fun onConnected() {
-        dispatcher.dispatch(LifecycleAction.AutofillStart)
         telemetryStore.injectContext(this)
         accountStore.injectContext(this)
         fxaSupport.injectContext(this)
         dataStore = DataStore.shared
+        dispatcher.dispatch(LifecycleAction.AutofillStart)
     }
 
     override fun onDisconnected() {