From 97d93eb564a16c92ecbca307054099e57a4e244d Mon Sep 17 00:00:00 2001 From: Grisha Kruglov Date: Wed, 13 Oct 2021 18:12:22 -0700 Subject: [PATCH] Make linters happy --- .../java/org/mozilla/fenix/components/Core.kt | 2 - .../SavedLoginsStorageController.kt | 5 +- .../SavedLoginsStorageControllerTest.kt | 96 +++++++++++-------- 3 files changed, 56 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt index 4f60fbdfc0..f89d5a455d 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt @@ -53,7 +53,6 @@ import mozilla.components.feature.webcompat.WebCompatFeature import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature import mozilla.components.feature.webnotifications.WebNotificationFeature import mozilla.components.lib.dataprotect.SecureAbove22Preferences -import mozilla.components.lib.dataprotect.generateEncryptionKey import mozilla.components.service.digitalassetlinks.RelationChecker import mozilla.components.service.digitalassetlinks.local.StatementApi import mozilla.components.service.digitalassetlinks.local.StatementRelationChecker @@ -87,7 +86,6 @@ import org.mozilla.fenix.telemetry.TelemetryMiddleware import org.mozilla.fenix.utils.Mockable import org.mozilla.fenix.utils.getUndoDelay import org.mozilla.geckoview.GeckoRuntime -import java.lang.IllegalStateException import java.util.concurrent.TimeUnit /** diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/controller/SavedLoginsStorageController.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/controller/SavedLoginsStorageController.kt index fa7d21b2ba..d4bbbf0c88 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/controller/SavedLoginsStorageController.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/controller/SavedLoginsStorageController.kt @@ -26,7 +26,6 @@ import org.mozilla.fenix.settings.logins.LoginsFragmentStore import org.mozilla.fenix.settings.logins.fragment.EditLoginFragmentDirections import org.mozilla.fenix.settings.logins.fragment.AddLoginFragmentDirections import org.mozilla.fenix.settings.logins.mapToSavedLogin -import org.mozilla.fenix.settings.logins.SavedLogin /** * Controller for all saved logins interactions with the password storage component @@ -185,12 +184,12 @@ open class SavedLoginsStorageController( } } - suspend fun findDuplicate(entry: LoginEntry, currentGuid: String? = null) { + private fun findDuplicate(entry: LoginEntry, currentGuid: String? = null) { // Ensure that we have a valid, non-blank password. The value doesn't // matter for dupe-checking and we want to make sure that // findLoginToUpdate() doesn't throw an error because the [LoginEntry] // is invalid - val validEntry = if (entry.password.isNotEmpty()) entry else entry.copy(password="password") + val validEntry = if (entry.password.isNotEmpty()) entry else entry.copy(password = "password") var dupe = try { passwordsStorage.findLoginToUpdate(validEntry)?.mapToSavedLogin() } catch (e: LoginsStorageException) { diff --git a/app/src/test/java/org/mozilla/fenix/settings/logins/SavedLoginsStorageControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/logins/SavedLoginsStorageControllerTest.kt index 770f894357..0468b6f9d7 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/logins/SavedLoginsStorageControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/logins/SavedLoginsStorageControllerTest.kt @@ -189,13 +189,15 @@ class SavedLoginsStorageControllerTest { coVerify { passwordsStorage.get(login.guid) - passwordsStorage.findLoginToUpdate(LoginEntry( - origin = login.origin, - httpRealm = login.httpRealm, - formActionOrigin = login.formActionOrigin, - username = login2.username, - password = login.password - )) + passwordsStorage.findLoginToUpdate( + LoginEntry( + origin = login.origin, + httpRealm = login.httpRealm, + formActionOrigin = login.formActionOrigin, + username = login2.username, + password = login.password + ) + ) loginsFragmentStore.dispatch( LoginsAction.DuplicateLogin(login2.mapToSavedLogin()) ) @@ -223,13 +225,15 @@ class SavedLoginsStorageControllerTest { coVerify { passwordsStorage.get(login.guid) - passwordsStorage.findLoginToUpdate(LoginEntry( - origin = login.origin, - httpRealm = login.httpRealm, - formActionOrigin = login.formActionOrigin, - username = "new-username", - password = login.password - )) + passwordsStorage.findLoginToUpdate( + LoginEntry( + origin = login.origin, + httpRealm = login.httpRealm, + formActionOrigin = login.formActionOrigin, + username = "new-username", + password = login.password + ) + ) loginsFragmentStore.dispatch( LoginsAction.DuplicateLogin(null) ) @@ -255,13 +259,15 @@ class SavedLoginsStorageControllerTest { controller.findDuplicateForAdd(login.origin, login.username, "new-password") coVerify { - passwordsStorage.findLoginToUpdate(LoginEntry( - origin = login.origin, - httpRealm = login.origin, - formActionOrigin = null, - username = login.username, - password = "new-password", - )) + passwordsStorage.findLoginToUpdate( + LoginEntry( + origin = login.origin, + httpRealm = login.origin, + formActionOrigin = null, + username = login.username, + password = "new-password", + ) + ) loginsFragmentStore.dispatch( LoginsAction.DuplicateLogin(login.mapToSavedLogin()) ) @@ -279,13 +285,15 @@ class SavedLoginsStorageControllerTest { controller.findDuplicateForAdd(origin, "username", "password") coVerify { - passwordsStorage.findLoginToUpdate(LoginEntry( - origin = origin, - httpRealm = origin, - formActionOrigin = null, - username = "username", - password = "password", - )) + passwordsStorage.findLoginToUpdate( + LoginEntry( + origin = origin, + httpRealm = origin, + formActionOrigin = null, + username = "username", + password = "password", + ) + ) loginsFragmentStore.dispatch( LoginsAction.DuplicateLogin(null) ) @@ -303,13 +311,15 @@ class SavedLoginsStorageControllerTest { controller.findDuplicateForAdd(origin, "username", "password") coVerify { - passwordsStorage.findLoginToUpdate(LoginEntry( - origin = origin, - httpRealm = origin, - formActionOrigin = null, - username = "username", - password = "password", - )) + passwordsStorage.findLoginToUpdate( + LoginEntry( + origin = origin, + httpRealm = origin, + formActionOrigin = null, + username = "username", + password = "password", + ) + ) loginsFragmentStore.dispatch( LoginsAction.DuplicateLogin(null) ) @@ -330,13 +340,15 @@ class SavedLoginsStorageControllerTest { controller.findDuplicateForAdd(origin, "username", "") coVerify { - passwordsStorage.findLoginToUpdate(LoginEntry( - origin = origin, - httpRealm = origin, - formActionOrigin = null, - username = "username", - password = "password", - )) + passwordsStorage.findLoginToUpdate( + LoginEntry( + origin = origin, + httpRealm = origin, + formActionOrigin = null, + username = "username", + password = "password", + ) + ) } } }