Skip to content

Commit 94ed86d

Browse files
GooolerGoooler
committed
Code cleanups
1 parent 2cbefeb commit 94ed86d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+266
-308
lines changed

‎brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java

+11-13
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private static void cmdDecode(CommandLine cli) throws AndrolibException {
186186
} catch (CantFindFrameworkResException ex) {
187187
System.err
188188
.println("Can't find framework resources for package of id: "
189-
+ String.valueOf(ex.getPkgId())
189+
+ ex.getPkgId()
190190
+ ". You must install proper "
191191
+ "framework files, see project website for more info.");
192192
System.exit(1);
@@ -509,17 +509,17 @@ private static void _Options() {
509509
listFrameworkOptions.addOption(frameIfDirOption);
510510

511511
// add all, loop existing cats then manually add advance
512-
for (Object op : normalOptions.getOptions()) {
513-
allOptions.addOption((Option)op);
512+
for (Option op : normalOptions.getOptions()) {
513+
allOptions.addOption(op);
514514
}
515-
for (Object op : DecodeOptions.getOptions()) {
516-
allOptions.addOption((Option)op);
515+
for (Option op : DecodeOptions.getOptions()) {
516+
allOptions.addOption(op);
517517
}
518-
for (Object op : BuildOptions.getOptions()) {
519-
allOptions.addOption((Option)op);
518+
for (Option op : BuildOptions.getOptions()) {
519+
allOptions.addOption(op);
520520
}
521-
for (Object op : frameOptions.getOptions()) {
522-
allOptions.addOption((Option)op);
521+
for (Option op : frameOptions.getOptions()) {
522+
allOptions.addOption(op);
523523
}
524524
allOptions.addOption(apiLevelOption);
525525
allOptions.addOption(analysisOption);
@@ -561,7 +561,7 @@ private static void usage() {
561561
if (isAdvanceMode()) {
562562
System.out.println("Apache License 2.0 (https://www.apache.org/licenses/LICENSE-2.0)\n");
563563
}else {
564-
System.out.println("");
564+
System.out.println();
565565
}
566566

567567
// 4 usage outputs (general, frameworks, decode, build)
@@ -573,10 +573,8 @@ private static void usage() {
573573
formatter.printHelp("apktool " + verbosityHelp() + "publicize-resources <file_path>", emptyOptions);
574574
formatter.printHelp("apktool " + verbosityHelp() + "empty-framework-dir [options]", emptyFrameworkOptions);
575575
formatter.printHelp("apktool " + verbosityHelp() + "list-frameworks [options]", listFrameworkOptions);
576-
System.out.println("");
577-
} else {
578-
System.out.println("");
579576
}
577+
System.out.println();
580578

581579
// print out more information
582580
System.out.println(

‎brut.apktool/apktool-lib/src/main/java/android/content/res/XmlResourceParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ public interface XmlResourceParser extends XmlPullParser, AttributeSet {
3030
* Close this interface to the resource. Calls on the interface are no
3131
* longer value after this call.
3232
*/
33-
public void close();
33+
void close();
3434
}

‎brut.apktool/apktool-lib/src/main/java/android/util/AttributeSet.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public interface AttributeSet {
2626

2727
int getAttributeNameResource(int index);
2828

29-
int getAttributeListValue(int index, String options[], int defaultValue);
29+
int getAttributeListValue(int index, String[] options, int defaultValue);
3030

3131
boolean getAttributeBooleanValue(int index, boolean defaultValue);
3232

@@ -49,7 +49,7 @@ public interface AttributeSet {
4949
String getAttributeValue(String namespace, String attribute);
5050

5151
int getAttributeListValue(String namespace, String attribute,
52-
String options[], int defaultValue);
52+
String[] options, int defaultValue);
5353

5454
boolean getAttributeBooleanValue(String namespace, String attribute,
5555
boolean defaultValue);

‎brut.apktool/apktool-lib/src/main/java/android/util/TypedValue.java

+11-14
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public class TypedValue {
217217

218218
private static final float MANTISSA_MULT = 1.0f / (1 << TypedValue.COMPLEX_MANTISSA_SHIFT);
219219
private static final float[] RADIX_MULTS = new float[] {
220-
1.0f * MANTISSA_MULT, 1.0f / (1 << 7) * MANTISSA_MULT,
220+
MANTISSA_MULT, 1.0f / (1 << 7) * MANTISSA_MULT,
221221
1.0f / (1 << 15) * MANTISSA_MULT, 1.0f / (1 << 23) * MANTISSA_MULT };
222222

223223
/**
@@ -251,7 +251,7 @@ public static float complexToFloat(int complex) {
251251
* @return String The coerced string value. If the value is null or the type
252252
* is not known, null is returned.
253253
*/
254-
public static final String coerceToString(int type, int data) {
254+
public static String coerceToString(int type, int data) {
255255
switch (type) {
256256
case TYPE_NULL:
257257
return null;
@@ -262,11 +262,11 @@ public static final String coerceToString(int type, int data) {
262262
case TYPE_FLOAT:
263263
return Float.toString(Float.intBitsToFloat(data));
264264
case TYPE_DIMENSION:
265-
return Float.toString(complexToFloat(data))
265+
return complexToFloat(data)
266266
+ DIMENSION_UNIT_STRS[(data >> COMPLEX_UNIT_SHIFT)
267267
& COMPLEX_UNIT_MASK];
268268
case TYPE_FRACTION:
269-
return Float.toString(complexToFloat(data) * 100)
269+
return complexToFloat(data) * 100
270270
+ FRACTION_UNIT_STRS[(data >> COMPLEX_UNIT_SHIFT)
271271
& COMPLEX_UNIT_MASK];
272272
case TYPE_INT_HEX:
@@ -286,22 +286,19 @@ public static final String coerceToString(int type, int data) {
286286
res = res.substring(2);
287287
break;
288288
case TYPE_INT_COLOR_ARGB4:// #AARRGGBB->#ARGB
289-
res = new StringBuffer().append(vals[0]).append(vals[2])
290-
.append(vals[4]).append(vals[6]).toString();
289+
res = String.valueOf(vals[0]) + vals[2] +
290+
vals[4] + vals[6];
291291
break;
292292
case TYPE_INT_COLOR_RGB4:// #FFRRGGBB->#RGB
293-
res = new StringBuffer().append(vals[2]).append(vals[4])
294-
.append(vals[6]).toString();
293+
res = String.valueOf(vals[2]) + vals[4] +
294+
vals[6];
295295
break;
296296
}
297297
return "#" + res;
298298
} else if (type >= TYPE_FIRST_INT && type <= TYPE_LAST_INT) {
299-
String res;
300-
switch (type) {
301-
default:
302-
case TYPE_INT_DEC:
303-
res = Integer.toString(data);
304-
break;
299+
String res = null;
300+
if (type == TYPE_INT_DEC) {
301+
res = Integer.toString(data);
305302
}
306303
return res;
307304
}

‎brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import brut.common.InvalidUnknownFileException;
2626
import brut.common.RootUnknownFileException;
2727
import brut.common.TraversalUnknownFileException;
28-
import brut.directory.ExtFile;
2928
import brut.androlib.res.xml.ResXmlPatcher;
3029
import brut.androlib.src.SmaliBuilder;
3130
import brut.androlib.src.SmaliDecoder;
@@ -48,7 +47,7 @@
4847
public class Androlib {
4948
private final AndrolibResources mAndRes = new AndrolibResources();
5049
protected final ResUnknownFiles mResUnknownFiles = new ResUnknownFiles();
51-
public ApkOptions apkOptions;
50+
public final ApkOptions apkOptions;
5251
private int mMinSdkVersion = 0;
5352

5453
public Androlib() {
@@ -779,8 +778,8 @@ private boolean isFile(File working) {
779778
}
780779

781780
private boolean isModified(File[] working, File[] stored) {
782-
for (int i = 0; i < stored.length; i++) {
783-
if (!stored[i].exists()) {
781+
for (File file : stored) {
782+
if (!file.exists()) {
784783
return true;
785784
}
786785
}

‎brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,10 @@ public void decode() throws AndrolibException, IOException, DirectoryException {
165165

166166
mAndrolib.decodeRawFiles(mApkFile, outDir, mDecodeAssets);
167167
mAndrolib.decodeUnknownFiles(mApkFile, outDir);
168-
mUncompressedFiles = new ArrayList<String>();
168+
mUncompressedFiles = new ArrayList<>();
169169
mAndrolib.recordUncompressedFiles(mApkFile, mUncompressedFiles);
170170
mAndrolib.writeOriginalFiles(mApkFile, outDir);
171171
writeMetaFile();
172-
} catch (Exception ex) {
173-
throw ex;
174172
} finally {
175173
try {
176174
mApkFile.close();

‎brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class ApkOptions {
2424
public boolean debugMode = false;
2525
public boolean verbose = false;
2626
public boolean copyOriginalFiles = false;
27-
public boolean updateFiles = false;
27+
public final boolean updateFiles = false;
2828
public boolean isFramework = false;
2929
public boolean resourcesAreCompressed = false;
3030
public boolean useAapt2 = false;

‎brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/StringExConstructor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public StringExConstructor() {
2929

3030
private class ConstructStringEx extends AbstractConstruct {
3131
public Object construct(Node node) {
32-
String val = (String) constructScalar((ScalarNode) node);
32+
String val = constructScalar((ScalarNode) node);
3333
return YamlStringEscapeUtils.unescapeString(val);
3434
}
3535
}

‎brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java

+12-20
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public ResPackage loadMainPkg(ResTable resTable, ExtFile apkFile)
6262
throws AndrolibException {
6363
LOGGER.info("Loading resource table...");
6464
ResPackage[] pkgs = getResPackagesFromApk(apkFile, resTable, sKeepBroken);
65-
ResPackage pkg = null;
65+
ResPackage pkg;
6666

6767
switch (pkgs.length) {
6868
case 1:
@@ -71,14 +71,11 @@ public ResPackage loadMainPkg(ResTable resTable, ExtFile apkFile)
7171
case 2:
7272
if (pkgs[0].getName().equals("android")) {
7373
LOGGER.warning("Skipping \"android\" package group");
74-
pkg = pkgs[1];
75-
break;
7674
} else if (pkgs[0].getName().equals("com.htc")) {
7775
LOGGER.warning("Skipping \"htc\" package group");
78-
pkg = pkgs[1];
79-
break;
8076
}
81-
77+
pkg = pkgs[1];
78+
break;
8279
default:
8380
pkg = selectPkgWithMostResSpecs(pkgs);
8481
break;
@@ -128,7 +125,7 @@ public ResPackage loadFrameworkPkg(ResTable resTable, int id, String frameTag)
128125
}
129126

130127
if (pkg.getId() != id) {
131-
throw new AndrolibException("Expected pkg of id: " + String.valueOf(id) + ", got: " + pkg.getId());
128+
throw new AndrolibException("Expected pkg of id: " + id + ", got: " + pkg.getId());
132129
}
133130

134131
resTable.addPackage(pkg, false);
@@ -619,7 +616,7 @@ public void aaptPackage(File apkFile, File manifest, File resDir, File rawDir, F
619616

620617
String aaptPath = apkOptions.aaptPath;
621618
boolean customAapt = !aaptPath.isEmpty();
622-
List<String> cmd = new ArrayList<String>();
619+
List<String> cmd = new ArrayList<>();
623620

624621
try {
625622
String aaptCommand = AaptManager.getAaptExecutionCommand(aaptPath, getAaptBinaryFile());
@@ -705,7 +702,7 @@ public Duo<ResFileDecoder, AXmlResourceParser> getResFileDecoder() {
705702
axmlParser.setAttrDecoder(new ResAttrDecoder());
706703
decoders.setDecoder("xml", new XmlPullStreamDecoder(axmlParser, getResXmlSerializer()));
707704

708-
return new Duo<ResFileDecoder, AXmlResourceParser>(new ResFileDecoder(decoders), axmlParser);
705+
return new Duo<>(new ResFileDecoder(decoders), axmlParser);
709706
}
710707

711708
public Duo<ResFileDecoder, AXmlResourceParser> getManifestFileDecoder(boolean withResources) {
@@ -717,7 +714,7 @@ public Duo<ResFileDecoder, AXmlResourceParser> getManifestFileDecoder(boolean wi
717714
}
718715
decoders.setDecoder("xml", new XmlPullStreamDecoder(axmlParser,getResXmlSerializer()));
719716

720-
return new Duo<ResFileDecoder, AXmlResourceParser>(new ResFileDecoder(decoders), axmlParser);
717+
return new Duo<>(new ResFileDecoder(decoders), axmlParser);
721718
}
722719

723720
public ExtMXSerializer getResXmlSerializer() {
@@ -783,15 +780,10 @@ private ResPackage[] getResPackagesFromApk(ExtFile apkFile,ResTable resTable, bo
783780
throws AndrolibException {
784781
try {
785782
Directory dir = apkFile.getDirectory();
786-
BufferedInputStream bfi = new BufferedInputStream(dir.getFileInput("resources.arsc"));
787-
try {
783+
try (BufferedInputStream bfi = new BufferedInputStream(dir.getFileInput("resources.arsc"))) {
788784
return ARSCDecoder.decode(bfi, false, keepBroken, resTable).getPackages();
789-
} finally {
790-
try {
791-
bfi.close();
792-
} catch (IOException ignored) {}
793785
}
794-
} catch (DirectoryException ex) {
786+
} catch (DirectoryException | IOException ex) {
795787
throw new AndrolibException("Could not load resources.arsc from file: " + apkFile, ex);
796788
}
797789
}
@@ -808,7 +800,7 @@ public File getFrameworkApk(int id, String frameTag)
808800
}
809801
}
810802

811-
apk = new File(dir, String.valueOf(id) + ".apk");
803+
apk = new File(dir, id + ".apk");
812804
if (apk.exists()) {
813805
return apk;
814806
}
@@ -888,8 +880,8 @@ public void installFramework(File frameFile, String tag)
888880
ARSCData arsc = ARSCDecoder.decode(new ByteArrayInputStream(data), true, true);
889881
publicizeResources(data, arsc.getFlagsOffsets());
890882

891-
File outFile = new File(getFrameworkDir(), String.valueOf(arsc
892-
.getOnePackage().getId())
883+
File outFile = new File(getFrameworkDir(), arsc
884+
.getOnePackage().getId()
893885
+ (tag == null ? "" : '-' + tag)
894886
+ ".apk");
895887

‎brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResID.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ public boolean equals(Object obj) {
5959
return false;
6060
}
6161
final ResID other = (ResID) obj;
62-
if (this.id != other.id) {
63-
return false;
64-
}
65-
return true;
62+
return this.id == other.id;
6663
}
6764
}

‎brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java

+10-13
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ public class ResPackage {
2929
private final ResTable mResTable;
3030
private final int mId;
3131
private final String mName;
32-
private final Map<ResID, ResResSpec> mResSpecs = new LinkedHashMap<ResID, ResResSpec>();
33-
private final Map<ResConfigFlags, ResType> mConfigs = new LinkedHashMap<ResConfigFlags, ResType>();
34-
private final Map<String, ResTypeSpec> mTypes = new LinkedHashMap<String, ResTypeSpec>();
35-
private final Set<ResID> mSynthesizedRes = new HashSet<ResID>();
32+
private final Map<ResID, ResResSpec> mResSpecs = new LinkedHashMap<>();
33+
private final Map<ResConfigFlags, ResType> mConfigs = new LinkedHashMap<>();
34+
private final Map<String, ResTypeSpec> mTypes = new LinkedHashMap<>();
35+
private final Set<ResID> mSynthesizedRes = new HashSet<>();
3636

3737
private ResValueFactory mValueFactory;
3838

@@ -43,7 +43,7 @@ public ResPackage(ResTable resTable, int id, String name) {
4343
}
4444

4545
public List<ResResSpec> listResSpecs() {
46-
return new ArrayList<ResResSpec>(mResSpecs.values());
46+
return new ArrayList<>(mResSpecs.values());
4747
}
4848

4949
public boolean hasResSpec(ResID resID) {
@@ -80,7 +80,7 @@ public ResTypeSpec getType(String typeName) throws AndrolibException {
8080
}
8181

8282
public Set<ResResource> listFiles() {
83-
Set<ResResource> ret = new HashSet<ResResource>();
83+
Set<ResResource> ret = new HashSet<>();
8484
for (ResResSpec spec : mResSpecs.values()) {
8585
for (ResResource res : spec.listResources()) {
8686
if (res.getValue() instanceof ResFileValue) {
@@ -92,13 +92,13 @@ public Set<ResResource> listFiles() {
9292
}
9393

9494
public Collection<ResValuesFile> listValuesFiles() {
95-
Map<Duo<ResTypeSpec, ResType>, ResValuesFile> ret = new HashMap<Duo<ResTypeSpec, ResType>, ResValuesFile>();
95+
Map<Duo<ResTypeSpec, ResType>, ResValuesFile> ret = new HashMap<>();
9696
for (ResResSpec spec : mResSpecs.values()) {
9797
for (ResResource res : spec.listResources()) {
9898
if (res.getValue() instanceof ResValuesXmlSerializable) {
9999
ResTypeSpec type = res.getResSpec().getType();
100100
ResType config = res.getConfig();
101-
Duo<ResTypeSpec, ResType> key = new Duo<ResTypeSpec, ResType>(type, config);
101+
Duo<ResTypeSpec, ResType> key = new Duo<>(type, config);
102102
ResValuesFile values = ret.get(key);
103103
if (values == null) {
104104
values = new ResValuesFile(this, type, config);
@@ -163,13 +163,10 @@ public boolean equals(Object obj) {
163163
return false;
164164
}
165165
final ResPackage other = (ResPackage) obj;
166-
if (this.mResTable != other.mResTable && (this.mResTable == null || !this.mResTable.equals(other.mResTable))) {
166+
if (!Objects.equals(this.mResTable, other.mResTable)) {
167167
return false;
168168
}
169-
if (this.mId != other.mId) {
170-
return false;
171-
}
172-
return true;
169+
return this.mId == other.mId;
173170
}
174171

175172
@Override

0 commit comments

Comments
 (0)