mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Lint warning: Lambda can be replaced with method reference.

Browse source
This commit is contained in:
Paul Hawke 2017-09-03 16:52:52 -05:00
parent a615e0784e
commit f74de55b60
3 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java
View file

@ -28,9 +28,7 @@ public abstract class AuthenticatedActivity extends NavigationBaseActivity {
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnError(Timber::e) .doOnError(Timber::e)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(this::onAuthCookieAcquired, throwable -> onAuthFailure());
cookie -> onAuthCookieAcquired(cookie),
throwable -> onAuthFailure());
} }
private void addAccount(AccountManager accountManager) { private void addAccount(AccountManager accountManager) {

5
app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
View file

@ -97,6 +97,7 @@ public class CategorizationFragment extends Fragment {
categoriesCache = new HashMap<>(); categoriesCache = new HashMap<>();
if (savedInstanceState != null) { if (savedInstanceState != null) {
items.addAll(savedInstanceState.getParcelableArrayList("currentCategories")); items.addAll(savedInstanceState.getParcelableArrayList("currentCategories"));
//noinspection unchecked
categoriesCache.putAll((HashMap<String, ArrayList<String>>) savedInstanceState categoriesCache.putAll((HashMap<String, ArrayList<String>>) savedInstanceState
.getSerializable("categoriesCache")); .getSerializable("categoriesCache"));
} }
@ -201,9 +202,7 @@ public class CategorizationFragment extends Fragment {
.distinct() .distinct()
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
s -> categoriesAdapter.add(s), s -> categoriesAdapter.add(s), Timber::e, () -> {
throwable -> Timber.e(throwable),
() -> {
categoriesAdapter.notifyDataSetChanged(); categoriesAdapter.notifyDataSetChanged();
categoriesSearchInProgress.setVisibility(View.GONE); categoriesSearchInProgress.setVisibility(View.GONE);

16
app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
View file

@ -30,6 +30,7 @@ import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.Callable;
import fr.free.nrw.commons.BuildConfig; import fr.free.nrw.commons.BuildConfig;
import fr.free.nrw.commons.PageTitle; import fr.free.nrw.commons.PageTitle;
@ -235,8 +236,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
} }
return categories; return categories;
}) }).flatMapObservable(Observable::fromIterable);
.flatMapObservable(list -> Observable.fromIterable(list));
} }
@Override @Override
@ -265,15 +265,14 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
} }
return categories; return categories;
}) }).flatMapObservable(Observable::fromIterable);
.flatMapObservable(list -> Observable.fromIterable(list));
} }
@Override @Override
@NonNull @NonNull
public Observable<String> searchTitles(String title, int searchCatsLimit) { public Observable<String> searchTitles(String title, int searchCatsLimit) {
return Single.fromCallable(() -> { return Single.fromCallable((Callable<List<String>>) () -> {
ArrayList<ApiResult> categoryNodes = null; ArrayList<ApiResult> categoryNodes;
try { try {
categoryNodes = api.action("query") categoryNodes = api.action("query")
@ -287,7 +286,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
.getNodes("/api/query/search/p/@title"); .getNodes("/api/query/search/p/@title");
} catch (IOException e) { } catch (IOException e) {
Timber.e("Failed to obtain searchTitles", e); Timber.e("Failed to obtain searchTitles", e);
return new ArrayList(); return Collections.emptyList();
} }
if (categoryNodes == null) { if (categoryNodes == null) {
@ -302,8 +301,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
} }
return titleCategories; return titleCategories;
}) }).flatMapObservable(Observable::fromIterable);
.flatMapObservable(list -> Observable.fromIterable(list));
} }
@Override @Override