use canonical number when sending blocked updates

MultiDeviceBlockedUpdates now send e164 numbers instead
 of localized ones.

Fixes #6093
Closes #6109
// FREEBIE

src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java

@@ -10,13 +10,16 @@ import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.dependencies.SignalCommunicationModule.SignalMessageSenderFactory;
 import org.thoughtcrime.securesms.jobs.requirements.MasterSecretRequirement;
 import org.thoughtcrime.securesms.recipients.Recipients;
+import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.jobqueue.requirements.NetworkRequirement;
+import org.whispersystems.libsignal.logging.Log;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
+import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -54,7 +57,11 @@ public class MultiDeviceBlockedUpdateJob extends MasterSecretJob implements Inje
 
     while ((recipients = reader.getNext()) != null) {
       if (recipients.isSingleRecipient()) {
-        blocked.add(recipients.getPrimaryRecipient().getNumber());
+        try {
+          blocked.add(Util.canonicalizeNumber(context, recipients.getPrimaryRecipient().getNumber()));
+        } catch (InvalidNumberException e) {
+          Log.w(TAG, e);
+        }
       }
     }