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
deBeauvoir
samourai-wallet-android
Commits
e5924107
Commit
e5924107
authored
Jan 03, 2022
by
T Dev. D
😎
Browse files
Merge branch 'whirlpool' of
https://code.samourai.io/wallet/samourai-wallet-android
into whirlpool
parents
1766e660
3875859d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
1 deletion
+20
-1
app/build.gradle
app/build.gradle
+1
-1
app/src/main/java/com/samourai/wallet/settings/SettingsDetailsFragment.kt
...a/com/samourai/wallet/settings/SettingsDetailsFragment.kt
+5
-0
app/src/main/java/com/samourai/wallet/util/LogUtil.java
app/src/main/java/com/samourai/wallet/util/LogUtil.java
+14
-0
No files found.
app/build.gradle
View file @
e5924107
...
...
@@ -134,7 +134,7 @@ dependencies {
implementation
'org.hibernate:hibernate-validator:5.4.3.Final'
implementation
'com.google.code.gson:gson:2.8.6'
implementation
'com.github.yuriy-budiyev:code-scanner:2.1.0'
implementation
(
'io.samourai.code.whirlpool:whirlpool-client:0.23.37'
)
{
implementation
(
'io.samourai.code.whirlpool:whirlpool-client:0.23.37
.1
'
)
{
exclude
group:
'org.hibernate'
,
module:
'hibernate-validator'
exclude
group:
'com.google.code.findbugs'
,
module:
'jsr305'
exclude
group:
'com.google.protobuf'
,
module:
'protobuf-java'
...
...
app/src/main/java/com/samourai/wallet/settings/SettingsDetailsFragment.kt
View file @
e5924107
...
...
@@ -10,6 +10,7 @@ import android.os.Looper
import
android.text.Editable
import
android.text.InputType
import
android.text.TextWatcher
import
android.util.Log
import
android.view.Gravity
import
android.view.View
import
android.view.WindowManager
...
...
@@ -693,6 +694,8 @@ class SettingsDetailsFragment(private val key: String?) : PreferenceFragmentComp
.
setCancelable
(
false
)
.
setPositiveButton
(
R
.
string
.
ok
)
{
dialog
,
whichButton
->
dialog
.
dismiss
()
}
.
show
()
LogUtil
.
debugLarge
(
"Settings"
,
"# INDEXES DEBUG #\n"
+
builder
.
toString
());
}
private
fun
doAddressCalc
()
{
...
...
@@ -823,6 +826,8 @@ class SettingsDetailsFragment(private val key: String?) : PreferenceFragmentComp
.
setCancelable
(
false
)
.
setPositiveButton
(
R
.
string
.
ok
)
{
dialog
,
whichButton
->
dialog
.
dismiss
()
}
.
show
()
LogUtil
.
debugLarge
(
"Settings"
,
"# WHIRLPOOL DEBUG #\n"
+
builder
.
toString
());
}
private
fun
doBroadcastHex
()
{
...
...
app/src/main/java/com/samourai/wallet/util/LogUtil.java
View file @
e5924107
...
...
@@ -62,4 +62,18 @@ public class LogUtil {
Log
.
d
(
"LogUtil"
,
"Debug logs enabled"
);
}
/**
* Debug large strings to avoid log truncation.
* @param tag
* @param content
*/
public
static
void
debugLarge
(
String
tag
,
String
content
)
{
if
(
content
.
length
()
>
4000
)
{
Log
.
d
(
tag
,
content
.
substring
(
0
,
4000
));
debugLarge
(
tag
,
content
.
substring
(
4000
));
}
else
{
Log
.
d
(
tag
,
content
);
}
}
}
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