mirror of
https://github.com/oxen-io/session-android.git
synced 2025-10-24 11:19:19 +00:00
Escape addresses in thread, recipient pref, and group databases
Fixes #6847 // FREEBIE
This commit is contained in:
21
src/org/thoughtcrime/securesms/util/DelimiterUtil.java
Normal file
21
src/org/thoughtcrime/securesms/util/DelimiterUtil.java
Normal file
@@ -0,0 +1,21 @@
|
||||
package org.thoughtcrime.securesms.util;
|
||||
|
||||
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class DelimiterUtil {
|
||||
|
||||
public static String escape(String value, char delimiter) {
|
||||
return value.replace("" + delimiter, "\\" + delimiter);
|
||||
}
|
||||
|
||||
public static String unescape(String value, char delimiter) {
|
||||
return value.replace("\\" + delimiter, "" + delimiter);
|
||||
}
|
||||
|
||||
public static String[] split(String value, char delimiter) {
|
||||
String regex = "(?<!\\\\)" + Pattern.quote(delimiter + "");
|
||||
return value.split(regex);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -72,20 +72,6 @@ public class Util {
|
||||
|
||||
public static Handler handler = new Handler(Looper.getMainLooper());
|
||||
|
||||
public static String join(List<Address> list, String delimiter) {
|
||||
return join(list.toArray(new Address[0]), delimiter);
|
||||
}
|
||||
|
||||
public static String join(Address[] list, String delimiter) {
|
||||
List<String> stringList = new LinkedList<>();
|
||||
|
||||
for (Address address : list) {
|
||||
stringList.add(address.serialize());
|
||||
}
|
||||
|
||||
return join(stringList, delimiter);
|
||||
}
|
||||
|
||||
public static String join(String[] list, String delimiter) {
|
||||
return join(Arrays.asList(list), delimiter);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user