Merge pull request #14 from efraespada/develop

Develop

Author: efraespada

AndroidStringObfuscator.jar

@@ -1,36 +1,40 @@
 Android String Obfuscator
 =========================
 
-Hide strings easily with that lib (and script)! It uses AES/ECB/PKCS5Padding transformation to convert strings with your app's SHA1 fingerprint.
+Hide strings easily with that lib and plugin! It uses AES/ECB/PKCS5Padding transformation to convert strings with your app's SHA1 fingerprint.
 
-Installation
+Gradle implementation
 ------------
 
-Put [AndroidStringObfuscator.jar](https://github.com/efraespada/AndroidStringObfuscator/raw/master/AndroidStringObfuscator.jar) in the root of the project.
-
-#### Gradle 
+root_project/build.gradle
+```groovy
+buildscript { 
+ 
+    ext {
+        aso_sop_version = '0.4.1'
+    }
+    
+    repositories {
+        jcenter()
+    }
+    
+    dependencies {
+        classpath "com.efraespada:stringobfuscatorplugin:$aso_sop_version"
+    }
+     
+}
+ 
+apply plugin: com.efraespada.stringobfuscatorplugin.StringObfuscatorPlugin
+```
 
+root_project/app/build.gradle
 ```groovy
 repositories {
     jcenter()
-}
-
+} 
+ 
 dependencies {
-    compile 'efraespada:androidstringobfuscator:0.4.1'
-}
-
-android.applicationVariants.all{ variant ->
-    variant.mergeResources.doLast{
-        println  ":initStringObfuscator:" + project.name + ":" + variant.dirName
-        javaexec {
-            main = "-jar";
-            args = [
-                  "../AndroidStringObfuscator.jar",
-                  project.name,
-                  variant.dirName
-            ]
-        }
-    }
+    implementation "efraespada:androidstringobfuscator:$aso_sop_version"
 }
 ```
 
@@ -98,37 +102,22 @@ Gradle Console Output Example
 -----------------------------
 ```
 ...
+:sample:generateDebugResValues UP-TO-DATE
+:sample:generateDebugResources UP-TO-DATE
 :sample:mergeDebugResources
-:sample:initStringObfuscator
-:sample:obfuscator-script - -----------------------------------------------------------------------------
-:sample:obfuscator-script - debug variant
-: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
-:sample:obfuscator-script - [hello world!] - [D1862D9B434D08E..]
-:sample:obfuscator-script - -----------------------------------------------------------------------------
-:sample:obfuscator-script - v 0.7
-:sample:processDebugManifest UP-TO-DATE
+:sample:debug:B8:DC:47:58:9B:5F:2C:21:45:C4:04:37:0E:56:53:DC:24:6B:2C:66
+:sample:backupStringResources
+	- values/strings.xml
+:sample:encryptStringResources
+	- values/strings.xml
+		[hello world!] - [A8590C43DA85D67..]
+:sample:mergeDebugResources UP-TO-DATE
+:sample:restoreStringResources
+	- values/strings.xml
+:sample:createDebugCompatibleScreenManifests UP-TO-DATE
 ...
 ```
 
-
-#### More information
-If you haven't installed Gradle before you compile:
-```
-...
-:sample:obfuscator-script - Downloading https://services.gradle.org/distributions/gradle-2.14.1-all.zip
-:sample:obfuscator-script - Unzipping /Users/efraespada/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1-all.zip to /Users/efraespada/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv
-:sample:obfuscator-script - Set executable permissions for: /Users/efraespada/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/bin/gradle
-...
-```
-
-If `~/.android/debug.keystore` is missing, run your app to generate that file. For non default keystore file, check your project configuration.
-```
-...
-:sample:obfuscator-script - debug variant
-:sample:obfuscator-script - Missing keystore
-:sample:obfuscator-script - SHA1 fingerprint not detected; try params [module] [variant] [optional:sha1]
-...
-```
 License
 -------
     Copyright 2017 Efraín Espada

README.md

@@ -6,7 +6,7 @@ version = "0.4.1"
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         minSdkVersion 9

androidstringobfuscator/build.gradle

@@ -11,14 +11,17 @@
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
+import java.util.Random;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
 /**
@@ -27,6 +30,7 @@
 
 public class AndroidStringObfuscator {
 
+    private static final int LENGTH = 16;
     private static final String CODIFICATION = "UTF-8";
     private static final String TRANSFORMATION = "AES/ECB/PKCS5Padding";
     private static final char[] hexArray = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
@@ -201,4 +205,5 @@ public static String decryptString(String value) {
         }
         return null;
     }
+
 }

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

@@ -1,28 +1,41 @@
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+
+    ext {
+        aso_sop_version = '0.4.1'
+    }
+
     repositories {
         jcenter()
+        google()
         mavenLocal()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        // classpath files('../StringObfuscatorPlugin/build/libs/stringobfuscatorplugin-0.4.1.jar')
+        classpath "com.efraespada:stringobfuscatorplugin:$aso_sop_version"
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath files('better-connected-plugin-0.1.jar')
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
+apply plugin: com.efraespada.stringobfuscatorplugin.StringObfuscatorPlugin
+

build.gradle

@@ -1,6 +1,6 @@
-#Sat Mar 11 04:02:13 CET 2017
+#Mon Oct 30 22:21:49 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip