diff --git a/stetho/src/main/java/com/facebook/stetho/common/ReflectionUtil.java b/stetho/src/main/java/com/facebook/stetho/common/ReflectionUtil.java index 61ca22ca..cc31ba11 100644 --- a/stetho/src/main/java/com/facebook/stetho/common/ReflectionUtil.java +++ b/stetho/src/main/java/com/facebook/stetho/common/ReflectionUtil.java @@ -15,15 +15,6 @@ public final class ReflectionUtil { private ReflectionUtil() { } - @Nullable - public static Class tryGetClassForName(String className) { - try { - return Class.forName(className); - } catch (ClassNotFoundException e) { - return null; - } - } - @Nullable public static Field tryGetDeclaredField(Class theClass, String fieldName) { try { diff --git a/stetho/src/main/java/com/facebook/stetho/common/android/FragmentCompat.java b/stetho/src/main/java/com/facebook/stetho/common/android/FragmentCompat.java index be8eae38..8ae662bb 100644 --- a/stetho/src/main/java/com/facebook/stetho/common/android/FragmentCompat.java +++ b/stetho/src/main/java/com/facebook/stetho/common/android/FragmentCompat.java @@ -45,8 +45,14 @@ public abstract class FragmentCompat< private static final boolean sHasSupportFragment; static { - sHasSupportFragment = ReflectionUtil.tryGetClassForName( - "androidx.fragment.app.Fragment") != null; + boolean hasSupportFragment = false; + try { + androidx.fragment.app.Fragment.class.getClass(); + hasSupportFragment = true; + } catch (NoClassDefFoundError ignore) { + // AndroidX Fragment is not in classpath. + } + sHasSupportFragment = hasSupportFragment; } @NonNull diff --git a/stetho/src/main/java/com/facebook/stetho/inspector/elements/android/ViewDescriptor.java b/stetho/src/main/java/com/facebook/stetho/inspector/elements/android/ViewDescriptor.java index fdd0233f..0f39dec2 100755 --- a/stetho/src/main/java/com/facebook/stetho/inspector/elements/android/ViewDescriptor.java +++ b/stetho/src/main/java/com/facebook/stetho/inspector/elements/android/ViewDescriptor.java @@ -13,7 +13,6 @@ import com.facebook.stetho.common.ExceptionUtil; import com.facebook.stetho.common.LogUtil; -import com.facebook.stetho.common.ReflectionUtil; import com.facebook.stetho.common.StringUtil; import com.facebook.stetho.common.android.ResourcesUtil; import com.facebook.stetho.inspector.elements.AbstractChainedDescriptor; @@ -50,8 +49,14 @@ final class ViewDescriptor extends AbstractChainedDescriptor private static final boolean sHasSupportNodeInfo; static { - sHasSupportNodeInfo = ReflectionUtil.tryGetClassForName( - "androidx.core.view.accessibility.AccessibilityNodeInfoCompat") != null; + boolean hasSupportNodeInfo = false; + try { + androidx.core.view.accessibility.AccessibilityNodeInfoCompat.class.getClass(); + hasSupportNodeInfo = true; + } catch (NoClassDefFoundError ignore) { + // AndroidX Fragment is not in classpath. + } + sHasSupportNodeInfo = hasSupportNodeInfo; } /**