empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

During migration, support recipient id of "-1"

Browse source 
Fixes #6843
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-08-01 18:45:13 -07:00
parent 6ff9d3cc72
commit 9a55632202
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/database/DatabaseFactory.java
View file

@ -920,6 +920,8 @@ 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] = numberMigrator.migrate(address);
} else if (recipientIds[i].equals("-1")) {
addresses[i] = "Unknown";
} else { } else {
throw new AssertionError("Unable to resolve: " + recipientIds[i]); throw new AssertionError("Unable to resolve: " + recipientIds[i]);
} }
@ -989,6 +991,8 @@ 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] = numberMigrator.migrate(address);
} else if (recipientIds[i].equals("-1")) {
addresses[i] = "Unknown";
} else { } else {
throw new AssertionError("Unable to resolve: " + recipientIds[i]); throw new AssertionError("Unable to resolve: " + recipientIds[i]);
} }