Skip to content

Commit

Permalink
Rename userName parameter to username in Credentials (#3781)
Browse files Browse the repository at this point in the history
  • Loading branch information
erikghonyan authored and swankjesse committed Jan 17, 2018
1 parent 8c9c134 commit 8e1e907
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions okhttp/src/main/java/okhttp3/Credentials.java
Expand Up @@ -26,12 +26,12 @@ private Credentials() {
}

/** Returns an auth credential for the Basic scheme. */
public static String basic(String userName, String password) {
return basic(userName, password, ISO_8859_1);
public static String basic(String username, String password) {
return basic(username, password, ISO_8859_1);
}

public static String basic(String userName, String password, Charset charset) {
String usernameAndPassword = userName + ":" + password;
public static String basic(String username, String password, Charset charset) {
String usernameAndPassword = username + ":" + password;
String encoded = ByteString.encodeString(usernameAndPassword, charset).base64();
return "Basic " + encoded;
}
Expand Down

0 comments on commit 8e1e907

Please sign in to comment.