Skip to content

Commit f2b11f0

Browse files
efraespadaefraespada
authored
Merge pull request #7 from efraespada/develop
Develop
2 parents 7bd8f18 + 4d23d5a commit f2b11f0

File tree

6 files changed

+40
-23
lines changed

6 files changed

+40
-23
lines changed

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,11 @@ message += AndroidStringObfuscator.getString(stringId);
8383
// and secret
8484
String mySecret = "lalilulelo";
8585

86-
message += "\n\nFor Metal Gear lovers:\n\n\"Snake, the password is " + AndroidStringObfuscator.encryptString(mySecret)
87-
+ "\n\n.. or " + AndroidStringObfuscator.decryptString(AndroidStringObfuscator.encryptString(mySecret)) + "\"";
86+
message += "\n\nFor Metal Gear lovers:\n\n\"Snake, the password is " +
87+
AndroidStringObfuscator.encryptString(mySecret) +
88+
"\n\n.. or " +
89+
AndroidStringObfuscator.decryptString(AndroidStringObfuscator.encryptString(mySecret)) +
90+
"\"";
8891

8992
((TextView) findViewById(R.id.example)).setText(message);
9093
```

‎androidstringobfuscator/androidstringobfuscator.iml‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,32 @@
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7972
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8084
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8192
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8293
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8394
</content>

‎sample.png‎

533 Bytes
Loading

‎sample/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ dependencies {
3535
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
3636
exclude group: 'com.android.support', module: 'support-annotations'
3737
})
38-
compile 'com.android.support:appcompat-v7:25.1.1'
38+
compile 'com.android.support:appcompat-v7:25.2.0'
3939
testCompile 'junit:junit:4.12'
4040
// compile project(path: ':androidstringobfuscator')
41-
compile 'efraespada:androidstringobfuscator:0.4'
41+
compile 'efraespada:androidstringobfuscator:0.4.1'
4242

4343
}
4444

‎sample/sample.iml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
<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" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8384
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -88,9 +89,11 @@
8889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
8990
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9091
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
9193
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9294
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
9395
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
9497
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
9598
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
9699
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -107,20 +110,20 @@
107110
<orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
108111
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
109112
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
110-
<orderEntry type="library" exported="" name="support-v4-25.1.1" level="project" />
111-
<orderEntry type="library" exported="" name="support-compat-25.1.1" level="project" />
112-
<orderEntry type="library" exported="" name="androidstringobfuscator-0.4" level="project" />
113+
<orderEntry type="library" exported="" name="androidstringobfuscator-0.4.1" level="project" />
114+
<orderEntry type="library" exported="" name="support-v4-25.2.0" level="project" />
115+
<orderEntry type="library" exported="" name="support-compat-25.2.0" level="project" />
113116
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
114117
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
115-
<orderEntry type="library" exported="" name="support-media-compat-25.1.1" level="project" />
116-
<orderEntry type="library" exported="" name="support-core-ui-25.1.1" level="project" />
118+
<orderEntry type="library" exported="" name="support-media-compat-25.2.0" level="project" />
119+
<orderEntry type="library" exported="" name="support-core-ui-25.2.0" level="project" />
117120
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
118-
<orderEntry type="library" exported="" name="appcompat-v7-25.1.1" level="project" />
121+
<orderEntry type="library" exported="" name="appcompat-v7-25.2.0" level="project" />
119122
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
120-
<orderEntry type="library" exported="" name="support-annotations-25.1.1" level="project" />
121-
<orderEntry type="library" exported="" name="support-vector-drawable-25.1.1" level="project" />
122-
<orderEntry type="library" exported="" name="support-core-utils-25.1.1" level="project" />
123-
<orderEntry type="library" exported="" name="support-fragment-25.1.1" level="project" />
124-
<orderEntry type="library" exported="" name="animated-vector-drawable-25.1.1" level="project" />
123+
<orderEntry type="library" exported="" name="support-annotations-25.2.0" level="project" />
124+
<orderEntry type="library" exported="" name="support-vector-drawable-25.2.0" level="project" />
125+
<orderEntry type="library" exported="" name="support-core-utils-25.2.0" level="project" />
126+
<orderEntry type="library" exported="" name="support-fragment-25.2.0" level="project" />
127+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.2.0" level="project" />
125128
</component>
126129
</module>

‎sample/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<resources>
22
<string name="hello" hidden="true">hello world!</string>
3-
<string name="app_name">StringObfuscator Sample</string>
3+
<string name="app_name">String Obfuscator Sample</string>
44
</resources>

0 commit comments

Comments
 (0)