Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Wallet
sentinel-android
Commits
c3863b84
Verified
Commit
c3863b84
authored
Apr 07, 2020
by
Sarath
⚔
Browse files
Dojo API url fix
parent
3e4b5ab9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
app/src/main/java/com/samourai/sentinel/SamouraiSentinel.java
...src/main/java/com/samourai/sentinel/SamouraiSentinel.java
+5
-1
app/src/main/java/com/samourai/sentinel/network/dojo/DojoUtil.java
...ain/java/com/samourai/sentinel/network/dojo/DojoUtil.java
+1
-2
No files found.
app/src/main/java/com/samourai/sentinel/SamouraiSentinel.java
View file @
c3863b84
...
...
@@ -272,7 +272,11 @@ public class SamouraiSentinel {
obj
.
put
(
"receives"
,
ReceiveLookAtUtil
.
getInstance
().
toJSON
());
if
(
DojoUtil
.
getInstance
(
context
).
getDojoParams
()
!=
null
){
obj
.
put
(
"dojo"
,
DojoUtil
.
getInstance
(
context
).
toJSON
().
toString
());
try
{
obj
.
put
(
"dojo"
,
DojoUtil
.
getInstance
(
context
).
toJSON
().
toString
());
}
catch
(
JSONException
e
)
{
e
.
printStackTrace
();
}
}
...
...
app/src/main/java/com/samourai/sentinel/network/dojo/DojoUtil.java
View file @
c3863b84
...
...
@@ -72,7 +72,6 @@ public class DojoUtil {
String
url
=
getUrl
(
dojoParams
);
if
(
url
.
charAt
(
url
.
length
()
-
1
)
!=
'/'
)
{
url
=
url
+
"/"
;
JSONObject
obj
=
new
JSONObject
(
dojoParams
);
if
(
obj
.
has
(
"pairing"
)
&&
obj
.
getJSONObject
(
"pairing"
).
has
(
"url"
))
{
obj
.
getJSONObject
(
"pairing"
).
put
(
"url"
,
url
);
...
...
@@ -80,7 +79,7 @@ public class DojoUtil {
}
}
if
(
SamouraiSentinel
.
getInstance
().
isTestNet
())
{
WebUtil
.
SAMOURAI_API2_TOR
=
url
;
WebUtil
.
SAMOURAI_API2_
TESTNET_
TOR
=
url
;
}
else
{
WebUtil
.
SAMOURAI_API2_TOR
=
url
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment