Merge pull request #53 from StringCare/develop

Develop

Author: efraespada

README.md

@@ -20,7 +20,7 @@
 
 #### [Compatibility](https://github.com/StringCare/AndroidLibrary/wiki/Compatibility)
 
-#### [Migrate From 0.x To 1.x](https://github.com/StringCare/AndroidLibrary/wiki/Migrate-From-0.x-To-1.x)
+#### [Migrations](https://github.com/StringCare/AndroidLibrary/wiki/Migrations)
 
 [link]: https://github.com/StringCare/AndroidLibrary
 [badge]: https://img.shields.io/bintray/v/efff/maven/StringCareAndroidPlugin.svg

app/build.gradle

@@ -1,4 +1,6 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
 
 android {
     signingConfigs {
@@ -39,6 +41,7 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
     testImplementation 'junit:junit:4.12'
     // implementation project(path: ':library')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "com.stringcare:library:$stringcare_version"
 }
 

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

@@ -2,12 +2,13 @@
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.text.Html;
+import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
 import com.stringcare.library.SC;
 import com.stringcare.library.SCTextView;
+import com.stringcare.library.Version;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -18,16 +19,22 @@ protected void onCreate(Bundle savedInstanceState) {
 
         SC.init(getApplicationContext());
 
+        // 108, 97, 108, 105, 108, 117, 108, 101, 108, 111, 10, 104, 111, 108, 105 works
+        // 108, 97, 108, 105, 108, 117, 108, 101, 108, 111, 92, 110, 104, 111, 108, 105 not works
+
         // secret var
-        String password = "lalilulelo";
+        String password = getString(R.string.snake);
+        String original = SC.reveal(R.string.snake, Version.V2);
 
-        String message = "\n\nFor Metal Gear lovers:\n\n\"Snake, the password is " + SC.obfuscate(password)
-            + "\n\n.. or " + SC.reveal(SC.obfuscate(password)) + "\"";
+        String message = "Snake, the password is " + password + original;
 
-        ((TextView) findViewById(R.id.example_a)).setText(Html.fromHtml(message));
+        ((TextView) findViewById(R.id.example_a)).setText(message);
 
         String numbers = getString(R.string.test_a, "hi", 3) + " is " + SC.reveal(R.string.test_a, "hi", 3);
         ((TextView) findViewById(R.id.example_b)).setText(numbers);
+
+        Log.e("test", String.valueOf(getString(R.string.snake2).equals(SC.reveal(R.string.snake))));
+
         final SCTextView tvAuto = findViewById(R.id.auto_tv);
         findViewById(R.id.btn_change).setOnClickListener(new View.OnClickListener() {
             @Override

app/src/main/res/layout/activity_main.xml

@@ -63,4 +63,4 @@
 
     </ScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -1,9 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">String Obfuscator Sample</string>
     <string name="hello" hidden="true">
-        <br><b>Hello <i>Mr O'Callaghan</i></b>
-        <br>No, I'm talking with my father.
-        <br>Yes yes, but <strong>take it easy</strong>.<br>
+        <br><i>Hello there</i>
+        <br>General <strong>Kenobi</strong>.<br>
     </string>
     <string name="test_a" hidden="true">%1$s (%2$d)</string>
+    <string name="snake" hidden="true">\n\nla-li-lu-le-lo\n\n🐍😄🍉</string>
+    <string name="snake2">\n\nla-li-lu-le-lo\n\n🐍😄🍉</string>
 </resources>

build.gradle

@@ -1,8 +1,9 @@
 
 buildscript {
+    ext.kotlin_version = '1.3.31'
 
     ext {
-        stringcare_version = '1.6'
+        stringcare_version = '2.1'
     }
 
     repositories {
@@ -16,11 +17,12 @@ buildscript {
 
     dependencies {
         classpath "com.stringcare:plugin:$stringcare_version"
-        // classpath files('../GradlePlugin/build/libs/plugin-1.5.jar')
+        // classpath files('../GradlePlugin/build/libs/plugin-2.0.jar')
         // classpath files('..\\GradlePlugin\\build\\libs\\plugin-0.9.jar')
         classpath 'com.android.tools.build:gradle:3.4.1'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Tue May 07 22:19:17 CEST 2019
+#Sat May 25 04:13:40 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

library/CMakeLists.txt

@@ -3,7 +3,7 @@
 
 # Sets the minimum version of CMake required to build the native library.
 
-cmake_minimum_required(VERSION 3.10.2)
+cmake_minimum_required(VERSION 3.14.4)
 
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.

library/build.gradle

@@ -1,8 +1,10 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.6"
+version = "2.1"
 
 android {
     compileSdkVersion 28
@@ -32,7 +34,7 @@ android {
     }
     externalNativeBuild {
         cmake {
-            version "3.14.3"
+            version "3.14.4"
             path "CMakeLists.txt"
         }
     }
@@ -45,6 +47,7 @@ dependencies {
     })
     implementation 'com.android.support:appcompat-v7:28.0.0'
     testImplementation 'junit:junit:4.12'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 def siteUrl = 'https://github.com/StringCare/AndroidLibrary'
@@ -91,6 +94,7 @@ task sourcesJar(type: Jar) {
 
 task javadoc(type: Javadoc) {
     exclude '**/**.java'
+    exclude '**/**.kt'
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
 }
@@ -119,4 +123,7 @@ bintray {
         licenses = ["Apache-2.0"]
         publish = true
     }
+}
+repositories {
+    mavenCentral()
 }

library/src/main/java/com/stringcare/library/CPlusLogic.kt

@@ -0,0 +1,122 @@
+package com.stringcare.library
+
+import android.content.Context
+import android.content.res.Resources
+import android.os.Build
+import android.support.annotation.StringRes
+import java.nio.charset.Charset
+import java.util.*
+
+class CPlusLogic {
+
+    companion object {
+
+        /**
+         * Obfuscates the given value
+         * @param value
+         * @return String
+         */
+        @JvmStatic
+        fun obfuscateV1(context: Context, value: String): String? {
+            return SC().jniObfuscateV1(context, getCertificateSHA1Fingerprint(context), value)
+        }
+
+        /**
+         * Reveals the given value
+         * @param id
+         * @return String
+         */
+        @JvmStatic
+        fun revealV1(context: Context, @StringRes id: Int): String? {
+            return SC().jniRevealV1(context, getCertificateSHA1Fingerprint(context), context.getString(id))
+        }
+
+        /**
+         * Reveals the given value
+         * @param value
+         * @return String
+         */
+        @JvmStatic
+        fun revealV1(context: Context, value: String): String? {
+            return SC().jniRevealV1(context, getCertificateSHA1Fingerprint(context), value)
+        }
+
+        /**
+         * Reveals the given value
+         * @param id
+         * @param formatArgs
+         * @return
+         */
+        @JvmStatic
+        fun revealV1(context: Context, @StringRes id: Int, formatArgs: Array<out Any>): String ? {
+            val value = revealV1(context, id)
+            value?.let {
+                val locale: Locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    Resources.getSystem().configuration.locales.get(0)
+                } else {
+                    Resources.getSystem().configuration.locale
+                }
+                return java.lang.String.format(locale, it, *formatArgs)
+            }
+            return null
+        }
+
+        /**
+         * Obfuscates the given value
+         * @param value
+         * @return String
+         */
+        @JvmStatic
+        fun obfuscateV2(context: Context, value: String): String? {
+            val bytes = Charset.forName("UTF-8").encode(value)
+            val arrO = ByteArray(bytes.remaining())
+            bytes.get(arrO)
+            val arr: ByteArray = SC().jniObfuscateV2(context, getCertificateSHA1Fingerprint(context), arrO)
+            return arr.map { it.toInt() }.toString().replace("[","").replace("]","")
+        }
+
+        /**
+         * Reveals the given value
+         * @param id
+         * @return String
+         */
+        @JvmStatic
+        fun revealV2(context: Context, @StringRes id: Int): String? {
+            val arr: ByteArray = context.getString(id).split(", ").map { it.toInt().toByte() }.toByteArray()
+            return String(SC().jniRevealV2(context, getCertificateSHA1Fingerprint(context), arr))
+        }
+
+        /**
+         * Reveals the given value
+         * @param value
+         * @return String
+         */
+        @JvmStatic
+        fun revealV2(context: Context, value: String): String? {
+            val arr: ByteArray = value.split(", ").map { it.toInt().toByte() }.toByteArray()
+            return String(SC().jniRevealV2(context, getCertificateSHA1Fingerprint(context), arr))
+        }
+
+        /**
+         * Reveals the given value
+         * @param id
+         * @param formatArgs
+         * @return
+         */
+        @JvmStatic
+        fun revealV2(context: Context, @StringRes id: Int, formatArgs: Array<out Any>): String? {
+            val value = revealV2(context, id)
+            value?.let {
+                val locale: Locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    Resources.getSystem().configuration.locales.get(0)
+                } else {
+                    Resources.getSystem().configuration.locale
+                }
+                return java.lang.String.format(locale, it, *formatArgs)
+            }
+            return null
+        }
+
+    }
+
+}

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

@@ -0,0 +1,7 @@
+package com.stringcare.library
+
+interface ContextListener {
+
+    fun contextReady()
+
+}

library/src/main/java/com/stringcare/library/ContextListener.kt

@@ -0,0 +1,71 @@
+package com.stringcare.library
+
+import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import java.io.ByteArrayInputStream
+import java.io.UnsupportedEncodingException
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+import java.security.cert.CertificateEncodingException
+import java.security.cert.CertificateException
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
+import java.util.*
+import javax.crypto.SecretKey
+import javax.crypto.spec.SecretKeySpec
+
+internal fun getCertificateSHA1Fingerprint(context: Context): String? {
+    val pm = context.packageManager
+    val flags = PackageManager.GET_SIGNATURES
+    var packageInfo: PackageInfo? = null
+    try {
+        packageInfo = pm.getPackageInfo(context.packageName, flags)
+    } catch (e: PackageManager.NameNotFoundException) {
+        e.printStackTrace()
+    }
+
+    val signatures = packageInfo!!.signatures
+    val cert = signatures[0].toByteArray()
+    val input = ByteArrayInputStream(cert)
+    var cf: CertificateFactory? = null
+    try {
+        cf = CertificateFactory.getInstance("X509")
+    } catch (e: CertificateException) {
+        e.printStackTrace()
+    }
+
+    var c: X509Certificate? = null
+    try {
+        c = cf!!.generateCertificate(input) as X509Certificate
+    } catch (e: CertificateException) {
+        e.printStackTrace()
+    }
+
+    var hexString: String? = null
+    try {
+        val md = MessageDigest.getInstance("SHA1")
+        val publicKey = md.digest(c!!.encoded)
+        hexString = publicKey.asHexUpper
+    } catch (e1: NoSuchAlgorithmException) {
+        e1.printStackTrace()
+    } catch (e1: CertificateEncodingException) {
+        e1.printStackTrace()
+    }
+
+    return hexString
+}
+
+@Throws(NoSuchAlgorithmException::class)
+internal fun generateKey(key: String): SecretKey {
+    val digest = MessageDigest.getInstance("SHA-1")
+    var passphrase: ByteArray? = null
+    try {
+        passphrase = digest.digest(key.toByteArray(charset(codification)))
+    } catch (e: UnsupportedEncodingException) {
+        e.printStackTrace()
+    }
+
+    passphrase = Arrays.copyOf(passphrase!!, 16)
+    return SecretKeySpec(passphrase, "AES")
+}