Skip to content

Commit

Permalink
MOE automated commit.
Browse files Browse the repository at this point in the history
-------------
Include the debug aar in release artifacts for Android projects.

We removed the release variant a while ago to speed up the build, which
has the side affect of removing the release aar from artifacts. Since
we expect the debug and release variants to be identical (hence why
we disabled the release variant), it should be safe to just use the
debug aar instead. We will have to specify it explicitly since android’s
rules unsurprisingly only add the release variant by default.

-------------
Bump version to 4.6.0

-------------
Update readme to 4.6.0

Also removes the old v4 dependency from maven deps, I don’t think it’s
necessary.

-------------
Change update_javadocs to use debugJavadocJar instead of release.

We’ve disabled the release variant.

-------------
Bump version to 4.7.0-SNAPSHOT

-------------
Add POM dependencies explicitly.

Fixes bumptech#2863.

-------------
Bump version to 4.6.1

-------------
Update readme to 4.6.1

-------------
Fix param mistake (bumptech#2873)

-------------
Update SimpleTarget javadoc to match v4 API.

-------------
Add javadoc for RequestOptions.apply/RequestBuilder.apply.

Related to bumptech#2858.

-------------
Add support for Uri data uris.

Previously we only supported data uris if they were provided as Strings.

Fixes bumptech#556.

-------------
Make GlideBuilder.build package private.

It shouldn’t have been made visible and can’t
safely be used directly outside of the library.

Fixes bumptech#2885

-------------
Handle notifications in MultiFetcher after cancellation.

We can’t guarantee that every fetcher implementation will strictly avoid
notifying after they’ve been cancelled.

This also improves the behavior in VolleyStreamFetcher so that it attempts to avoid notifying after cancel, although it still doesn’t make
any strict guarantee.

Fixes bumptech#2879

-------------
Re-enable -Werror for java compilation.

Related to bumptech#2886.

-------------
Fix a deprecation warning in DataUriTest.

-------------
gradle 4.5.1

-------------
deprecate fragments

-------------
add @deprecated to javadoc and suppress deprecations in code

-------------
Created by MOE: https://github.com/google/moe

MOE_MIGRATED_REVID=99229725401d5777e059da7b6331134bf73fbcdf

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=185535564
  • Loading branch information
sjudd committed Mar 6, 2018
1 parent 99723e3 commit 5e45539
Showing 1 changed file with 14 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ static class MultiFetcher<Data> implements DataFetcher<Data>, DataCallback<Data>
private DataCallback<? super Data> callback;
@Nullable
private List<Throwable> exceptions;
private boolean isCancelled;

MultiFetcher(
@NonNull List<DataFetcher<Data>> fetchers,
Expand Down Expand Up @@ -112,6 +113,7 @@ public void cleanup() {

@Override
public void cancel() {
isCancelled = true;
for (DataFetcher<Data> fetcher : fetchers) {
fetcher.cancel();
}
Expand All @@ -131,6 +133,10 @@ public DataSource getDataSource() {

@Override
public void onDataReady(@Nullable Data data) {
if (isCancelled) {
return;
}

if (data != null) {
callback.onDataReady(data);
} else {
Expand All @@ -140,11 +146,19 @@ public void onDataReady(@Nullable Data data) {

@Override
public void onLoadFailed(@NonNull Exception e) {
if (isCancelled) {
return;
}

Preconditions.checkNotNull(exceptions).add(e);
startNextOrFail();
}

private void startNextOrFail() {
if (isCancelled) {
return;
}

if (currentIndex < fetchers.size() - 1) {
currentIndex++;
loadData(priority, callback);
Expand Down

0 comments on commit 5e45539

Please sign in to comment.