work with REAndroid/ARSCLib#78

REAndroid · Jan 2, 2025 · f5247d9 · f5247d9
1 parent 784bb27
commit f5247d9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/libs/ARSCLib.jar b/libs/ARSCLib.jar
diff --git a/src/main/java/com/reandroid/apkeditor/Util.java b/src/main/java/com/reandroid/apkeditor/Util.java
@@ -30,7 +30,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import java.util.function.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 public class Util {
     public static boolean isHelp(String[] args){

diff --git a/src/main/java/com/reandroid/apkeditor/common/AndroidManifestHelper.java b/src/main/java/com/reandroid/apkeditor/common/AndroidManifestHelper.java
@@ -27,7 +27,7 @@
 import com.reandroid.utils.collection.EmptyList;
 
 import java.util.List;
-import java.util.function.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 public class AndroidManifestHelper {
 

diff --git a/src/main/java/com/reandroid/apkeditor/merge/Merger.java b/src/main/java/com/reandroid/apkeditor/merge/Merger.java
@@ -39,7 +39,7 @@
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
-import java.util.function.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 public class Merger extends CommandExecutor<MergerOptions> {
 

diff --git a/src/main/java/com/reandroid/apkeditor/protect/ProtectorOptions.java b/src/main/java/com/reandroid/apkeditor/protect/ProtectorOptions.java
@@ -116,7 +116,12 @@ private String[] loadDictionary(File file, String resource) {
         }
         ArrayCollection<String> results = new ArrayCollection<>(
                 StringsUtil.split(full, '\n', true));
-        results.removeIf(StringsUtil::isEmpty);
+        results.removeIf(new org.apache.commons.collections4.Predicate<String>() {
+            @Override
+            public boolean evaluate(String text) {
+                return StringsUtil.isEmpty(text);
+            }
+        });
         return results.toArray(new String[results.size()]);
     }
     public boolean isKeepType(String type) {

diff --git a/src/main/java/com/reandroid/apkeditor/smali/SmaliDecompiler.java b/src/main/java/com/reandroid/apkeditor/smali/SmaliDecompiler.java
@@ -38,7 +38,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import java.util.function.Predicate;
+import org.apache.commons.collections4.Predicate;
 
 public class SmaliDecompiler implements DexDecoder {