Skip to content

Commit

Permalink
Merge pull request #7 from efraespada/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@efraespada
efraespada committed Mar 11, 2017
2 parents 7bd8f18 + 4d23d5a commit f2b11f0
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 23 deletions.
7 changes: 5 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,11 @@ message += AndroidStringObfuscator.getString(stringId);
// and secret
String mySecret = "lalilulelo";

message += "\n\nFor Metal Gear lovers:\n\n\"Snake, the password is " + AndroidStringObfuscator.encryptString(mySecret)
+ "\n\n.. or " + AndroidStringObfuscator.decryptString(AndroidStringObfuscator.encryptString(mySecret)) + "\"";
message += "\n\nFor Metal Gear lovers:\n\n\"Snake, the password is " +
AndroidStringObfuscator.encryptString(mySecret) +
"\n\n.. or " +
AndroidStringObfuscator.decryptString(AndroidStringObfuscator.encryptString(mySecret)) +
"\"";

((TextView) findViewById(R.id.example)).setText(message);
```
Expand Down
25 changes: 18 additions & 7 deletions androidstringobfuscator/androidstringobfuscator.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,32 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
Expand Down
Binary file modified sample.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions sample/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'com.android.support:appcompat-v7:25.2.0'
testCompile 'junit:junit:4.12'
// compile project(path: ':androidstringobfuscator')
compile 'efraespada:androidstringobfuscator:0.4'
compile 'efraespada:androidstringobfuscator:0.4.1'

}

Expand Down
25 changes: 14 additions & 11 deletions sample/sample.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
Expand All @@ -88,9 +89,11 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
Expand All @@ -107,20 +110,20 @@
<orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
<orderEntry type="library" exported="" name="support-v4-25.1.1" level="project" />
<orderEntry type="library" exported="" name="support-compat-25.1.1" level="project" />
<orderEntry type="library" exported="" name="androidstringobfuscator-0.4" level="project" />
<orderEntry type="library" exported="" name="androidstringobfuscator-0.4.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-25.2.0" level="project" />
<orderEntry type="library" exported="" name="support-compat-25.2.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" name="support-media-compat-25.1.1" level="project" />
<orderEntry type="library" exported="" name="support-core-ui-25.1.1" level="project" />
<orderEntry type="library" exported="" name="support-media-compat-25.2.0" level="project" />
<orderEntry type="library" exported="" name="support-core-ui-25.2.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-25.1.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-25.2.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-25.1.1" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-25.1.1" level="project" />
<orderEntry type="library" exported="" name="support-core-utils-25.1.1" level="project" />
<orderEntry type="library" exported="" name="support-fragment-25.1.1" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-25.1.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-25.2.0" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-25.2.0" level="project" />
<orderEntry type="library" exported="" name="support-core-utils-25.2.0" level="project" />
<orderEntry type="library" exported="" name="support-fragment-25.2.0" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-25.2.0" level="project" />
</component>
</module>
2 changes: 1 addition & 1 deletion sample/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<resources>
<string name="hello" hidden="true">hello world!</string>
<string name="app_name">StringObfuscator Sample</string>
<string name="app_name">String Obfuscator Sample</string>
</resources>

0 comments on commit f2b11f0

Please sign in to comment.