Merge pull request #7 from StringCare/develop

Develop

Author: efraespada

README.md

@@ -14,7 +14,7 @@ root_project/build.gradle
 buildscript {
 
     ext {
-        stringcare_version = '0.6'
+        stringcare_version = '0.7'
     }
 
     repositories {

build.gradle

@@ -24,7 +24,7 @@ apply plugin: 'java'
 apply plugin: 'com.jfrog.bintray'
 
 group 'com.stringcare'
-version '0.6'
+version '0.7'
 
 sourceCompatibility = 1.8
 

src/main/groovy/FileUtils.java

@@ -230,10 +230,9 @@ public static String find(String module, String xmlO, String key, boolean debug)
                 } else {
                     encrypted = AES.encrypt(result, key);
                     toShow = result;
-                    content = content.replaceAll(">" + result + "<", ">" + encrypted + "<");
+                    content = content.replace(">" + result + "<", ">" + encrypted + "<");
                 }
 
-
                 toShow = toShow.length() > maxToShow ? toShow.substring(0, maxToShow) + ".." : toShow;
                 encrypted = encrypted.length() > maxToShow ? encrypted.substring(0, maxToShow) + ".." : encrypted;
                 PrintUtils.print(module, "\t[" + toShow + "] - [" + encrypted + "]" + (hasExtra ? extra : ""), true);
@@ -242,12 +241,15 @@ public static String find(String module, String xmlO, String key, boolean debug)
                 e.printStackTrace();
             }
 
-
             xml1 = toAnalyze.substring(toAnalyze.indexOf(result + "</string>"), (int)(toAnalyze.length()));
 
             if (xml1.indexOf(toFind1)  <= 0) break;
         }
 
+        if (debug) {
+            PrintUtils.print(module, content, true);
+        }
+
         return content;
     }
 

src/main/groovy/StringCarePlugin.groovy

@@ -74,7 +74,7 @@ class StringCare implements Plugin<Project> {
             @Override
             void onMergeResourcesStarts(String module, String variant) {
                 key = CredentialUtils.getKey(module, variant, debug);
-                if (!"none".equals(key)) {
+                if (!"none".equals(key) && key != null) {
                     if (moduleMap.containsKey(module)) {
                         PrintUtils.print(module, variant + ":" + key)
                         PrintUtils.print(module, "backupStringResources")
@@ -103,7 +103,7 @@ class StringCare implements Plugin<Project> {
 
             @Override
             void onMergeResourcesFinish(String module, String variant) {
-                if (!"none".equals(key)) {
+                if (!"none".equals(key)&& key != null) {
                     if (moduleMap.containsKey(module)) {
                         PrintUtils.print(module, "restoreStringResources")
                         FileUtils.restoreStringResources(module, moduleMap.get(module), debug)