Merge pull request #156 from ostdotcom/develop

Preparing for release 2.3.7
OpenST · Dec 13, 2019 · a442c99 · a442c99
2 parents 157274e + 2a525b0
commit a442c99
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # OST Wallet SDK Changelog
 
+## Version 2.3.7
+### Bug Fix:
+* Inaccurate error is thrown when application runs out of memory during recover device workflow.
+
 ## Version 2.3.6
 ### Changes:
 * Added support for custom loader for OstWalletSDK UI workflows.

diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ compileOptions {
 
 ```
 dependencies {
-    implementation 'com.ost:ost-wallet-sdk-android:2.3.6'
+    implementation 'com.ost:ost-wallet-sdk-android:2.3.7'
     ...
     ...
     ...

diff --git a/Samples/customloader/OstCustomLoader.md b/Samples/customloader/OstCustomLoader.md
@@ -1,4 +1,4 @@
-# Custom Loader Useage
+# Custom Loader Usage
 
 ## Setup
 1. Application project should have `ost-wallet-sdk-android` dependency.

diff --git a/ostsdk/gradle.properties b/ostsdk/gradle.properties
@@ -22,9 +22,9 @@
 # org.gradle.parallel=true
 
 #Increase version when publishing.
-VERSION_NAME=2.3.6
+VERSION_NAME=2.3.7
 #Increase version code when publishing.
-VERSION_CODE=48
+VERSION_CODE=49
 
 #Everything else.
 GROUP=com.ost

diff --git a/ostsdk/src/main/java/com/ost/walletsdk/ecKeyInteracts/InternalKeyManager.java b/ostsdk/src/main/java/com/ost/walletsdk/ecKeyInteracts/InternalKeyManager.java
@@ -733,9 +733,11 @@ String signDataWithRecoveryKey(String hexStringToSign, UserPassphrase passphrase
             // Sign the data.
             Sign.SignatureData signatureData = Sign.signMessage(Numeric.hexStringToByteArray(hexStringToSign), ecKeyPair, false);
             return Numeric.toHexString(signatureData.getR()) + Numeric.cleanHexPrefix(Numeric.toHexString(signatureData.getS())) + String.format("%02x", (signatureData.getV()));
+        } catch (OstError ostError) {
+            throw ostError;
         } catch (Throwable th) {
             //Supress it.
-            return null;
+            throw new OstError("c_ikm_sdwrk_1", ErrorCode.FAILED_TO_SIGN_DATA);
         } finally {
             if ( null == ecKeyPair ) {
                 clearBytes(salt);