Skip to content

Commit 803f0d0

Browse files
committed
BalanceActivity: Dojo pairing scan
1 parent 7e61c12 commit 803f0d0

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

app/src/main/java/com/samourai/wallet/home/BalanceActivity.java

+4
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
import com.samourai.wallet.home.adapters.ItemDividerDecorator;
7676
import com.samourai.wallet.home.adapters.TxAdapter;
7777
import com.samourai.wallet.network.NetworkDashboard;
78+
import com.samourai.wallet.network.dojo.DojoUtil;
7879
import com.samourai.wallet.payload.PayloadUtil;
7980
import com.samourai.wallet.permissions.PermissionsUtil;
8081
import com.samourai.wallet.ricochet.RicochetMeta;
@@ -697,6 +698,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
697698
CahootsUtil.getInstance(BalanceActivity.this).processCahoots(strResult.trim());
698699
} else if (FormatsUtil.getInstance().isPSBT(strResult.trim())) {
699700
CahootsUtil.getInstance(BalanceActivity.this).doPSBT(strResult.trim());
701+
} else if (DojoUtil.getInstance().isValidPairingPayload(strResult.trim())) {
702+
Toast.makeText(BalanceActivity.this, "Samourai Dojo full node coming soon.", Toast.LENGTH_SHORT).show();
700703
} else {
701704
Intent intent = new Intent(BalanceActivity.this, SendActivity.class);
702705
intent.putExtra("uri", strResult.trim());
@@ -708,6 +711,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
708711
}
709712
} else if (resultCode == Activity.RESULT_CANCELED && requestCode == SCAN_QR) {
710713
} else {
714+
;
711715
}
712716

713717
}

app/src/main/java/com/samourai/wallet/network/dojo/DojoUtil.java

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.samourai.wallet.network.dojo;
22

3+
import android.util.Log;
4+
35
import org.json.JSONException;
46
import org.json.JSONObject;
57

@@ -36,13 +38,18 @@ public boolean isValidPairingPayload(String data) {
3638
try {
3739
JSONObject obj = new JSONObject(data);
3840

41+
Log.d("DojoUtil", obj.toString());
42+
3943
if(obj.has("pairing")) {
4044

4145
JSONObject pObj = obj.getJSONObject("pairing");
42-
if(pObj.has("type") && pObj.has("version") && pObj.has("apiKey") && pObj.has("url")) {
46+
Log.d("DojoUtil", pObj.toString());
47+
if(pObj.has("type") && pObj.has("version") && pObj.has("apikey") && pObj.has("url")) {
48+
Log.d("DojoUtil", "true");
4349
return true;
4450
}
4551
else {
52+
Log.d("DojoUtil", "false");
4653
return false;
4754
}
4855

@@ -83,7 +90,7 @@ public String getApiKey(String data) {
8390
try {
8491
JSONObject obj = new JSONObject(data);
8592
JSONObject pObj = obj.getJSONObject("pairing");
86-
return pObj.getString("apiKey");
93+
return pObj.getString("apikey");
8794
}
8895
catch(JSONException je) {
8996
return null;

0 commit comments

Comments
 (0)