Rename Fragment LifecycleObserver Detector
This changes the FragmentLiveDataObserverDetector to a more generic name
to include changes added in aosp/1143188 that aren't specific to
LiveData observe.
Test: ./gradlew bOS
Change-Id: I8848e3651dd7b706d435d5db93934b73bf4174ab
diff --git a/fragment/fragment-lint/src/main/java/androidx/fragment/lint/FragmentIssueRegistry.kt b/fragment/fragment-lint/src/main/java/androidx/fragment/lint/FragmentIssueRegistry.kt
index 951c090..e8a3b96 100644
--- a/fragment/fragment-lint/src/main/java/androidx/fragment/lint/FragmentIssueRegistry.kt
+++ b/fragment/fragment-lint/src/main/java/androidx/fragment/lint/FragmentIssueRegistry.kt
@@ -27,7 +27,7 @@
override val api = 6
override val minApi = CURRENT_API
override val issues get() = listOf(
- FragmentLiveDataObserverDetector.BACK_PRESSED_ISSUE,
- FragmentLiveDataObserverDetector.LIVEDATA_ISSUE,
- FragmentTagDetector.ISSUE)
+ FragmentTagDetector.ISSUE,
+ UnsafeFragmentLifecycleObserverDetector.BACK_PRESSED_ISSUE,
+ UnsafeFragmentLifecycleObserverDetector.LIVEDATA_ISSUE)
}
diff --git a/fragment/fragment-lint/src/main/java/androidx/fragment/lint/FragmentLiveDataObserverDetector.kt b/fragment/fragment-lint/src/main/java/androidx/fragment/lint/UnsafeFragmentLifecycleObserverDetector.kt
similarity index 94%
rename from fragment/fragment-lint/src/main/java/androidx/fragment/lint/FragmentLiveDataObserverDetector.kt
rename to fragment/fragment-lint/src/main/java/androidx/fragment/lint/UnsafeFragmentLifecycleObserverDetector.kt
index 3478c86..e8ad725 100644
--- a/fragment/fragment-lint/src/main/java/androidx/fragment/lint/FragmentLiveDataObserverDetector.kt
+++ b/fragment/fragment-lint/src/main/java/androidx/fragment/lint/UnsafeFragmentLifecycleObserverDetector.kt
@@ -15,8 +15,8 @@
*/
package androidx.fragment.lint
-import androidx.fragment.lint.FragmentLiveDataObserverDetector.Issues.BACK_PRESSED_ISSUE
-import androidx.fragment.lint.FragmentLiveDataObserverDetector.Issues.LIVEDATA_ISSUE
+import androidx.fragment.lint.UnsafeFragmentLifecycleObserverDetector.Issues.BACK_PRESSED_ISSUE
+import androidx.fragment.lint.UnsafeFragmentLifecycleObserverDetector.Issues.LIVEDATA_ISSUE
import com.android.tools.lint.detector.api.Category
import com.android.tools.lint.detector.api.Detector
import com.android.tools.lint.detector.api.Implementation
@@ -42,7 +42,7 @@
* [androidx.fragment.app.Fragment.onActivityCreated], or
* [androidx.fragment.app.Fragment.onViewStateRestored].
*/
-class FragmentLiveDataObserverDetector : Detector(), SourceCodeScanner {
+class UnsafeFragmentLifecycleObserverDetector : Detector(), SourceCodeScanner {
companion object Issues {
val LIVEDATA_ISSUE = Issue.create(
@@ -58,7 +58,7 @@
category = Category.CORRECTNESS,
severity = Severity.ERROR,
implementation = Implementation(
- FragmentLiveDataObserverDetector::class.java, Scope.JAVA_FILE_SCOPE
+ UnsafeFragmentLifecycleObserverDetector::class.java, Scope.JAVA_FILE_SCOPE
),
androidSpecific = true
)
@@ -77,7 +77,7 @@
category = Category.CORRECTNESS,
severity = Severity.ERROR,
implementation = Implementation(
- FragmentLiveDataObserverDetector::class.java, Scope.JAVA_FILE_SCOPE
+ UnsafeFragmentLifecycleObserverDetector::class.java, Scope.JAVA_FILE_SCOPE
),
androidSpecific = true
)
diff --git a/fragment/fragment-lint/src/test/java/androidx/fragment/lint/BackPressedDispatcherCallbackDetectorTest.kt b/fragment/fragment-lint/src/test/java/androidx/fragment/lint/BackPressedDispatcherCallbackDetectorTest.kt
index 33b35ef..05d6f97 100644
--- a/fragment/fragment-lint/src/test/java/androidx/fragment/lint/BackPressedDispatcherCallbackDetectorTest.kt
+++ b/fragment/fragment-lint/src/test/java/androidx/fragment/lint/BackPressedDispatcherCallbackDetectorTest.kt
@@ -31,16 +31,16 @@
@RunWith(JUnit4::class)
class BackPressedDispatcherCallbackDetectorTest : LintDetectorTest() {
- override fun getDetector(): Detector = FragmentLiveDataObserverDetector()
+ override fun getDetector(): Detector = UnsafeFragmentLifecycleObserverDetector()
override fun getIssues(): MutableList<Issue> =
- mutableListOf(FragmentLiveDataObserverDetector.BACK_PRESSED_ISSUE)
+ mutableListOf(UnsafeFragmentLifecycleObserverDetector.BACK_PRESSED_ISSUE)
private var sdkDir: File? = null
@Before
fun setup() {
- val stream = FragmentLiveDataObserveDetectorTest::class.java.classLoader
+ val stream = BackPressedDispatcherCallbackDetectorTest::class.java.classLoader
.getResourceAsStream("sdk.prop")
val properties = Properties()
properties.load(stream)
diff --git a/fragment/fragment-lint/src/test/java/androidx/fragment/lint/FragmentLiveDataObserveDetectorTest.kt b/fragment/fragment-lint/src/test/java/androidx/fragment/lint/FragmentLiveDataObserveDetectorTest.kt
index fc756d4..d3b2680 100644
--- a/fragment/fragment-lint/src/test/java/androidx/fragment/lint/FragmentLiveDataObserveDetectorTest.kt
+++ b/fragment/fragment-lint/src/test/java/androidx/fragment/lint/FragmentLiveDataObserveDetectorTest.kt
@@ -30,10 +30,10 @@
@RunWith(JUnit4::class)
class FragmentLiveDataObserveDetectorTest : LintDetectorTest() {
- override fun getDetector(): Detector = FragmentLiveDataObserverDetector()
+ override fun getDetector(): Detector = UnsafeFragmentLifecycleObserverDetector()
override fun getIssues(): MutableList<Issue> =
- mutableListOf(FragmentLiveDataObserverDetector.LIVEDATA_ISSUE)
+ mutableListOf(UnsafeFragmentLifecycleObserverDetector.LIVEDATA_ISSUE)
private var sdkDir: File? = null
