From 5f43a1fbca6a75d35b5f0bc4cca146ff4560ede8 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sat, 1 Jun 2019 09:27:41 -0400 Subject: [PATCH] style: cleanup formatting --- .../apktool-lib/src/main/java/brut/androlib/Androlib.java | 2 +- .../brut/androlib/decode/DecodeKotlinCoroutinesTest.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java index da0d6871..269932e6 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java @@ -240,7 +240,7 @@ public class Androlib { if (in.containsDir("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 // that is used for service locators (like coroutines on android), // copy it to the destination folder so it does not get dropped. diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinCoroutinesTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinCoroutinesTest.java index df1f73cc..bb868498 100644 --- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinCoroutinesTest.java +++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinCoroutinesTest.java @@ -17,9 +17,7 @@ package brut.androlib.decode; import org.junit.AfterClass; -import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import java.io.File; @@ -44,6 +42,7 @@ import static org.junit.Assert.assertTrue; */ public class DecodeKotlinCoroutinesTest extends BaseTest { private static String apk = "test-kotlin-coroutines.apk"; + @BeforeClass public static void beforeClass() throws Exception { TestUtils.cleanFrameworkFile(); @@ -65,8 +64,8 @@ public class DecodeKotlinCoroutinesTest extends BaseTest { apkDecoder.setOutDir(new File(sTmpDir + File.separator + apk + ".out")); apkDecoder.setForceDelete(true); apkDecoder.decode(); - 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 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"); assert (coroutinesExceptionHandler.exists()); assert (coroutinenMainDispatcherHandler.exists());