Security Fixes - Overall vs Previous Iteration

app/build.gradle

@@ -13,7 +13,13 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            // Enables code shrinking, obfuscation, and optimization for only
+            // your project's release build type.
+            minifyEnabled true
+
+            // Enables resource shrinking, which is performed by the
+            // Android Gradle plugin.
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

app/proguard-rules.pro

@@ -19,3 +19,8 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+# To fix errors and force R8 to keep certain code, add a -keep line in the ProGuard rules file. For example:
+# -keep public class MyClass
+-dontwarn com.crux.sdk.**
+-keep class com.crux.sdk.** {*;}

app/src/main/java/com/example/liquid_test_2/MainActivity.java

@@ -2,16 +2,18 @@
 
 import android.content.Context;
 import android.os.Bundle;
+import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.crux.sdk.CruxClient;
-import com.crux.sdk.model.CruxAddress;
-import com.crux.sdk.model.CruxClientError;
-import com.crux.sdk.model.CruxClientInitConfig;
-import com.crux.sdk.model.CruxClientResponseHandler;
-import com.crux.sdk.model.CruxIDState;
-import com.crux.sdk.model.CruxPutAddressMapSuccess;
+import com.crux.sdk.model.*;
+//import com.crux.sdk.model.CruxAddress;
+//import com.crux.sdk.model.CruxClientError;
+//import com.crux.sdk.model.CruxClientInitConfig;
+//import com.crux.sdk.model.CruxClientResponseHandler;
+//import com.crux.sdk.model.CruxIDState;
+//import com.crux.sdk.model.CruxPutAddressMapSuccess;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -38,7 +40,14 @@ public String runScript(final Context androidContextObject) throws IOException,
                 .setWalletClientName("cruxdev")
                 .setPrivateKey("cdf2d276caf0c9c34258ed6ebd0e60e0e8b3d9a7b8a9a717f2e19ed9b37f7c6f");
 
-        final CruxClient client = new CruxClient(configBuilder, androidContextObject);
+        CruxClient client;
+        try {
+            client = new CruxClient(configBuilder, androidContextObject);
+        } catch(CruxClientError e) {
+            Toast.makeText(androidContextObject, "Client caught and reraised:" + e.errorMessage, Toast.LENGTH_LONG).show();
+            System.out.println("use debug version for development");
+            return null;
+        }
 
         final String testAvailabilityCruxId = "yadu007";
         client.isCruxIDAvailable(testAvailabilityCruxId, new CruxClientResponseHandler<Boolean>() {
@@ -55,7 +64,8 @@ public void onResponse(Boolean successResponse) {
 
             @Override
             public void onErrorResponse(CruxClientError failureResponse) {
-                System.out.println(failureResponse);
+                System.err.println(failureResponse.errorCode);
+                System.err.println(failureResponse.errorMessage);
             }
         });
 
@@ -68,7 +78,8 @@ public void onResponse(Void successResponse) {
 
             @Override
             public void onErrorResponse(CruxClientError failureResponse) {
-                System.out.println(failureResponse);
+                System.err.println(failureResponse.errorCode);
+                System.err.println(failureResponse.errorMessage);
             }
         });
 
@@ -81,7 +92,8 @@ public void onResponse(CruxIDState successResponse) {
 
             @Override
             public void onErrorResponse(CruxClientError failureResponse) {
-                System.out.println(failureResponse);
+                System.err.println(failureResponse.errorCode);
+                System.err.println(failureResponse.errorMessage);
             }
         });
 
@@ -94,7 +106,8 @@ public void onResponse(HashMap<String, CruxAddress> successResponse) {
 
             @Override
             public void onErrorResponse(CruxClientError failureResponse) {
-                System.out.println(failureResponse);
+                System.err.println(failureResponse.errorCode);
+                System.err.println(failureResponse.errorMessage);
             }
         });
 
@@ -123,7 +136,8 @@ public void onResponse(CruxPutAddressMapSuccess successResponse) {
 
             @Override
             public void onErrorResponse(CruxClientError failureResponse) {
-                System.out.println(failureResponse);
+                System.err.println(failureResponse.errorCode);
+                System.err.println(failureResponse.errorMessage);
             }
         });
 
@@ -136,7 +150,7 @@ private HashMap<String, CruxAddress> getCurrencyMap() {
         currencyMap.put("btc", new CruxAddress("1HX4KvtPdg9QUYwQE1kNqTAjmNaDG7w82V", null));
         currencyMap.put("eth", new CruxAddress("0x0a2311594059b468c9897338b027c8782398b481", null));
         currencyMap.put("tron", new CruxAddress("TG3iFaVvUs34SGpWq8RG9gnagDLTe1jdyz", null));
-        currencyMap.put("xrp", new CruxAddress("rpfKAA2Ezqoq5wWo3XENdLYdZ8YGziz48h", "5555"));
+        currencyMap.put("xrp", new CruxAddress("rpfKAA2Ezqoq5wWo3XENdLYdZ8YGziz48h", "7777"));
         return currencyMap;
     }
 

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

@@ -7,9 +7,11 @@
     tools:context=".MainActivity">
 
     <TextView
+        android:padding = "30dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
+        android:gravity="center"
+        android:text="Check Logcat! Code is executing in background for a sample CruxID"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"

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

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Liquid_Test_2</string>
+    <string name="app_name">CRUX Android Sample</string>
 </resources>