diff options
| author | sergeyv <sergeyv@google.com> | 2017-06-19 18:19:18 -0700 |
|---|---|---|
| committer | Sergey Vasilinets <sergeyv@google.com> | 2017-06-26 23:29:50 +0000 |
| commit | ef6d5767ed0a888ac27e29a28684f0e1bcb9708a (patch) | |
| tree | dd3e67b690fbfa2866281214332a4efdc8061a70 | |
| parent | 31e64acd1e65045471124267a06241eff1f55d26 (diff) | |
| download | glide-ef6d5767ed0a888ac27e29a28684f0e1bcb9708a.tar.gz | |
Rename getLifecycle into getGlideLifecycle.oreo-mr1-dev
"getLifecycle()" will be added to fragments from support library in 26*,
to avoid name conflicts getLifecycle in requestManagerFragment is
renamed.
The same fix was applied to latest versions (4.* and 3.9.* of glide)
Change-Id: Iaeed31db2005ff168b3f7c4bf466a5af5dba79df
3 files changed, 4 insertions, 4 deletions
diff --git a/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java b/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java index 47d93afd..41dee4b7 100644 --- a/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java +++ b/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java @@ -40,7 +40,7 @@ public class RequestManagerFragment extends Fragment { this.requestManager = requestManager; } - ActivityFragmentLifecycle getLifecycle() { + ActivityFragmentLifecycle getGlideLifecycle() { return lifecycle; } diff --git a/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java b/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java index b0b80fa5..4e98c5f8 100644 --- a/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java +++ b/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java @@ -172,7 +172,7 @@ public class RequestManagerRetriever implements Handler.Callback { } RequestManager requestManager = current.getRequestManager(); if (requestManager == null) { - requestManager = new RequestManager(context, current.getLifecycle()); + requestManager = new RequestManager(context, current.getGlideLifecycle()); current.setRequestManager(requestManager); } return requestManager; @@ -192,7 +192,7 @@ public class RequestManagerRetriever implements Handler.Callback { } RequestManager requestManager = current.getRequestManager(); if (requestManager == null) { - requestManager = new RequestManager(context, current.getLifecycle()); + requestManager = new RequestManager(context, current.getGlideLifecycle()); current.setRequestManager(requestManager); } return requestManager; diff --git a/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java b/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java index b5e73b6d..64846c0a 100644 --- a/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java +++ b/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java @@ -37,7 +37,7 @@ public class SupportRequestManagerFragment extends Fragment { this.requestManager = requestManager; } - ActivityFragmentLifecycle getLifecycle() { + ActivityFragmentLifecycle getGlideLifecycle() { return lifecycle; } |