From bfc89b26bddb348ed6f5225c806d841ce3002ff4 Mon Sep 17 00:00:00 2001 From: Vavassor Date: Thu, 6 Apr 2017 21:16:40 -0400 Subject: [PATCH] Silently accept usernames in front of instances in the login screen, because plenty of folks try including it. --- .../main/java/com/keylesspalace/tusky/LoginActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java index 0db32a97..11ede95b 100644 --- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java @@ -78,8 +78,14 @@ public class LoginActivity extends AppCompatActivity { /** Make sure the user-entered text is just a fully-qualified domain name. */ private static String validateDomain(String s) { + // Strip any schemes out. s = s.replaceFirst("http://", ""); s = s.replaceFirst("https://", ""); + // If a username was included (e.g. username@example.com), just take what's after the '@'. + int at = s.indexOf('@'); + if (at != -1) { + s = s.substring(at + 1); + } return s.trim(); }