Skip to content

Commit 8d9ab60

Browse files
efraespadaefraespada
committed
last changes for new version
1 parent 39db8d4 commit 8d9ab60

File tree

7 files changed

+79
-28
lines changed

7 files changed

+79
-28
lines changed

‎README.md‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repositories {
1616
}
1717
1818
dependencies {
19-
compile 'efraespada:androidstringobfuscator:0.2'
19+
compile 'efraespada:androidstringobfuscator:0.4'
2020
}
2121
2222
android.applicationVariants.all{ variant ->
@@ -63,6 +63,27 @@ String encrypted = AndroidStringObfuscator.simulateString(some_string_var);
6363
String decrypted = AndroidStringObfuscator.getString(R.string.app_name);
6464
```
6565

66+
Sample
67+
------
68+
69+
```java
70+
AndroidStringObfuscator.init(this);
71+
72+
// getting encrypted string resources
73+
int stringId = R.string.hello;
74+
75+
String message = getString(stringId);
76+
message += " is ";
77+
message += AndroidStringObfuscator.getString(stringId);
78+
79+
// and some secret
80+
String mySecret = "lalilulelo";
81+
82+
message += "\n\nFor Metal Gear lovers:\n\n\"Snake, the password is " + AndroidStringObfuscator.encryptString(message)
83+
+ "\n\n.. or " + AndroidStringObfuscator.decryptString(AndroidStringObfuscator.encryptString(mySecret)) + "\"";
84+
85+
((TextView) findViewById(R.id.example)).setText(message);
86+
```
6687
Gradle Console Output Example
6788
-----------------------------
6889
```

‎androidstringobfuscator/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33
apply plugin: 'com.jfrog.bintray'
44

5-
version = "0.3"
5+
version = "0.4"
66

77
android {
88
compileSdkVersion 25
@@ -12,7 +12,7 @@ android {
1212
minSdkVersion 9
1313
targetSdkVersion 25
1414
versionCode 1
15-
versionName "0.3"
15+
versionName "0.4"
1616

1717
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1818

‎androidstringobfuscator/src/main/java/com/efraespada/androidstringobfuscator/AndroidStringObfuscator.java‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,11 @@ private static String byteArrayToHexString(byte[] bytes) {
142142
return new String(hexChars);
143143
}
144144

145+
/**
146+
* returns a decrypted value for the given string resource
147+
* @param id
148+
* @return String
149+
*/
145150
public static String getString(int id) {
146151
if (context == null) {
147152
Log.e(TAG, "Library not initiated: AndroidStringObfuscator.init(Context)");
@@ -157,15 +162,40 @@ public static String getString(int id) {
157162
return context.getString(id); // returns original value, maybe not encrypted
158163
}
159164

160-
public static String simulateString(String text) {
165+
/**
166+
* encrypts the given value
167+
* @param value
168+
* @return String
169+
*/
170+
public static String encryptString(String value) {
161171
if (context == null) {
162172
Log.e(TAG, "Library not initiated: AndroidStringObfuscator.init(Context)");
163173
return null;
164174
}
165175

166176
String hash = getCertificateSHA1Fingerprint();
167177
try {
168-
return encrypt(text, hash);
178+
return encrypt(value, hash);
179+
} catch (Exception e) {
180+
e.printStackTrace();
181+
}
182+
return null;
183+
}
184+
185+
/**
186+
* decrypts the given encrypted value
187+
* @param value
188+
* @return String
189+
*/
190+
public static String decryptString(String value) {
191+
if (context == null) {
192+
Log.e(TAG, "Library not initiated: AndroidStringObfuscator.init(Context)");
193+
return null;
194+
}
195+
196+
String hash = getCertificateSHA1Fingerprint();
197+
try {
198+
return decrypt(value, hash);
169199
} catch (Exception e) {
170200
e.printStackTrace();
171201
}

‎build/intermediates/dex-cache/cache.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,15 @@
5555
sha1="5c597d4dae19a7393c81e5ba3a7794d9dfa06cf4">
5656
<dex dex="/Users/efraespada/Documents/Github/AndroidStringObfuscator/sample/build/intermediates/transforms/dex/debug/folders/1000/10/instant-run_0e777c06790c06898f56c90fdbb9417acb334706/classes.dex" />
5757
</item>
58+
<item
59+
is-multidex="true"
60+
jar="/Users/efraespada/Documents/Github/AndroidStringObfuscator/sample/build/intermediates/exploded-aar/efraespada/androidstringobfuscator/0.4/jars/classes.jar"
61+
jumboMode="true"
62+
optimize="true"
63+
revision="25.0.2"
64+
sha1="df49b9e0254bcffba0158ee5bb4bf72e78a39c35">
65+
<dex dex="/Users/efraespada/Documents/Github/AndroidStringObfuscator/sample/build/intermediates/transforms/dex/debug/folders/1000/10/efraespada-androidstringobfuscator-0.4_a31a71087edb98b5a90f68e36e2f8ce896936185/classes.dex" />
66+
</item>
5867
<item
5968
is-multidex="true"
6069
jar="/Users/efraespada/Documents/Github/AndroidStringObfuscator/sample/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.1.1/jars/classes.jar"
@@ -82,15 +91,6 @@
8291
sha1="c03bf57f358aa10d253f21989e93bcf6014b3b17">
8392
<dex dex="/Users/efraespada/Documents/Github/AndroidStringObfuscator/sample/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-support-vector-drawable-25.1.1_ec1dc61c4d10b478865970f348b67ff9b48d0d7a/classes.dex" />
8493
</item>
85-
<item
86-
is-multidex="true"
87-
jar="/Users/efraespada/Documents/Github/AndroidStringObfuscator/sample/build/intermediates/exploded-aar/efraespada/androidstringobfuscator/0.3/jars/classes.jar"
88-
jumboMode="true"
89-
optimize="true"
90-
revision="25.0.2"
91-
sha1="df3f6bfd3527b4e1887d54d29ab73a23dcee1f20">
92-
<dex dex="/Users/efraespada/Documents/Github/AndroidStringObfuscator/sample/build/intermediates/transforms/dex/debug/folders/1000/10/efraespada-androidstringobfuscator-0.3_dc0e69d3a233aa3fe6d3309a1c8ad2516d6e31bc/classes.dex" />
93-
</item>
9494
<item
9595
is-multidex="true"
9696
jar="/Users/efraespada/Documents/Github/AndroidStringObfuscator/sample/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.1/jars/classes.jar"

‎sample/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ dependencies {
3737
})
3838
compile 'com.android.support:appcompat-v7:25.1.1'
3939
testCompile 'junit:junit:4.12'
40-
compile project(path: ':androidstringobfuscator')
41-
// compile 'efraespada:androidstringobfuscator:0.3'
40+
// compile project(path: ':androidstringobfuscator')
41+
compile 'efraespada:androidstringobfuscator:0.4'
4242

4343
}
4444

‎sample/sample.iml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,6 @@
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
8274
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
@@ -101,7 +101,7 @@
101101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.1.1/jars" />
102102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.1.1/jars" />
103103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.1.1/jars" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/efraespada/androidstringobfuscator/0.3/jars" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/efraespada/androidstringobfuscator/0.4/jars" />
105105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
106106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
107107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
@@ -133,8 +133,8 @@
133133
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
134134
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
135135
<orderEntry type="library" exported="" name="support-v4-25.1.1" level="project" />
136-
<orderEntry type="library" exported="" name="androidstringobfuscator-0.3" level="project" />
137136
<orderEntry type="library" exported="" name="support-compat-25.1.1" level="project" />
137+
<orderEntry type="library" exported="" name="androidstringobfuscator-0.4" level="project" />
138138
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
139139
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
140140
<orderEntry type="library" exported="" name="support-media-compat-25.1.1" level="project" />

‎sample/src/main/java/com/efraespada/stringobfuscator/MainActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ protected void onCreate(Bundle savedInstanceState) {
2424
// secret
2525
String mySecret = "lalilulelo";
2626

27-
message += "\n \n For Metal Gear lovers: Snake, the pass is " + AndroidStringObfuscator.simulateString(message)
28-
+ " or " + mySecret;
27+
message += "\n\nFor Metal Gear lovers:\n\n\"Snake, the password is " + AndroidStringObfuscator.encryptString(message)
28+
+ "\n\n.. or " + AndroidStringObfuscator.decryptString(AndroidStringObfuscator.encryptString(mySecret)) + "\"";
2929

3030
((TextView) findViewById(R.id.example)).setText(message);
3131
}

0 commit comments

Comments
 (0)