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

Fix InviteActivity sendSmsMessage type error.

Browse source
This commit is contained in:
Alex Hart 2019-12-04 11:20:07 -04:00 • committed by Greyson Parrelli
parent 1fc63b7597
commit 6f91f62db2
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/org/thoughtcrime/securesms/InviteActivity.java
View file

@ -22,9 +22,12 @@ import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.components.ContactFilterToolbar; import org.thoughtcrime.securesms.components.ContactFilterToolbar;
import org.thoughtcrime.securesms.components.ContactFilterToolbar.OnFilterChangedListener; import org.thoughtcrime.securesms.components.ContactFilterToolbar.OnFilterChangedListener;
import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode; import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
import org.thoughtcrime.securesms.contacts.SelectedContact;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientId;
@ -132,7 +135,7 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
new SendSmsInvitesAsyncTask(this, inviteText.getText().toString()) new SendSmsInvitesAsyncTask(this, inviteText.getText().toString())
.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
contactsFragment.getSelectedContacts() contactsFragment.getSelectedContacts()
.toArray(new String[contactsFragment.getSelectedContacts().size()])); .toArray(new SelectedContact[contactsFragment.getSelectedContacts().size()]));
} }
private void updateSmsButtonText() { private void updateSmsButtonText() {
@ -239,7 +242,7 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
} }
@SuppressLint("StaticFieldLeak") @SuppressLint("StaticFieldLeak")
private class SendSmsInvitesAsyncTask extends ProgressDialogAsyncTask<String,Void,Void> { private class SendSmsInvitesAsyncTask extends ProgressDialogAsyncTask<SelectedContact,Void,Void> {
private final String message; private final String message;
SendSmsInvitesAsyncTask(Context context, String message) { SendSmsInvitesAsyncTask(Context context, String message) {
@ -248,12 +251,13 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
} }
@Override @Override
protected Void doInBackground(String... numbers) { protected Void doInBackground(SelectedContact... contacts) {
final Context context = getContext(); final Context context = getContext();
if (context == null) return null; if (context == null) return null;
for (String number : numbers) { for (SelectedContact contact : contacts) {
Recipient recipient = Recipient.external(context, number); RecipientId recipientId = contact.getOrCreateRecipientId(context);
Recipient recipient = Recipient.resolved(recipientId);
int subscriptionId = recipient.getDefaultSubscriptionId().or(-1); int subscriptionId = recipient.getDefaultSubscriptionId().or(-1);
MessageSender.send(context, new OutgoingTextMessage(recipient, message, subscriptionId), -1L, true, null); MessageSender.send(context, new OutgoingTextMessage(recipient, message, subscriptionId), -1L, true, null);