TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-05-21 19:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Escape addresess in thread and recipient pref migrations

Browse Source 
For clients that have not yet migrated

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-08-02 11:08:38 -07:00
parent aacf50316d
commit 1e934f6146
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/thoughtcrime/securesms/database/DatabaseFactory.java
View File

@ -44,6 +44,7 @@ import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch; import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.DelimiterUtil;
import org.thoughtcrime.securesms.util.JsonUtils; import org.thoughtcrime.securesms.util.JsonUtils;
import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
@ -55,6 +56,7 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -919,7 +921,7 @@ public class DatabaseFactory {
if (resolved != null && resolved.moveToFirst()) { if (resolved != null && resolved.moveToFirst()) {
String address = resolved.getString(0); String address = resolved.getString(0);
addresses[i] = numberMigrator.migrate(address); addresses[i] = DelimiterUtil.escape(numberMigrator.migrate(address), ' ');
} else if (recipientIds[i].equals("-1")) { } else if (recipientIds[i].equals("-1")) {
addresses[i] = "Unknown"; addresses[i] = "Unknown";
} else { } else {
@ -929,6 +931,8 @@ public class DatabaseFactory {
if (resolved != null) resolved.close(); if (resolved != null) resolved.close();
} }
Arrays.sort(addresses);
ContentValues values = new ContentValues(1); ContentValues values = new ContentValues(1);
values.put("recipient_ids", Util.join(addresses, " ")); values.put("recipient_ids", Util.join(addresses, " "));
db.update("thread", values, "_id = ?", new String[] {String.valueOf(threadId)}); db.update("thread", values, "_id = ?", new String[] {String.valueOf(threadId)});
@ -990,7 +994,7 @@ public class DatabaseFactory {
if (resolved != null && resolved.moveToFirst()) { if (resolved != null && resolved.moveToFirst()) {
String address = resolved.getString(0); String address = resolved.getString(0);
addresses[i] = numberMigrator.migrate(address); addresses[i] = DelimiterUtil.escape(numberMigrator.migrate(address), ' ');
} else if (recipientIds[i].equals("-1")) { } else if (recipientIds[i].equals("-1")) {
addresses[i] = "Unknown"; addresses[i] = "Unknown";
} else { } else {
@ -1000,6 +1004,8 @@ public class DatabaseFactory {
if (resolved != null) resolved.close(); if (resolved != null) resolved.close();
} }
Arrays.sort(addresses);
ContentValues values = new ContentValues(1); ContentValues values = new ContentValues(1);
values.put("recipient_ids", Util.join(addresses, " ")); values.put("recipient_ids", Util.join(addresses, " "));