de - obfuscation

Author: efraespada

app/src/main/java/com/efraespada/stringobfuscator/MainActivity.java

@@ -20,7 +20,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         String message = getString(stringId);
         message += " is ";
-        message += SC.getString(stringId);
+        message += SC.deobfuscate(stringId);
 
         // secret var
         String password = "lalilulelo";
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ((TextView) findViewById(R.id.example_a)).setText(message);
 
-        String numbers = getString(R.string.test_a, "hi", 3) + " is " + SC.getString(R.string.test_a, "hi", 3);
+        String numbers = getString(R.string.test_a, "hi", 3) + " is " + SC.deobfuscate(R.string.test_a, "hi", 3);
         ((TextView) findViewById(R.id.example_b)).setText(numbers);
 
     }

library/src/main/java/com/stringcare/library/SC.java

@@ -176,54 +176,39 @@ private static String byteArrayToHexString(byte[] bytes) {
     }
 
     /**
-     * returns a decrypted value for the given string resource
-     * @param id
+     * Obfuscates the given value
+     * @param value
      * @return String
      */
-    @Deprecated
-    public static String getString(@StringRes int id) {
+    public static String obfuscate(String value) {
         if (context == null) {
             Log.e(TAG, "Library not initialized: SC.init(Context)");
             return null;
         }
-
-        String hash = getCertificateSHA1Fingerprint();
         try {
-            return decrypt(context.getString(id), hash);
+            return jniObfuscate(context, getCertificateSHA1Fingerprint(), value);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return context.getString(id); // returns original value, maybe not encrypted
-    }
-
-    @Deprecated
-    public static String getString(@StringRes int id, Object... formatArgs) {
-        String value = getString(id);
-        Locale locale;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            locale = Resources.getSystem().getConfiguration().getLocales().get(0);
-        } else {
-            locale = Resources.getSystem().getConfiguration().locale;
-        }
-        return String.format(locale, value, formatArgs);
+        return value;
     }
 
     /**
-     * Obfuscates the given value
-     * @param value
+     * Deobfuscates the given value
+     * @param id
      * @return String
      */
-    public static String obfuscate(String value) {
+    public static String deobfuscate(@StringRes int id) {
         if (context == null) {
             Log.e(TAG, "Library not initialized: SC.init(Context)");
             return null;
         }
         try {
-            return jniObfuscate(context, getCertificateSHA1Fingerprint(), value);
+            return jniDeobfuscate(context, getCertificateSHA1Fingerprint(), context.getString(id));
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return "error";
+        return context.getString(id);
     }
 
     /**
@@ -241,7 +226,24 @@ public static String deobfuscate(String value) {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return "error";
+        return value;
+    }
+
+    /**
+     * Deobfuscates the given value
+     * @param id
+     * @param formatArgs
+     * @return
+     */
+    public static String deobfuscate(@StringRes int id, Object... formatArgs) {
+        String value = deobfuscate(id);
+        Locale locale;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            locale = Resources.getSystem().getConfiguration().getLocales().get(0);
+        } else {
+            locale = Resources.getSystem().getConfiguration().locale;
+        }
+        return String.format(locale, value, formatArgs);
     }
 
     /**
@@ -267,7 +269,7 @@ public static String encryptString(String value) {
     }
 
     /**
-     * Decrypts the given encrypted value
+     * Decrypts the given value
      * @param value
      * @return String
      * @deprecated use {@link #deobfuscate(String)}()} instead.
@@ -288,4 +290,44 @@ public static String decryptString(String value) {
         return null;
     }
 
+    /**
+     * Decrypts the given ID
+     * @param id
+     * @return String
+     */
+    @Deprecated
+    public static String getString(@StringRes int id) {
+        if (context == null) {
+            Log.e(TAG, "Library not initialized: SC.init(Context)");
+            return null;
+        }
+
+        String hash = getCertificateSHA1Fingerprint();
+        try {
+            return decrypt(context.getString(id), hash);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return context.getString(id); // returns original value, maybe not encrypted
+    }
+
+    /**
+     * Decrypts the given ID
+     * @param id
+     * @param formatArgs
+     * @return String
+     * @deprecated use {@link #deobfuscate(int, Object...)}()} instead.
+     */
+    @Deprecated
+    public static String getString(@StringRes int id, Object... formatArgs) {
+        String value = getString(id);
+        Locale locale;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            locale = Resources.getSystem().getConfiguration().getLocales().get(0);
+        } else {
+            locale = Resources.getSystem().getConfiguration().locale;
+        }
+        return String.format(locale, value, formatArgs);
+    }
+
 }

library/src/main/java/com/stringcare/library/SCTextView.java

@@ -33,7 +33,7 @@ private void loadText(final AttributeSet attrs) {
                 SC.onContextReady(new ContextListener() {
                     @Override
                     public void contextReady() {
-                        setText(SC.getString(val));
+                        setText(SC.deobfuscate(val));
                     }
                 });
             } catch (NumberFormatException e) {