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

Clean up code

Browse Source
This commit is contained in:
Mohit Sarveiya 2017-06-26 22:01:08 -04:00
parent 4389cf9985
commit 7251bccfea
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java
View File

@ -302,11 +302,11 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable {
@NonNull @NonNull
private Single<List<HistoryItem>> getSuggestionsForQuery(@NonNull final String query) { private Single<List<HistoryItem>> getSuggestionsForQuery(@NonNull final String query) {
if (mSuggestionChoice == PreferenceManager.Suggestion.SUGGESTION_GOOGLE) { if (mSuggestionChoice == PreferenceManager.Suggestion.SUGGESTION_GOOGLE) {
return SuggestionsManager.INSTANCE.createGoogleQueryObservable(query, mApplication); return SuggestionsManager.createGoogleQueryObservable(query, mApplication);
} else if (mSuggestionChoice == PreferenceManager.Suggestion.SUGGESTION_DUCK) { } else if (mSuggestionChoice == PreferenceManager.Suggestion.SUGGESTION_DUCK) {
return SuggestionsManager.INSTANCE.createDuckQueryObservable(query, mApplication); return SuggestionsManager.createDuckQueryObservable(query, mApplication);
} else if (mSuggestionChoice == PreferenceManager.Suggestion.SUGGESTION_BAIDU) { } else if (mSuggestionChoice == PreferenceManager.Suggestion.SUGGESTION_BAIDU) {
return SuggestionsManager.INSTANCE.createBaiduQueryObservable(query, mApplication); return SuggestionsManager.createBaiduQueryObservable(query, mApplication);
} else { } else {
return Single.empty(); return Single.empty();
} }

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

@ -13,6 +13,7 @@ internal object SuggestionsManager {
@JvmStatic @JvmStatic
@Volatile var isRequestInProgress: Boolean = false @Volatile var isRequestInProgress: Boolean = false
@JvmStatic
fun createGoogleQueryObservable(query: String, application: Application) = fun createGoogleQueryObservable(query: String, application: Application) =
Single.create(SingleAction<List<HistoryItem>> { subscriber -> Single.create(SingleAction<List<HistoryItem>> { subscriber ->
isRequestInProgress = true isRequestInProgress = true
@ -22,6 +23,7 @@ internal object SuggestionsManager {
isRequestInProgress = false isRequestInProgress = false
}) })
@JvmStatic
fun createBaiduQueryObservable(query: String, application: Application) = fun createBaiduQueryObservable(query: String, application: Application) =
Single.create(SingleAction<List<HistoryItem>> { subscriber -> Single.create(SingleAction<List<HistoryItem>> { subscriber ->
isRequestInProgress = true isRequestInProgress = true
@ -31,6 +33,7 @@ internal object SuggestionsManager {
isRequestInProgress = false isRequestInProgress = false
}) })
@JvmStatic
fun createDuckQueryObservable(query: String, application: Application) = fun createDuckQueryObservable(query: String, application: Application) =
Single.create(SingleAction<List<HistoryItem>> { subscriber -> Single.create(SingleAction<List<HistoryItem>> { subscriber ->
isRequestInProgress = true isRequestInProgress = true