From 339a6655bf28b0bcd9e4d54747a6d2309612dbd1 Mon Sep 17 00:00:00 2001 From: M M Arif Date: Thu, 30 Jun 2022 11:55:23 +0200 Subject: [PATCH] Remove BOM, trim tokens, uname and url for logins (#1157) As title. Got reports and this will fix the following issues: - Remove BOM - Remove new lines and spaces Co-authored-by: M M Arif Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1157 Reviewed-by: qwerty287 --- .../org/mian/gitnex/activities/AddNewAccountActivity.java | 4 ++-- .../java/org/mian/gitnex/activities/LoginActivity.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java index 68ad891d..208cde8c 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java @@ -90,8 +90,8 @@ public class AddNewAccountActivity extends BaseActivity { try { - String instanceUrlET = String.valueOf(viewBinding.instanceUrl.getText()); - String loginToken = String.valueOf(viewBinding.loginToken.getText()); + String instanceUrlET = String.valueOf(viewBinding.instanceUrl.getText()).replaceAll("[\\uFEFF|#]", "").trim(); + String loginToken = String.valueOf(viewBinding.loginToken.getText()).replaceAll("[\\uFEFF|#]", "").trim(); String protocol = spinnerSelectedValue; if(protocol == null) { diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java index aa1fab70..7ed4fbb5 100644 --- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java @@ -140,13 +140,13 @@ public class LoginActivity extends BaseActivity { return; } - String loginUid = loginUidET.getText().toString(); - String loginPass = loginPassword.getText().toString(); - String loginToken = loginTokenCode.getText().toString().trim(); + String loginUid = loginUidET.getText().toString().replaceAll("[\\uFEFF]", "").trim(); + String loginPass = loginPassword.getText().toString().trim(); + String loginToken = loginTokenCode.getText().toString().replaceAll("[\\uFEFF|#]", "").trim(); LoginType loginType = (loginMethod.getCheckedRadioButtonId() == R.id.loginUsernamePassword) ? LoginType.BASIC : LoginType.TOKEN; - URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET.getText().toString(), "http")).toUri(); + URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET.getText().toString().replaceAll("[\\uFEFF|#]", "").trim(), "http")).toUri(); instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(selectedProtocol.toLowerCase()).withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/")) .toUri();