Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-04 20:54:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

show address for display with onion or localhost

Browse source
This commit is contained in:
woodser 2024-03-20 18:15:35 -04:00
parent 1647a582f5
commit 60c2c12a95
4 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
p2p/src/main/java/haveno/network/p2p/FileTransferPart.java
View file

@ -96,7 +96,7 @@ public class FileTransferPart extends NetworkEnvelope implements ExtendedDataSiz
@Override
public String toString() {
return "FileTransferPart{" +
"\n senderNodeAddress='" + senderNodeAddress.getHostNameForDisplay() + '\'' +
"\n senderNodeAddress='" + senderNodeAddress.getAddressForDisplay() + '\'' +
",\n uid='" + uid + '\'' +
",\n tradeId='" + tradeId + '\'' +
",\n traderId='" + traderId + '\'' +

20
p2p/src/main/java/haveno/network/p2p/NodeAddress.java
View file

@ -74,19 +74,27 @@ public final class NodeAddress implements PersistablePayload, NetworkPayload, Us
return hostName + ":" + port;
}
public String getHostNameWithoutPostFix() {
public String getAddressForDisplay() {
if (hostName.endsWith(".onion")) return getHostNameForDisplay();
else return shortenAddressForDisplay(getFullAddress());
}
private String getHostNameWithoutPostFix() {
return hostName.replace(".onion", "");
}
// tor v3 onions are too long to display for example in a table grid, so this convenience method
// produces a display-friendly format which includes [first 7]..[last 7] characters.
// tor v2 and localhost will be displayed in full, as they are 16 chars or fewer.
public String getHostNameForDisplay() {
String work = getHostNameWithoutPostFix();
if (work.length() > 16) {
return work.substring(0, 7) + ".." + work.substring(work.length() - 7);
private String getHostNameForDisplay() {
return shortenAddressForDisplay(getHostNameWithoutPostFix());
}
private String shortenAddressForDisplay(String address) {
if (address.length() > 16) {
return address.substring(0, 7) + ".." + address.substring(address.length() - 7);
}
return work;
return address;
}
// We use just a few chars from the full address to blur the potential receiver for sent network_messages