Merge pull request #175 from xidaokun/dev_v1.3

Dev v1.3
elastos · Mar 29, 2019 · af48d73 · af48d73
2 parents f4792ba + 6eabd0d
commit af48d73
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/app/src/main/java/com/breadwallet/presenter/activities/HomeActivity.java b/app/src/main/java/com/breadwallet/presenter/activities/HomeActivity.java
@@ -108,20 +108,22 @@ private String getKeyVale(String path, String value){
     private String mSeed;
     private String publicKey;
     private void initDid(){
-        String mnemonic = getMn();
-        if(StringUtil.isNullOrEmpty(mnemonic)) return;
-        String language = Utility.detectLang(HomeActivity.this, mnemonic);
-        if(StringUtil.isNullOrEmpty(language)) return;
-        String words = Utility.getWords(HomeActivity.this,  language +"-BIP39Words.txt");
-        if(StringUtil.isNullOrEmpty(words)) return;
-        mSeed = IdentityManager.getSeed(mnemonic, Utility.getLanguage(language), words, "");
-        if(StringUtil.isNullOrEmpty(mSeed)) return;
-        Identity identity = IdentityManager.createIdentity(getFilesDir().getAbsolutePath());
-        DidManager didManager = identity.createDidManager(mSeed);
-        BlockChainNode node = new BlockChainNode(ProfileDataSource.DID_URL);
-        mDid = didManager.createDid(0);
-        mDid.setNode(node);
-        publicKey = Utility.getInstance(HomeActivity.this).getSinglePublicKey(mnemonic);
+        if(null == mDid){
+            String mnemonic = getMn();
+            if(StringUtil.isNullOrEmpty(mnemonic)) return;
+            String language = Utility.detectLang(HomeActivity.this, mnemonic);
+            if(StringUtil.isNullOrEmpty(language)) return;
+            String words = Utility.getWords(HomeActivity.this,  language +"-BIP39Words.txt");
+            if(StringUtil.isNullOrEmpty(words)) return;
+            mSeed = IdentityManager.getSeed(mnemonic, Utility.getLanguage(language), words, "");
+            if(StringUtil.isNullOrEmpty(mSeed)) return;
+            Identity identity = IdentityManager.createIdentity(getFilesDir().getAbsolutePath());
+            DidManager didManager = identity.createDidManager(mSeed);
+            BlockChainNode node = new BlockChainNode(ProfileDataSource.DID_URL);
+            mDid = didManager.createDid(0);
+            mDid.setNode(node);
+            publicKey = Utility.getInstance(HomeActivity.this).getSinglePublicKey(mnemonic);
+        }
     }
 
     private void didIsOnchain(){
@@ -133,7 +135,9 @@ public void run() {
                 String value = mDid.getInfo("Publickey");
                 Log.i("DidOnchain", "value:"+value);
                 if(StringUtil.isNullOrEmpty(value) || !value.contains("Publickey")){
+                    if(StringUtil.isNullOrEmpty(publicKey)) return;
                     String data = getKeyVale("Publickey", publicKey);
+                    if(StringUtil.isNullOrEmpty(data)) return;
                     String info = mDid.signInfo(mSeed, data);
                     if(StringUtil.isNullOrEmpty(info)) return;
                     String txid = ProfileDataSource.getInstance(HomeActivity.this).upchain(info);

diff --git a/app/src/main/java/com/breadwallet/wallet/wallets/ethereum/WalletEthManager.java b/app/src/main/java/com/breadwallet/wallet/wallets/ethereum/WalletEthManager.java
@@ -724,7 +724,7 @@ public void run() {
                     @Override
                     public void onRpcRequestCompleted(String jsonResult) {
                         try {
-                            if (!Utils.isNullOrEmpty(jsonResult)) {
+                            if (!Utils.isNullOrEmpty(jsonResult) && jsonResult.contains(JsonRpcHelper.RESULT)) {
                                 JSONObject responseObject = new JSONObject(jsonResult);
 
                                 if (responseObject.has(JsonRpcHelper.RESULT)) {

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1013,6 +1013,6 @@
     <string name="disclaim_ok">我知道了</string>
 
     <string name="invalid_number">无效号码</string>
-    <string name="invalid_email">无效邮件</string>
+    <string name="invalid_email">无效邮箱</string>
     <string name="invalid_id">无效ID</string>
 </resources>