From fa7673b3d1a4e148702aa550632a87d351072f0d Mon Sep 17 00:00:00 2001 From: anthony restaino Date: Thu, 27 Apr 2017 21:37:57 -0400 Subject: [PATCH] Better stringbuilder comparison --- .../acr/browser/lightning/app/AppComponent.java | 3 --- .../lightning/utils/StringBuilderUtils.java | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/app/AppComponent.java b/app/src/main/java/acr/browser/lightning/app/AppComponent.java index 1254739..12ed5ef 100644 --- a/app/src/main/java/acr/browser/lightning/app/AppComponent.java +++ b/app/src/main/java/acr/browser/lightning/app/AppComponent.java @@ -1,7 +1,5 @@ package acr.browser.lightning.app; -import android.support.annotation.NonNull; - import javax.inject.Singleton; import acr.browser.lightning.activity.BrowserActivity; @@ -23,7 +21,6 @@ import acr.browser.lightning.fragment.LightningPreferenceFragment; import acr.browser.lightning.fragment.PrivacySettingsFragment; import acr.browser.lightning.fragment.TabsFragment; import acr.browser.lightning.search.SuggestionsAdapter; -import acr.browser.lightning.utils.AdBlock; import acr.browser.lightning.utils.ProxyUtils; import acr.browser.lightning.view.LightningChromeClient; import acr.browser.lightning.view.LightningView; diff --git a/app/src/main/java/acr/browser/lightning/utils/StringBuilderUtils.java b/app/src/main/java/acr/browser/lightning/utils/StringBuilderUtils.java index 3781751..3b2e565 100644 --- a/app/src/main/java/acr/browser/lightning/utils/StringBuilderUtils.java +++ b/app/src/main/java/acr/browser/lightning/utils/StringBuilderUtils.java @@ -93,8 +93,19 @@ public class StringBuilderUtils { * the string builder is equal to the string. */ public static boolean equals(@NonNull StringBuilder stringBuilder, @NonNull String equal) { - int index = stringBuilder.indexOf(equal); - return index >= 0 && stringBuilder.length() == equal.length(); + + int builderLength = stringBuilder.length(); + if (builderLength != equal.length()) { + return false; + } + + for (int n = 0; n < builderLength; n++) { + if (stringBuilder.charAt(n) != equal.charAt(n)) { + return false; + } + } + + return true; } /**