ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-01-06 01:55:53 +01:00
Code Issues Projects Releases Wiki Activity

style: cleanup formatting

Browse Source
This commit is contained in:
Connor Tumbleson 2019-06-01 09:27:41 -04:00
parent 4a856b46c4
commit 5f43a1fbca
No known key found for this signature in database
GPG Key ID: C3CC0A201EC7DA75
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
View File

@ -240,7 +240,7 @@ public class Androlib {
if (in.containsDir("META-INF")) { if (in.containsDir("META-INF")) {
in.copyToDir(originalDir, "META-INF"); in.copyToDir(originalDir, "META-INF");
if(in.containsDir("META-INF/services")){ if (in.containsDir("META-INF/services")) {
// If the original APK contains the folder META-INF/services folder // If the original APK contains the folder META-INF/services folder
// that is used for service locators (like coroutines on android), // that is used for service locators (like coroutines on android),
// copy it to the destination folder so it does not get dropped. // copy it to the destination folder so it does not get dropped.

7
brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinCoroutinesTest.java
View File

@ -17,9 +17,7 @@
package brut.androlib.decode; package brut.androlib.decode;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import java.io.File; import java.io.File;
@ -44,6 +42,7 @@ import static org.junit.Assert.assertTrue;
*/ */
public class DecodeKotlinCoroutinesTest extends BaseTest { public class DecodeKotlinCoroutinesTest extends BaseTest {
private static String apk = "test-kotlin-coroutines.apk"; private static String apk = "test-kotlin-coroutines.apk";
@BeforeClass @BeforeClass
public static void beforeClass() throws Exception { public static void beforeClass() throws Exception {
TestUtils.cleanFrameworkFile(); TestUtils.cleanFrameworkFile();
@ -65,8 +64,8 @@ public class DecodeKotlinCoroutinesTest extends BaseTest {
apkDecoder.setOutDir(new File(sTmpDir + File.separator + apk + ".out")); apkDecoder.setOutDir(new File(sTmpDir + File.separator + apk + ".out"));
apkDecoder.setForceDelete(true); apkDecoder.setForceDelete(true);
apkDecoder.decode(); apkDecoder.decode();
File coroutinesExceptionHandler = new File(sTmpDir + File.separator + apk + ".out"+File.separator + "META-INF" + File.separator + "services", "kotlinx.coroutines.CoroutineExceptionHandler"); File coroutinesExceptionHandler = new File(sTmpDir + File.separator + apk + ".out" + File.separator + "META-INF" + File.separator + "services", "kotlinx.coroutines.CoroutineExceptionHandler");
File coroutinenMainDispatcherHandler = new File(sTmpDir + File.separator + apk + ".out"+File.separator + "META-INF" + File.separator + "services", "kotlinx.coroutines.internal.MainDispatcherFactory"); File coroutinenMainDispatcherHandler = new File(sTmpDir + File.separator + apk + ".out" + File.separator + "META-INF" + File.separator + "services", "kotlinx.coroutines.internal.MainDispatcherFactory");
assert (coroutinesExceptionHandler.exists()); assert (coroutinesExceptionHandler.exists());
assert (coroutinenMainDispatcherHandler.exists()); assert (coroutinenMainDispatcherHandler.exists());