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

Renaming task method

Browse Source
This commit is contained in:
anthony restaino 2017-04-19 22:10:25 -04:00
parent 460da386ec
commit 491d872008
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/acr/browser/lightning/search/BaseSuggestionsTask.java
View File

@ -36,7 +36,7 @@ abstract class BaseSuggestionsTask {
static final int MAX_RESULTS = 5; static final int MAX_RESULTS = 5;
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"; @NonNull private static final String DEFAULT_LANGUAGE = "en";
@Nullable private static String sLanguage; @Nullable private static String sLanguage;
@NonNull private final SuggestionsResult mResultCallback; @NonNull private final SuggestionsResult mResultCallback;
@NonNull private final Application mApplication; @NonNull private final Application mApplication;
@ -46,7 +46,7 @@ abstract class BaseSuggestionsTask {
@NonNull private String mQuery; @NonNull private String mQuery;
@NonNull @NonNull
protected abstract String getQueryUrl(@NonNull String query, @NonNull String language); protected abstract String createQueryUrl(@NonNull String query, @NonNull String language);
protected abstract void parseResults(@NonNull FileInputStream inputStream, @NonNull List<HistoryItem> results) throws Exception; protected abstract void parseResults(@NonNull FileInputStream inputStream, @NonNull List<HistoryItem> results) throws Exception;
@ -113,7 +113,7 @@ abstract class BaseSuggestionsTask {
*/ */
@NonNull @NonNull
private File downloadSuggestionsForQuery(@NonNull String query, String language, @NonNull Application app) { private File downloadSuggestionsForQuery(@NonNull String query, String language, @NonNull Application app) {
String queryUrl = getQueryUrl(query, language); String queryUrl = createQueryUrl(query, language);
File cacheFile = new File(app.getCacheDir(), queryUrl.hashCode() + SuggestionsAdapter.CACHE_FILE_TYPE); File cacheFile = new File(app.getCacheDir(), queryUrl.hashCode() + SuggestionsAdapter.CACHE_FILE_TYPE);
if (System.currentTimeMillis() - INTERVAL_DAY < cacheFile.lastModified()) { if (System.currentTimeMillis() - INTERVAL_DAY < cacheFile.lastModified()) {
return cacheFile; return cacheFile;
@ -126,15 +126,15 @@ abstract class BaseSuggestionsTask {
try { try {
URL url = new URL(queryUrl); URL url = new URL(queryUrl);
Request suggestionsRequest = new Request.Builder().url(url) Request suggestionsRequest = new Request.Builder().url(url)
.addHeader("Accept-Encoding", "gzip") .addHeader("Accept-Encoding", "gzip")
.addHeader("Accept-Charset", getEncoding()) .addHeader("Accept-Charset", getEncoding())
.cacheControl(mCacheControl) .cacheControl(mCacheControl)
.build(); .build();
Response suggestionsResponse = mHttpClient.newCall(suggestionsRequest).execute(); Response suggestionsResponse = mHttpClient.newCall(suggestionsRequest).execute();
if (suggestionsResponse.code() >= HttpURLConnection.HTTP_MULT_CHOICE || if (suggestionsResponse.code() >= HttpURLConnection.HTTP_MULT_CHOICE ||
suggestionsResponse.code() < HttpURLConnection.HTTP_OK) { suggestionsResponse.code() < HttpURLConnection.HTTP_OK) {
Log.e(TAG, "Search API Responded with code: " + suggestionsResponse.code()); Log.e(TAG, "Search API Responded with code: " + suggestionsResponse.code());
suggestionsResponse.body().close(); suggestionsResponse.body().close();
return cacheFile; return cacheFile;
@ -171,8 +171,8 @@ abstract class BaseSuggestionsTask {
@NonNull @NonNull
private static ConnectivityManager getConnectivityManager(@NonNull Context context) { private static ConnectivityManager getConnectivityManager(@NonNull Context context) {
return (ConnectivityManager) context return (ConnectivityManager) context
.getApplicationContext() .getApplicationContext()
.getSystemService(Context.CONNECTIVITY_SERVICE); .getSystemService(Context.CONNECTIVITY_SERVICE);
} }
} }

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

@ -15,7 +15,7 @@ import acr.browser.lightning.utils.FileUtils;
final class DuckSuggestionsTask extends BaseSuggestionsTask { final class DuckSuggestionsTask extends BaseSuggestionsTask {
private static final String ENCODING = "UTF-8"; @NonNull private static final String ENCODING = "UTF-8";
@NonNull private final String mSearchSubtitle; @NonNull private final String mSearchSubtitle;
DuckSuggestionsTask(@NonNull String query, DuckSuggestionsTask(@NonNull String query,
@ -27,7 +27,7 @@ final class DuckSuggestionsTask extends BaseSuggestionsTask {
@NonNull @NonNull
@Override @Override
protected String getQueryUrl(@NonNull String query, @NonNull String language) { protected String createQueryUrl(@NonNull String query, @NonNull String language) {
return "https://duckduckgo.com/ac/?q=" + query; return "https://duckduckgo.com/ac/?q=" + query;
} }

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

@ -17,7 +17,7 @@ import acr.browser.lightning.database.HistoryItem;
class GoogleSuggestionsTask extends BaseSuggestionsTask { class GoogleSuggestionsTask extends BaseSuggestionsTask {
private static final String ENCODING = "ISO-8859-1"; @NonNull private static final String ENCODING = "ISO-8859-1";
@Nullable private static XmlPullParser sXpp; @Nullable private static XmlPullParser sXpp;
@NonNull private final String mSearchSubtitle; @NonNull private final String mSearchSubtitle;
@ -29,7 +29,7 @@ class GoogleSuggestionsTask extends BaseSuggestionsTask {
} }
@NonNull @NonNull
protected String getQueryUrl(@NonNull String query, @NonNull String language) { protected String createQueryUrl(@NonNull String query, @NonNull String language) {
return "https://suggestqueries.google.com/complete/search?output=toolbar&hl=" return "https://suggestqueries.google.com/complete/search?output=toolbar&hl="
+ language + "&q=" + query; + language + "&q=" + query;
} }