Rename getLifecycle into getGlideLifecycle.
"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
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 47d93af..41dee4b 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 @@
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 b0b80fa..4e98c5f 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 @@
}
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 @@
}
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 b5e73b6..64846c0 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 @@
this.requestManager = requestManager;
}
- ActivityFragmentLifecycle getLifecycle() {
+ ActivityFragmentLifecycle getGlideLifecycle() {
return lifecycle;
}