From e4ce435f002b866adb5f8c81a488816ef8a0d1d0 Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Mon, 24 Aug 2020 09:11:40 +0200 Subject: Return HTTPS URI username from CredentialsProvider (#1049) Let the PasswordFinderCredentialsProvider support Username as a CredentialItem type and return the user part of the repository URI when it is requested. (cherry picked from commit 679037b81dee889bdd3b79bd02c37353df63ccc5) --- app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt index 881b8807..62d6879c 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt @@ -58,6 +58,7 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment override fun get(uri: URIish?, vararg items: CredentialItem): Boolean { for (item in items) { when (item) { + is CredentialItem.Username -> item.value = uri?.user is CredentialItem.Password -> item.value = passwordFinder.reqPassword(null) else -> UnsupportedCredentialItem(uri, item.javaClass.name) } @@ -66,7 +67,7 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment } override fun supports(vararg items: CredentialItem) = items.all { - it is CredentialItem.Password + it is CredentialItem.Username || it is CredentialItem.Password } } -- cgit v1.2.3