Skip to content

Commit c26c18a

Browse files
efraespadaefraespada
committed
bugfix product fla.
1 parent e45b141 commit c26c18a

File tree

5 files changed

+29
-13
lines changed

5 files changed

+29
-13
lines changed

‎AndroidStringObfuscator.jar‎

117 Bytes
Binary file not shown.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Gradle Console Output Example
105105
:sample:obfuscator-script - SHA1 fingerprint: E1:28:0C:3E:65:91:2E:21:E9:98:2B:58:80:9A:25:3A:F6:88:7D:FF
106106
:sample:obfuscator-script - [hello world!] - [D1862D9B434D08E..]
107107
:sample:obfuscator-script - -----------------------------------------------------------------------------
108-
:sample:obfuscator-script - v 0.5
108+
:sample:obfuscator-script - v 0.6
109109
:sample:processDebugManifest UP-TO-DATE
110110
...
111111
```

‎androidstringobfuscator/androidstringobfuscator.iml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9191
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9292
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
9394
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
9495
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
9596
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />

‎obfuscator-script/src/main/Core.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class Core {
2020
static BufferedWriter writer = null;
2121
static String key = null;
2222
static String variant = null;
23+
static String variantO = null;
2324
static String module = null;
2425
static String file = null;
2526
static String error = null;
@@ -30,7 +31,7 @@ public class Core {
3031
final static boolean DEBUG = false;
3132
final static String TAG = "obfuscator-script";
3233
final static String SEPARATOR = "-----------------------------------------------------------------------------";
33-
final static String VERSION = "0.5";
34+
final static String VERSION = "0.6";
3435
final static int maxToShow = 15;
3536
final static String FOLDER = "string_obfuscation";
3637
final static String PARAMS_ORDER = "params [module] [variant] [optional:sha1]";
@@ -47,9 +48,15 @@ public static void main(String[] args) {
4748
for (int i = 0; i < args.length; i++) {
4849
if (i == 0)
4950
module = args[i];
50-
else if (i == 1)
51-
variant = args[i];
52-
else if (i == 2)
51+
else if (i == 1) {
52+
variantO = args[i];
53+
54+
if (variantO.indexOf("/") > 1) {
55+
String[] parts = variantO.split("/");
56+
variant = parts[0] + parts[1].substring(0, 1).toUpperCase() + parts[1].substring(1);
57+
}
58+
59+
} else if (i == 2)
5360
key = args[i];
5461
}
5562

@@ -93,7 +100,7 @@ public static void mainProcess() {
93100
if (variant != null)
94101
stringPath = module + File.separator + "build" + File.separator + "intermediates" +
95102
File.separator + "res" + File.separator + "merged" +
96-
File.separator + variant + File.separator + "values" +
103+
File.separator + variantO + File.separator + "values" +
97104
File.separator + "values.xml";
98105

99106
else {

‎sample/sample.iml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,31 +62,39 @@
6262
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8282
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
8385
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
8489
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8590
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8691
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
8793
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
8895
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8996
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
9098
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
9199
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
92100
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />

0 commit comments

Comments
 (0)