mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-16 04:39:54 +01:00
Merge branch '1885-malformed-links' into 'master'
Do not produce malformed links for adding contacts when on other locales such as Turkish Closes #1885 See merge request briar/briar!1335
This commit is contained in:
@@ -11,6 +11,7 @@ import org.briarproject.bramble.api.system.Clock;
|
|||||||
import org.briarproject.bramble.util.Base32;
|
import org.briarproject.bramble.util.Base32;
|
||||||
|
|
||||||
import java.security.GeneralSecurityException;
|
import java.security.GeneralSecurityException;
|
||||||
|
import java.util.Locale;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
@@ -52,7 +53,7 @@ class PendingContactFactoryImpl implements PendingContactFactory {
|
|||||||
byte[] raw = new byte[RAW_LINK_BYTES];
|
byte[] raw = new byte[RAW_LINK_BYTES];
|
||||||
raw[0] = FORMAT_VERSION;
|
raw[0] = FORMAT_VERSION;
|
||||||
arraycopy(encoded, 0, raw, 1, encoded.length);
|
arraycopy(encoded, 0, raw, 1, encoded.length);
|
||||||
return "briar://" + Base32.encode(raw).toLowerCase();
|
return "briar://" + Base32.encode(raw).toLowerCase(Locale.US);
|
||||||
}
|
}
|
||||||
|
|
||||||
private PublicKey parseHandshakeLink(String link) throws FormatException {
|
private PublicKey parseHandshakeLink(String link) throws FormatException {
|
||||||
|
|||||||
Reference in New Issue
Block a user