Merge pull request #10 from efraespada/develop

efraespada · web-flow · commit daf3cda1cafa · 2017-09-03T04:57:06.000+02:00
getApplicationContext
diff --git a/AndroidStringObfuscator.jar b/AndroidStringObfuscator.jar
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ dependencies {
 
 android.applicationVariants.all{ variant ->
     variant.mergeResources.doLast{
-        println  ":" + project.name + ":initStringObfuscator"
+        println  ":initStringObfuscator:" + project.name + ":" + variant.dirName
         javaexec {
             main = "-jar";
             args = [
@@ -38,7 +38,7 @@ Setup
 -----
 Initialize the library:
 ```java
-AndroidStringObfuscator.init(this);
+AndroidStringObfuscator.init(getApplicationContext());
 ```
 
 
@@ -105,7 +105,7 @@ Gradle Console Output Example
 :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.6
+:sample:obfuscator-script - v 0.7
 :sample:processDebugManifest UP-TO-DATE
 ...
 ```
diff --git a/androidstringobfuscator/androidstringobfuscator.iml b/androidstringobfuscator/androidstringobfuscator.iml
@@ -77,7 +77,6 @@
       <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/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -92,10 +91,7 @@
       <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/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,7 @@
 buildscript {
     repositories {
         jcenter()
+        mavenLocal()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
diff --git a/local.properties b/local.properties
@@ -7,7 +7,8 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Feb 07 22:20:17 CET 2017
+#Wed Aug 09 20:13:18 CEST 2017
 bintrayUser=efff
+ndk.dir=/Users/efraespada/Library/Android/sdk/ndk-bundle
 bintrayApiKey=1acf1ed062001f9a372e2391fdd0c16aed54a88a
 sdk.dir=/Users/efraespada/Library/Android/sdk
diff --git a/obfuscator-script/src/main/Core.java b/obfuscator-script/src/main/Core.java
@@ -31,7 +31,7 @@ public class Core {
 	final static boolean DEBUG = false;
 	final static String TAG = "obfuscator-script";
 	final static String SEPARATOR = "-----------------------------------------------------------------------------";
-	final static String VERSION = "0.6";
+	final static String VERSION = "0.7";
 	final static int maxToShow = 15;
 	final static String FOLDER = "string_obfuscation";
 	final static String PARAMS_ORDER = "params [module] [variant] [optional:sha1]";
@@ -54,6 +54,8 @@ else if (i == 1) {
 				if (variantO.indexOf("/") > 1) {
 					String[] parts = variantO.split("/");
 					variant = parts[0] + parts[1].substring(0, 1).toUpperCase() + parts[1].substring(1);
+				} else {
+					variant = variantO;
 				}
 
 			} else if (i == 2)
@@ -245,10 +247,14 @@ public static void getKey() {
 				cmd = "gradlew";
 				Runtime.getRuntime().exec("chmod +x ../" + cmd);
 			}
-						
-			InputStream is = Runtime.getRuntime().exec("../" + cmd + " signingReport").getInputStream();
+			
+			String command = "../" + cmd + " signingReport";
+
+			InputStream is = Runtime.getRuntime().exec(command).getInputStream();
 			InputStreamReader isr = new InputStreamReader(is);
 			BufferedReader buff = new BufferedReader (isr);
+			
+			
 
 			String line;
 			while ((line = buff.readLine()) != null) {
@@ -276,7 +282,7 @@ public static void getKey() {
 	public static void parseTrace(String line) {
 		
 		boolean mustPrint = false;
-		
+				
 		if (line.toLowerCase().contains("downloading")) {
 			mustPrint = true;
 		} else if (line.toLowerCase().contains("unzipping")) {
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -47,7 +47,7 @@ dependencies {
 android.applicationVariants.all{ variant ->
 
     variant.mergeResources.doLast{
-        println  ":" + project.name + ":initStringObfuscator"
+        println  ":initStringObfuscator:" + project.name + ":" + variant.dirName
         javaexec {
             main = "-jar";
             args = [
diff --git a/sample/sample.iml b/sample/sample.iml
@@ -76,30 +76,15 @@
       <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" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <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" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <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/pre-dexed" />
-      <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/rs" />
-      <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" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
diff --git a/sample/src/main/java/com/efraespada/stringobfuscator/MainActivity.java b/sample/src/main/java/com/efraespada/stringobfuscator/MainActivity.java
@@ -13,7 +13,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        AndroidStringObfuscator.init(this);
+        AndroidStringObfuscator.init(getApplicationContext());
 
         int stringId = R.string.hello;
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`buildscript {`
`4`	`4`	`repositories {`
`5`	`5`	`jcenter()`
	`6`	`+ mavenLocal()`
`6`	`7`	`maven {`
`7`	`8`	`url "https://plugins.gradle.org/m2/"`
`8`	`9`	`}`