ReVanced-Mirror
/
Apktool
mirror of https://github.com/revanced/Apktool.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: remove aapt provider implementation

This commit is contained in:
Lucaskyy 2022-06-11 19:05:40 +02:00
parent 37470c018d
commit 4dca2b2d27
No known key found for this signature in database
GPG Key ID: 1530BFF96D1EEB89
3 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
View File

@ -45,18 +45,6 @@ import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
final public class AndrolibResources {
// The aapt provider. Default is AaptManager for Mac, Linux & Windows.
// May be overridden.
private static AaptProvider AAPT_PROVIDER = new AaptManager();
public static AaptProvider getAaptProvider() {
return AAPT_PROVIDER;
}
public static void setAaptProvider(AaptProvider aaptProvider) {
AAPT_PROVIDER = aaptProvider;
}
public ResTable getResTable(ExtFile apkFile) throws AndrolibException {
return getResTable(apkFile, true);
}
@ -1026,9 +1014,9 @@ final public class AndrolibResources {
private File getAaptBinaryFile() throws AndrolibException {
try {
if (getAaptVersion() == 2) {
return getAaptProvider().getAapt2();
return AaptManager.getAapt2();
}
return getAaptProvider().getAapt1();
return AaptManager.getAapt1();
} catch (BrutException ex) {
throw new AndrolibException(ex);
}

8
brut.j.util/src/main/java/brut/util/AaptManager.java
View File

@ -22,7 +22,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class AaptManager implements AaptProvider {
public class AaptManager {
private static File getAapt(Integer version) throws BrutException {
File aaptBinary;
@ -109,13 +109,11 @@ public class AaptManager implements AaptProvider {
return getAppVersionFromString(version);
}
@Override
public File getAapt2() throws BrutException {
public static File getAapt2() throws BrutException {
return getAapt(2);
}
@Override
public File getAapt1() throws BrutException {
public static File getAapt1() throws BrutException {
return getAapt(1);
}
}

12
brut.j.util/src/main/java/brut/util/AaptProvider.java
View File

@ -1,12 +0,0 @@
package brut.util;
import brut.common.BrutException;
import java.io.File;
public interface AaptProvider {
File getAapt2() throws BrutException;
default File getAapt1() throws BrutException {
throw new BrutException(new UnsupportedOperationException("Aapt1 is not supported on this device"));
};
}