r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Don't manually encode spaces

Browse Source
This commit is contained in:
Anthony Restaino 2016-09-10 20:49:47 -04:00
parent 3e676920e1
commit 621ac7a574
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/acr/browser/lightning/search/DuckSuggestionsTask.java
View File

@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.HttpsURLConnection;
@ -53,7 +52,6 @@ public final class DuckSuggestionsTask {
private static final String TAG = RetrieveSuggestionsTask.class.getSimpleName(); private static final String TAG = RetrieveSuggestionsTask.class.getSimpleName();
private static final Pattern SPACE_PATTERN = Pattern.compile(" ", Pattern.LITERAL);
private static final String ENCODING = "UTF-8"; private static final String ENCODING = "UTF-8";
private static final long INTERVAL_DAY = TimeUnit.DAYS.toMillis(1); private static final long INTERVAL_DAY = TimeUnit.DAYS.toMillis(1);
private static final String DEFAULT_LANGUAGE = "en"; private static final String DEFAULT_LANGUAGE = "en";
@ -91,7 +89,6 @@ public final class DuckSuggestionsTask {
void run() { void run() {
List<HistoryItem> filter = new ArrayList<>(5); List<HistoryItem> filter = new ArrayList<>(5);
try { try {
mQuery = SPACE_PATTERN.matcher(mQuery).replaceAll("+");
mQuery = URLEncoder.encode(mQuery, ENCODING); mQuery = URLEncoder.encode(mQuery, ENCODING);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();

3
app/src/main/java/acr/browser/lightning/search/GoogleSuggestionsTask.java
View File

@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.HttpsURLConnection;
@ -39,7 +38,6 @@ public class GoogleSuggestionsTask {
private static final String TAG = RetrieveSuggestionsTask.class.getSimpleName(); private static final String TAG = RetrieveSuggestionsTask.class.getSimpleName();
private static final Pattern SPACE_PATTERN = Pattern.compile(" ", Pattern.LITERAL);
private static final String ENCODING = "ISO-8859-1"; private static final String ENCODING = "ISO-8859-1";
private static final long INTERVAL_DAY = TimeUnit.DAYS.toMillis(1); private static final long INTERVAL_DAY = TimeUnit.DAYS.toMillis(1);
private static final String DEFAULT_LANGUAGE = "en"; private static final String DEFAULT_LANGUAGE = "en";
@ -89,7 +87,6 @@ public class GoogleSuggestionsTask {
void run() { void run() {
List<HistoryItem> filter = new ArrayList<>(5); List<HistoryItem> filter = new ArrayList<>(5);
try { try {
mQuery = SPACE_PATTERN.matcher(mQuery).replaceAll("+");
mQuery = URLEncoder.encode(mQuery, ENCODING); mQuery = URLEncoder.encode(mQuery, ENCODING);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();

2
app/src/main/java/acr/browser/lightning/search/Suggestions.java
View File

@ -332,7 +332,7 @@ public class Suggestions extends BaseAdapter implements Filterable {
mSuggestions.clearSuggestions(); mSuggestions.clearSuggestions();
return results; return results;
} }
String query = constraint.toString().toLowerCase(Locale.getDefault()); String query = constraint.toString().toLowerCase(Locale.getDefault()).trim();
if (mSuggestions.shouldRequestNetwork() && !SuggestionsManager.isRequestInProgress()) { if (mSuggestions.shouldRequestNetwork() && !SuggestionsManager.isRequestInProgress()) {
mSuggestions.getSuggestionsForQuery(query) mSuggestions.getSuggestionsForQuery(query)