speedup jailbreak monkey (-700ms) #3289
+81
−6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| diff --git a/android/src/main/java/com/gantix/JailMonkey/JailMonkeyModule.java b/android/src/main/java/com/gantix/JailMonkey/JailMonkeyModule.java | ||
| index 018d7051a57a2250c738e018ba8e1518d1b9525a..e89a135c10edc50174315c5cf0a3c9871fe65e6a 100644 | ||
| --- a/android/src/main/java/com/gantix/JailMonkey/JailMonkeyModule.java | ||
| +++ b/android/src/main/java/com/gantix/JailMonkey/JailMonkeyModule.java | ||
| @@ -74,11 +74,7 @@ public class JailMonkeyModule extends ReactContextBaseJavaModule { | ||
| final Map<String, Object> constants = new HashMap<>(); | ||
|
|
||
| constants.put("isJailBroken", rootedCheck.isJailBroken()); | ||
| - constants.put("rootedDetectionMethods", rootedCheck.getResultByDetectionMethod()); | ||
| - constants.put("hookDetected", hookDetected(context)); | ||
| - constants.put("canMockLocation", isMockLocationOn(context)); | ||
| - constants.put("isOnExternalStorage", isOnExternalStorage(context)); | ||
| - constants.put("AdbEnabled", AdbEnabled(context)); | ||
| return constants; | ||
| } | ||
| } | ||
| + | ||
| diff --git a/android/src/main/java/com/gantix/JailMonkey/Rooted/RootedCheck.java b/android/src/main/java/com/gantix/JailMonkey/Rooted/RootedCheck.java | ||
| index bf75f27fd11293205bf6d58de4f8069ea0a155fe..d63ac51b87e456bd13e252c7ca691c07e28704a5 100644 | ||
| --- a/android/src/main/java/com/gantix/JailMonkey/Rooted/RootedCheck.java | ||
| +++ b/android/src/main/java/com/gantix/JailMonkey/Rooted/RootedCheck.java | ||
| @@ -4,25 +4,44 @@ import android.content.Context; | ||
| import com.scottyab.rootbeer.RootBeer; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| +import java.util.concurrent.CountDownLatch; | ||
| + | ||
| +import androidx.tracing.Trace; | ||
|
|
||
| public class RootedCheck { | ||
| private static boolean checkWithJailMonkeyMethod() { | ||
| - CheckApiVersion check; | ||
| - | ||
| - if (android.os.Build.VERSION.SDK_INT >= 23) { | ||
| - check = new GreaterThan23(); | ||
| - } else { | ||
| - check = new LessThan23(); | ||
| + Trace.beginSection("[JailMonkey] checkWithJailMonkeyMethod"); | ||
|
||
| + try { | ||
| + CheckApiVersion check; | ||
| + | ||
| + if (android.os.Build.VERSION.SDK_INT >= 23) { | ||
| + check = new GreaterThan23(); | ||
| + } else { | ||
| + check = new LessThan23(); | ||
| + } | ||
| + return check.checkRooted(); | ||
| + } finally { | ||
| + Trace.endSection(); | ||
| } | ||
| - return check.checkRooted(); | ||
| } | ||
|
|
||
| - private final boolean jailMonkeyResult; | ||
| - private final RootBeerResults rootBeerResults; | ||
| + private static boolean jailMonkeyResult; | ||
| + private static RootBeerResults rootBeerResults; | ||
| + private static CountDownLatch latch = new CountDownLatch(1); | ||
| + public static void precompute(Context context) { | ||
| + new Thread(() -> { | ||
| + jailMonkeyResult = checkWithJailMonkeyMethod(); | ||
| + rootBeerResults = new RootBeerResults(context); | ||
| + latch.countDown(); | ||
| + }).start(); | ||
| + } | ||
|
|
||
| public RootedCheck(Context context) { | ||
| - jailMonkeyResult = checkWithJailMonkeyMethod(); | ||
| - rootBeerResults = new RootBeerResults(context); | ||
| + try { | ||
| + latch.await(); | ||
| + } catch (InterruptedException e) { | ||
| + throw new RuntimeException(e); | ||
| + } | ||
| } | ||
|
|
||
| public boolean isJailBroken() { | ||
| @@ -87,3 +106,4 @@ public class RootedCheck { | ||
| } | ||
| } | ||
| } | ||
| + | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could you also drop a quick comment in packages/core-mobile/docs/patches.md about this patch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done