1.解决合并冲突

loulousky · May 30, 2021 · e0a39bb · e0a39bb
2 parents 3462756 + da16322
commit e0a39bb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 23 deletions.
diff --git a/Bcore/src/main/java/top/niunaijun/blackbox/app/BActivityThread.java b/Bcore/src/main/java/top/niunaijun/blackbox/app/BActivityThread.java
@@ -138,7 +138,7 @@ public void bindApplication(final String packageName, final String processName)
         }
     }
 
-    public synchronized void handleBindApplication(String packageName, String processName) {
+    private synchronized void handleBindApplication(String packageName, String processName) {
         DumpResult result = new DumpResult();
         result.packageName = packageName;
         result.dir = new File(BlackBoxCore.get().getDexDumpDir(), packageName).getAbsolutePath();

diff --git a/Bcore/src/main/java/top/niunaijun/blackbox/core/IOCore.java b/Bcore/src/main/java/top/niunaijun/blackbox/core/IOCore.java
@@ -124,17 +124,4 @@ public void enableRedirect(Context context) {
         }
         VMCore.enableIO();
     }
-
-    private void hideRoot(Map<String, String> rule) {
-        rule.put("/system/app/Superuser.apk", "/system/app/Superuser.apk-fake");
-        rule.put("/sbin/su", "/sbin/su-fake");
-        rule.put("/system/bin/su", "/system/bin/su-fake");
-        rule.put("/system/xbin/su", "/system/xbin/su-fake");
-        rule.put("/data/local/xbin/su", "/data/local/xbin/su-fake");
-        rule.put("/data/local/bin/su", "/data/local/bin/su-fake");
-        rule.put("/system/sd/xbin/su", "/system/sd/xbin/su-fake");
-        rule.put("/system/bin/failsafe/su", "/system/bin/failsafe/su-fake");
-        rule.put("/data/local/su", "/data/local/su-fake");
-        rule.put("/su/bin/su", "/su/bin/su-fake");
-    }
 }
diff --git a/app/src/main/java/top/niunaijun/blackdex/view/main/MainActivity.kt b/app/src/main/java/top/niunaijun/blackdex/view/main/MainActivity.kt
@@ -122,14 +122,16 @@ class MainActivity : PermissionActivity() {
                             title(res = R.string.unpack_fail)
                             message(res = R.string.jump_issue)
                             negativeButton(res = R.string.github) {
-                                val intent = Intent(
-                                    Intent.ACTION_VIEW,
-                                    Uri.parse("https://github.com/CodingGay/BlackDex/issues")
-                                )
-                                startActivity(intent)
-                            }
-                            positiveButton(res = R.string.confirm)
+                                negativeButton(text = "Github") {
+                                    val intent = Intent(
+                                        Intent.ACTION_VIEW,
+                                        Uri.parse("https://github.com/CodingGay/BlackDex/issues")
+                                    )
+                                    startActivity(intent)
+                                }
+                                positiveButton(res = R.string.confirm)
 
+                            }
                         }
                     }
                     else -> {

diff --git a/app/src/main/res/values-zh/string.xml b/app/src/main/res/values-zh/string.xml
@@ -8,7 +8,7 @@
     <string name="unpack_fail">脱壳失败</string>
     <string name="confirm">确定</string>
     <string name="github">Github</string>
-    <string name="jump_issue">未知错误，可前往GitHub(https://github.com/CodingGay/BlackDex)提Issue</string>
+    <string name="jump_issue">未知错误，可能是不兼容或者带有环境检测导致失败，可前往GitHub(https://github.com/CodingGay/BlackDex)提Issue</string>
     <string name="cancel">取消</string>
     <string name="dex_save">DEX文件储存在: %1$s</string>
     <string name="error_msg">错误原因: %1$s</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="unpack_fail">Unpack Fail</string>
     <string name="confirm">Confirm</string>
     <string name="github">Github</string>
-    <string name="jump_issue">Unknown Error，You can jump to GitHub(https://github.com/CodingGay/BlackDex)open Issue</string>
+    <string name="jump_issue">Unknown Error，This may be an incompatibility or may have an environmental detection that causes the failure,You can jump to GitHub(https://github.com/CodingGay/BlackDex)open Issue</string>
     <string name="cancel">Cancel</string>
     <string name="dex_save">.dex file save in: %1$s</string>
     <string name="error_msg">Error: %1$s</string>