Required classes from declaring

REAndroid · May 31, 2024 · a973a1d · a973a1d
1 parent f41a663
commit a973a1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/com/reandroid/dex/model/DexClass.java b/src/main/java/com/reandroid/dex/model/DexClass.java
@@ -85,6 +85,7 @@ private void searchRequired(Predicate<TypeKey> exclude, Set<DexClass> results){
         Iterator<TypeKey> iterator = usedTypes();
         while (iterator.hasNext()){
             TypeKey typeKey = iterator.next();
+            typeKey = typeKey.getDeclaring();
             if(exclude != null && !exclude.test(typeKey)){
                 continue;
             }

diff --git a/src/main/java/com/reandroid/graph/RequiredClassesScanner.java b/src/main/java/com/reandroid/graph/RequiredClassesScanner.java
@@ -172,7 +172,7 @@ private boolean addType(TypeKey typeKey) {
         if(typeKey == null) {
             return false;
         }
-        return addUsed(getClassRepository().getDexClass(typeKey));
+        return addUsed(getClassRepository().getDexClass(typeKey.getDeclaring()));
     }
     private boolean addUsed(DexClass dexClass) {
         if(dexClass == null) {