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

#3448 CategoryImagesListFragment.handleError never succeeds (#3710)

Browse source 
* #3448 CategoryImagesListFragment.handleError never succeeds - remove timeouts, rely on default timeout params

* #3448 CategoryImagesListFragment.handleError never succeeds - fix compilation
This commit is contained in:
Seán Mac Gillicuddy 2020-05-05 20:00:42 +01:00 • committed by GitHub
parent 6d687c3efb
commit 953f09d683
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragment.java
View file

@ -1,5 +1,8 @@
package fr.free.nrw.commons.bookmarks.pictures; package fr.free.nrw.commons.bookmarks.pictures;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -11,15 +14,8 @@ import android.widget.ListAdapter;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.List;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import dagger.android.support.DaggerFragment; import dagger.android.support.DaggerFragment;
@ -32,15 +28,12 @@ import fr.free.nrw.commons.utils.ViewUtil;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import java.util.List;
import javax.inject.Inject;
import timber.log.Timber; import timber.log.Timber;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
public class BookmarkPicturesFragment extends DaggerFragment { public class BookmarkPicturesFragment extends DaggerFragment {
private static final int TIMEOUT_SECONDS = 15;
private GridViewAdapter gridAdapter; private GridViewAdapter gridAdapter;
private CompositeDisposable compositeDisposable = new CompositeDisposable(); private CompositeDisposable compositeDisposable = new CompositeDisposable();
@ -120,7 +113,6 @@ public class BookmarkPicturesFragment extends DaggerFragment {
compositeDisposable.add(controller.loadBookmarkedPictures() compositeDisposable.add(controller.loadBookmarkedPictures()
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.subscribe(this::handleSuccess, this::handleError)); .subscribe(this::handleSuccess, this::handleError));
} }

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

@ -30,7 +30,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import timber.log.Timber; import timber.log.Timber;
@ -40,7 +39,6 @@ import timber.log.Timber;
*/ */
public class CategoryImagesListFragment extends DaggerFragment { public class CategoryImagesListFragment extends DaggerFragment {
private static int TIMEOUT_SECONDS = 15;
/** /**
* counts the total number of items loaded from the API * counts the total number of items loaded from the API
*/ */
@ -121,7 +119,6 @@ public class CategoryImagesListFragment extends DaggerFragment {
compositeDisposable.add(mediaClient.getMediaListFromCategory(categoryName) compositeDisposable.add(mediaClient.getMediaListFromCategory(categoryName)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.subscribe(this::handleSuccess, this::handleError)); .subscribe(this::handleSuccess, this::handleError));
} }
@ -227,7 +224,6 @@ public class CategoryImagesListFragment extends DaggerFragment {
compositeDisposable.add(mediaClient.getMediaListFromCategory(categoryName) compositeDisposable.add(mediaClient.getMediaListFromCategory(categoryName)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.subscribe(this::handleSuccess, this::handleError)); .subscribe(this::handleSuccess, this::handleError));
} }
@ -273,7 +269,6 @@ public class CategoryImagesListFragment extends DaggerFragment {
compositeDisposable.add(mediaClient.getCaptionByWikibaseIdentifier(wikibaseIdentifier) compositeDisposable.add(mediaClient.getCaptionByWikibaseIdentifier(wikibaseIdentifier)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.subscribe(subscriber -> { .subscribe(subscriber -> {
handleLabelforImage(subscriber, i); handleLabelforImage(subscriber, i);
})); }));

24
app/src/main/java/fr/free/nrw/commons/category/SubCategoryListFragment.java
View file

@ -1,6 +1,9 @@
package fr.free.nrw.commons.category; package fr.free.nrw.commons.category;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
@ -9,21 +12,12 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.pedrogomez.renderers.RVRendererAdapter;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import com.pedrogomez.renderers.RVRendererAdapter;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.explore.categories.SearchCategoriesAdapterFactory; import fr.free.nrw.commons.explore.categories.SearchCategoriesAdapterFactory;
@ -31,19 +25,17 @@ import fr.free.nrw.commons.utils.NetworkUtils;
import fr.free.nrw.commons.utils.ViewUtil; import fr.free.nrw.commons.utils.ViewUtil;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import timber.log.Timber; import timber.log.Timber;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
/** /**
* Displays the category search screen. * Displays the category search screen.
*/ */
public class SubCategoryListFragment extends CommonsDaggerSupportFragment { public class SubCategoryListFragment extends CommonsDaggerSupportFragment {
private static int TIMEOUT_SECONDS = 15;
@BindView(R.id.imagesListBox) @BindView(R.id.imagesListBox)
RecyclerView categoriesRecyclerView; RecyclerView categoriesRecyclerView;
@BindView(R.id.imageSearchInProgress) @BindView(R.id.imageSearchInProgress)
@ -99,14 +91,12 @@ public class SubCategoryListFragment extends CommonsDaggerSupportFragment {
compositeDisposable.add(categoryClient.getParentCategoryList("Category:"+categoryName) compositeDisposable.add(categoryClient.getParentCategoryList("Category:"+categoryName)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.collect(ArrayList<String>::new, ArrayList::add) .collect(ArrayList<String>::new, ArrayList::add)
.subscribe(this::handleSuccess, this::handleError)); .subscribe(this::handleSuccess, this::handleError));
} else { } else {
compositeDisposable.add(categoryClient.getSubCategoryList("Category:"+categoryName) compositeDisposable.add(categoryClient.getSubCategoryList("Category:"+categoryName)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.collect(ArrayList<String>::new, ArrayList::add) .collect(ArrayList<String>::new, ArrayList::add)
.subscribe(this::handleSuccess, this::handleError)); .subscribe(this::handleSuccess, this::handleError));
} }

3
app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
View file

@ -23,12 +23,10 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import java.util.Random; import java.util.Random;
import java.util.concurrent.TimeUnit;
import timber.log.Timber; import timber.log.Timber;
public class ContributionViewHolder extends RecyclerView.ViewHolder { public class ContributionViewHolder extends RecyclerView.ViewHolder {
private static final long TIMEOUT_SECONDS = 15;
private final Callback callback; private final Callback callback;
@BindView(R.id.contributionImage) @BindView(R.id.contributionImage)
SimpleDraweeView imageView; SimpleDraweeView imageView;
@ -121,7 +119,6 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
compositeDisposable.add(mediaClient.getCaptionByWikibaseIdentifier(wikibaseMediaId) compositeDisposable.add(mediaClient.getCaptionByWikibaseIdentifier(wikibaseMediaId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.subscribe(subscriber -> { .subscribe(subscriber -> {
if (!subscriber.trim().equals(MediaClient.NO_CAPTION)) { if (!subscriber.trim().equals(MediaClient.NO_CAPTION)) {
titleView.setText(subscriber); titleView.setText(subscriber);

3
app/src/main/java/fr/free/nrw/commons/depictions/subClass/SubDepictionListPresenter.java
View file

@ -15,7 +15,6 @@ import java.lang.reflect.Proxy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import timber.log.Timber; import timber.log.Timber;
@ -47,7 +46,6 @@ public class SubDepictionListPresenter implements SubDepictionListContract.UserA
public String query; public String query;
protected CompositeDisposable compositeDisposable = new CompositeDisposable(); protected CompositeDisposable compositeDisposable = new CompositeDisposable();
DepictsClient depictsClient; DepictsClient depictsClient;
private static int TIMEOUT_SECONDS = 15;
private List<DepictedItem> queryList = new ArrayList<>(); private List<DepictedItem> queryList = new ArrayList<>();
OkHttpJsonApiClient okHttpJsonApiClient; OkHttpJsonApiClient okHttpJsonApiClient;
/** /**
@ -98,7 +96,6 @@ public class SubDepictionListPresenter implements SubDepictionListContract.UserA
compositeDisposable.add(depictsClient.getP18ForItem(entityId) compositeDisposable.add(depictsClient.getP18ForItem(entityId)
.subscribeOn(ioScheduler) .subscribeOn(ioScheduler)
.observeOn(mainThreadScheduler) .observeOn(mainThreadScheduler)
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.subscribe(response -> { .subscribe(response -> {
view.onImageUrlFetched(response,position); view.onImageUrlFetched(response,position);
})); }));

28
app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java
View file

@ -1,6 +1,9 @@
package fr.free.nrw.commons.explore.categories; package fr.free.nrw.commons.explore.categories;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -8,23 +11,12 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.pedrogomez.renderers.RVRendererAdapter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import javax.inject.Named;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import com.pedrogomez.renderers.RVRendererAdapter;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.category.CategoryClient; import fr.free.nrw.commons.category.CategoryClient;
import fr.free.nrw.commons.category.CategoryDetailsActivity; import fr.free.nrw.commons.category.CategoryDetailsActivity;
@ -36,19 +28,19 @@ import fr.free.nrw.commons.utils.NetworkUtils;
import fr.free.nrw.commons.utils.ViewUtil; import fr.free.nrw.commons.utils.ViewUtil;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import timber.log.Timber; import timber.log.Timber;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
/** /**
* Displays the category search screen. * Displays the category search screen.
*/ */
public class SearchCategoryFragment extends CommonsDaggerSupportFragment { public class SearchCategoryFragment extends CommonsDaggerSupportFragment {
private static int TIMEOUT_SECONDS = 15;
@BindView(R.id.imagesListBox) @BindView(R.id.imagesListBox)
RecyclerView categoriesRecyclerView; RecyclerView categoriesRecyclerView;
@BindView(R.id.imageSearchInProgress) @BindView(R.id.imageSearchInProgress)
@ -140,7 +132,6 @@ public class SearchCategoryFragment extends CommonsDaggerSupportFragment {
compositeDisposable.add(categoryClient.searchCategories(query,25) compositeDisposable.add(categoryClient.searchCategories(query,25)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.doOnSubscribe(disposable -> saveQuery(query)) .doOnSubscribe(disposable -> saveQuery(query))
.collect(ArrayList<String>::new, ArrayList::add) .collect(ArrayList<String>::new, ArrayList::add)
.subscribe(this::handleSuccess, this::handleError)); .subscribe(this::handleSuccess, this::handleError));
@ -159,7 +150,6 @@ public class SearchCategoryFragment extends CommonsDaggerSupportFragment {
compositeDisposable.add(categoryClient.searchCategories(query,25, queryList.size()) compositeDisposable.add(categoryClient.searchCategories(query,25, queryList.size())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.collect(ArrayList<String>::new, ArrayList::add) .collect(ArrayList<String>::new, ArrayList::add)
.subscribe(this::handlePaginationSuccess, this::handleError)); .subscribe(this::handlePaginationSuccess, this::handleError));
} }

4
app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentPresenter.java
View file

@ -14,7 +14,6 @@ import java.lang.reflect.Proxy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import timber.log.Timber; import timber.log.Timber;
@ -35,7 +34,6 @@ public class SearchDepictionsFragmentPresenter extends CommonsDaggerSupportFragm
SearchDepictionsFragmentContract.View.class.getClassLoader(), SearchDepictionsFragmentContract.View.class.getClassLoader(),
new Class[]{SearchDepictionsFragmentContract.View.class}, new Class[]{SearchDepictionsFragmentContract.View.class},
(proxy, method, methodArgs) -> null); (proxy, method, methodArgs) -> null);
private static int TIMEOUT_SECONDS = 15;
protected CompositeDisposable compositeDisposable = new CompositeDisposable(); protected CompositeDisposable compositeDisposable = new CompositeDisposable();
private final Scheduler ioScheduler; private final Scheduler ioScheduler;
private final Scheduler mainThreadScheduler; private final Scheduler mainThreadScheduler;
@ -91,7 +89,6 @@ public class SearchDepictionsFragmentPresenter extends CommonsDaggerSupportFragm
compositeDisposable.add(depictsClient.searchForDepictions(query, 25, offset) compositeDisposable.add(depictsClient.searchForDepictions(query, 25, offset)
.subscribeOn(ioScheduler) .subscribeOn(ioScheduler)
.observeOn(mainThreadScheduler) .observeOn(mainThreadScheduler)
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.doOnSubscribe(disposable -> saveQuery()) .doOnSubscribe(disposable -> saveQuery())
.collect(ArrayList<DepictedItem>::new, ArrayList::add) .collect(ArrayList<DepictedItem>::new, ArrayList::add)
.subscribe(this::handleSuccess, this::handleError)); .subscribe(this::handleSuccess, this::handleError));
@ -171,7 +168,6 @@ public class SearchDepictionsFragmentPresenter extends CommonsDaggerSupportFragm
compositeDisposable.add(depictsClient.getP18ForItem(entityId) compositeDisposable.add(depictsClient.getP18ForItem(entityId)
.subscribeOn(ioScheduler) .subscribeOn(ioScheduler)
.observeOn(mainThreadScheduler) .observeOn(mainThreadScheduler)
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.subscribe(response -> { .subscribe(response -> {
view.onImageUrlFetched(response,position); view.onImageUrlFetched(response,position);
})); }));

5
app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java
View file

@ -44,8 +44,6 @@ import timber.log.Timber;
public class SearchImageFragment extends CommonsDaggerSupportFragment { public class SearchImageFragment extends CommonsDaggerSupportFragment {
private static int TIMEOUT_SECONDS = 15;
@BindView(R.id.imagesListBox) @BindView(R.id.imagesListBox)
RecyclerView imagesRecyclerView; RecyclerView imagesRecyclerView;
@BindView(R.id.imageSearchInProgress) @BindView(R.id.imageSearchInProgress)
@ -145,7 +143,6 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment {
compositeDisposable.add(mediaClient.getMediaListFromSearch(query) compositeDisposable.add(mediaClient.getMediaListFromSearch(query)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.doOnSubscribe(disposable -> saveQuery(query)) .doOnSubscribe(disposable -> saveQuery(query))
.subscribe(this::handleSuccess, this::handleError)); .subscribe(this::handleSuccess, this::handleError));
} }
@ -162,7 +159,6 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment {
compositeDisposable.add(mediaClient.getMediaListFromSearch(query) compositeDisposable.add(mediaClient.getMediaListFromSearch(query)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.subscribe(this::handlePaginationSuccess, this::handleError)); .subscribe(this::handlePaginationSuccess, this::handleError));
} }
@ -218,7 +214,6 @@ public class SearchImageFragment extends CommonsDaggerSupportFragment {
compositeDisposable.add(mediaClient.getCaptionByWikibaseIdentifier(wikibaseIdentifier) compositeDisposable.add(mediaClient.getCaptionByWikibaseIdentifier(wikibaseIdentifier)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.subscribe(subscriber -> { .subscribe(subscriber -> {
handleLabelforImage(subscriber, position); handleLabelforImage(subscriber, position);
})); }));