mirror of
https://github.com/oxen-io/session-android.git
synced 2025-02-20 04:48:26 +00:00
Update contact DB on incoming messages
When we receive a Signal message from a previously unregistered user, reflect that in the contact DB. Fixes #3949 Closes #4492 // FREEBIE
This commit is contained in:
parent
fb8d6cb538
commit
b136fed6f7
@ -30,7 +30,6 @@ import android.graphics.PorterDuff.Mode;
|
|||||||
import android.graphics.drawable.ColorDrawable;
|
import android.graphics.drawable.ColorDrawable;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.provider.ContactsContract;
|
import android.provider.ContactsContract;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
@ -67,8 +66,6 @@ import org.thoughtcrime.securesms.components.AttachmentTypeSelector;
|
|||||||
import org.thoughtcrime.securesms.components.ComposeText;
|
import org.thoughtcrime.securesms.components.ComposeText;
|
||||||
import org.thoughtcrime.securesms.components.InputAwareLayout;
|
import org.thoughtcrime.securesms.components.InputAwareLayout;
|
||||||
import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout.OnKeyboardShownListener;
|
import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout.OnKeyboardShownListener;
|
||||||
import org.thoughtcrime.securesms.components.reminder.InviteReminder;
|
|
||||||
import org.thoughtcrime.securesms.components.reminder.ReminderView;
|
|
||||||
import org.thoughtcrime.securesms.components.SendButton;
|
import org.thoughtcrime.securesms.components.SendButton;
|
||||||
import org.thoughtcrime.securesms.components.camera.HidingImageButton;
|
import org.thoughtcrime.securesms.components.camera.HidingImageButton;
|
||||||
import org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer;
|
import org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer;
|
||||||
@ -77,6 +74,8 @@ import org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer.Drawer
|
|||||||
import org.thoughtcrime.securesms.components.emoji.EmojiDrawer;
|
import org.thoughtcrime.securesms.components.emoji.EmojiDrawer;
|
||||||
import org.thoughtcrime.securesms.components.emoji.EmojiDrawer.EmojiEventListener;
|
import org.thoughtcrime.securesms.components.emoji.EmojiDrawer.EmojiEventListener;
|
||||||
import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
|
import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
|
||||||
|
import org.thoughtcrime.securesms.components.reminder.InviteReminder;
|
||||||
|
import org.thoughtcrime.securesms.components.reminder.ReminderView;
|
||||||
import org.thoughtcrime.securesms.contacts.ContactAccessor;
|
import org.thoughtcrime.securesms.contacts.ContactAccessor;
|
||||||
import org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData;
|
import org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData;
|
||||||
import org.thoughtcrime.securesms.crypto.MasterCipher;
|
import org.thoughtcrime.securesms.crypto.MasterCipher;
|
||||||
@ -110,7 +109,6 @@ import org.thoughtcrime.securesms.sms.MessageSender;
|
|||||||
import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
|
import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
|
||||||
import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
|
import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
|
||||||
import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
|
import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
|
||||||
import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
|
|
||||||
import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;
|
import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;
|
||||||
import org.thoughtcrime.securesms.util.Dialogs;
|
import org.thoughtcrime.securesms.util.Dialogs;
|
||||||
import org.thoughtcrime.securesms.util.DirectoryHelper;
|
import org.thoughtcrime.securesms.util.DirectoryHelper;
|
||||||
@ -123,6 +121,7 @@ import org.thoughtcrime.securesms.util.MediaUtil;
|
|||||||
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||||
import org.thoughtcrime.securesms.util.Util;
|
import org.thoughtcrime.securesms.util.Util;
|
||||||
import org.thoughtcrime.securesms.util.ViewUtil;
|
import org.thoughtcrime.securesms.util.ViewUtil;
|
||||||
|
import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
|
||||||
import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
|
import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
|
||||||
import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
|
import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
|
||||||
import org.whispersystems.libaxolotl.InvalidMessageException;
|
import org.whispersystems.libaxolotl.InvalidMessageException;
|
||||||
@ -785,7 +784,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|||||||
if (capabilities.getTextCapability() == Capability.UNKNOWN ||
|
if (capabilities.getTextCapability() == Capability.UNKNOWN ||
|
||||||
capabilities.getVoiceCapability() == Capability.UNKNOWN)
|
capabilities.getVoiceCapability() == Capability.UNKNOWN)
|
||||||
{
|
{
|
||||||
capabilities = DirectoryHelper.refreshDirectoryFor(context, recipients);
|
capabilities = DirectoryHelper.refreshDirectoryFor(context, masterSecret, recipients,
|
||||||
|
TextSecurePreferences.getLocalNumber(context));
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Pair<>(capabilities.getTextCapability() == Capability.SUPPORTED,
|
return new Pair<>(capabilities.getTextCapability() == Capability.SUPPORTED,
|
||||||
|
@ -77,7 +77,8 @@ public class ContactsDatabase {
|
|||||||
|
|
||||||
public synchronized @NonNull List<String> setRegisteredUsers(@NonNull Account account,
|
public synchronized @NonNull List<String> setRegisteredUsers(@NonNull Account account,
|
||||||
@NonNull String localNumber,
|
@NonNull String localNumber,
|
||||||
@NonNull List<ContactTokenDetails> registeredContacts)
|
@NonNull List<ContactTokenDetails> registeredContacts,
|
||||||
|
boolean remove)
|
||||||
throws RemoteException, OperationApplicationException
|
throws RemoteException, OperationApplicationException
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -107,8 +108,10 @@ public class ContactsDatabase {
|
|||||||
ContactTokenDetails tokenDetails = registeredNumbers.get(currentContactEntry.getKey());
|
ContactTokenDetails tokenDetails = registeredNumbers.get(currentContactEntry.getKey());
|
||||||
|
|
||||||
if (tokenDetails == null) {
|
if (tokenDetails == null) {
|
||||||
Log.w(TAG, "Removing number: " + currentContactEntry.getKey());
|
if (remove) {
|
||||||
removeTextSecureRawContact(operations, account, currentContactEntry.getValue().getId());
|
Log.w(TAG, "Removing number: " + currentContactEntry.getKey());
|
||||||
|
removeTextSecureRawContact(operations, account, currentContactEntry.getValue().getId());
|
||||||
|
}
|
||||||
} else if (tokenDetails.isVoice() && !currentContactEntry.getValue().isVoiceSupported()) {
|
} else if (tokenDetails.isVoice() && !currentContactEntry.getValue().isVoiceSupported()) {
|
||||||
Log.w(TAG, "Adding voice support: " + currentContactEntry.getKey());
|
Log.w(TAG, "Adding voice support: " + currentContactEntry.getKey());
|
||||||
addContactVoiceSupport(operations, currentContactEntry.getKey(), currentContactEntry.getValue().getId());
|
addContactVoiceSupport(operations, currentContactEntry.getKey(), currentContactEntry.getValue().getId());
|
||||||
@ -298,7 +301,9 @@ public class ContactsDatabase {
|
|||||||
.build());
|
.build());
|
||||||
}
|
}
|
||||||
|
|
||||||
private @NonNull Map<String, SignalContact> getSignalRawContacts(Account account, String localNumber) {
|
private @NonNull Map<String, SignalContact> getSignalRawContacts(@NonNull Account account,
|
||||||
|
@NonNull String localNumber)
|
||||||
|
{
|
||||||
Uri currentContactsUri = RawContacts.CONTENT_URI.buildUpon()
|
Uri currentContactsUri = RawContacts.CONTENT_URI.buildUpon()
|
||||||
.appendQueryParameter(RawContacts.ACCOUNT_NAME, account.name)
|
.appendQueryParameter(RawContacts.ACCOUNT_NAME, account.name)
|
||||||
.appendQueryParameter(RawContacts.ACCOUNT_TYPE, account.type).build();
|
.appendQueryParameter(RawContacts.ACCOUNT_TYPE, account.type).build();
|
||||||
|
@ -2,11 +2,16 @@ package org.thoughtcrime.securesms.jobs;
|
|||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.PowerManager;
|
import android.os.PowerManager;
|
||||||
|
import android.support.annotation.NonNull;
|
||||||
|
import android.support.annotation.Nullable;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
|
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
||||||
import org.thoughtcrime.securesms.crypto.SecurityEvent;
|
import org.thoughtcrime.securesms.crypto.SecurityEvent;
|
||||||
|
import org.thoughtcrime.securesms.recipients.Recipients;
|
||||||
import org.thoughtcrime.securesms.service.KeyCachingService;
|
import org.thoughtcrime.securesms.service.KeyCachingService;
|
||||||
import org.thoughtcrime.securesms.util.DirectoryHelper;
|
import org.thoughtcrime.securesms.util.DirectoryHelper;
|
||||||
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||||
import org.whispersystems.jobqueue.JobParameters;
|
import org.whispersystems.jobqueue.JobParameters;
|
||||||
import org.whispersystems.jobqueue.requirements.NetworkRequirement;
|
import org.whispersystems.jobqueue.requirements.NetworkRequirement;
|
||||||
import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
|
import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
|
||||||
@ -15,11 +20,24 @@ import java.io.IOException;
|
|||||||
|
|
||||||
public class DirectoryRefreshJob extends ContextJob {
|
public class DirectoryRefreshJob extends ContextJob {
|
||||||
|
|
||||||
public DirectoryRefreshJob(Context context) {
|
@Nullable private transient Recipients recipients;
|
||||||
|
@Nullable private transient MasterSecret masterSecret;
|
||||||
|
|
||||||
|
public DirectoryRefreshJob(@NonNull Context context) {
|
||||||
|
this(context, null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DirectoryRefreshJob(@NonNull Context context,
|
||||||
|
@Nullable MasterSecret masterSecret,
|
||||||
|
@Nullable Recipients recipients)
|
||||||
|
{
|
||||||
super(context, JobParameters.newBuilder()
|
super(context, JobParameters.newBuilder()
|
||||||
.withGroupId(DirectoryRefreshJob.class.getSimpleName())
|
.withGroupId(DirectoryRefreshJob.class.getSimpleName())
|
||||||
.withRequirement(new NetworkRequirement(context))
|
.withRequirement(new NetworkRequirement(context))
|
||||||
.create());
|
.create());
|
||||||
|
|
||||||
|
this.recipients = recipients;
|
||||||
|
this.masterSecret = masterSecret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -33,7 +51,11 @@ public class DirectoryRefreshJob extends ContextJob {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
wakeLock.acquire();
|
wakeLock.acquire();
|
||||||
DirectoryHelper.refreshDirectory(context, KeyCachingService.getMasterSecret(context));
|
if (recipients == null) {
|
||||||
|
DirectoryHelper.refreshDirectory(context, KeyCachingService.getMasterSecret(context));
|
||||||
|
} else {
|
||||||
|
DirectoryHelper.refreshDirectoryFor(context, masterSecret, recipients, TextSecurePreferences.getLocalNumber(context));
|
||||||
|
}
|
||||||
SecurityEvent.broadcastSecurityUpdateEvent(context);
|
SecurityEvent.broadcastSecurityUpdateEvent(context);
|
||||||
} finally {
|
} finally {
|
||||||
if (wakeLock.isHeld()) wakeLock.release();
|
if (wakeLock.isHeld()) wakeLock.release();
|
||||||
|
@ -9,6 +9,7 @@ import org.thoughtcrime.securesms.database.NotInDirectoryException;
|
|||||||
import org.thoughtcrime.securesms.database.TextSecureDirectory;
|
import org.thoughtcrime.securesms.database.TextSecureDirectory;
|
||||||
import org.thoughtcrime.securesms.recipients.RecipientFactory;
|
import org.thoughtcrime.securesms.recipients.RecipientFactory;
|
||||||
import org.thoughtcrime.securesms.recipients.Recipients;
|
import org.thoughtcrime.securesms.recipients.Recipients;
|
||||||
|
import org.thoughtcrime.securesms.service.KeyCachingService;
|
||||||
import org.whispersystems.jobqueue.JobManager;
|
import org.whispersystems.jobqueue.JobManager;
|
||||||
import org.whispersystems.jobqueue.JobParameters;
|
import org.whispersystems.jobqueue.JobParameters;
|
||||||
import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
|
import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
|
||||||
@ -29,6 +30,9 @@ public abstract class PushReceivedJob extends ContextJob {
|
|||||||
contactTokenDetails.setNumber(envelope.getSource());
|
contactTokenDetails.setNumber(envelope.getSource());
|
||||||
|
|
||||||
directory.setNumber(contactTokenDetails, true);
|
directory.setNumber(contactTokenDetails, true);
|
||||||
|
|
||||||
|
Recipients recipients = RecipientFactory.getRecipientsFromString(context, envelope.getSource(), false);
|
||||||
|
ApplicationContext.getInstance(context).getJobManager().add(new DirectoryRefreshJob(context, KeyCachingService.getMasterSecret(context), recipients));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (envelope.isReceipt()) {
|
if (envelope.isReceipt()) {
|
||||||
|
@ -18,14 +18,11 @@ import org.thoughtcrime.securesms.crypto.MasterSecret;
|
|||||||
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
||||||
import org.thoughtcrime.securesms.database.NotInDirectoryException;
|
import org.thoughtcrime.securesms.database.NotInDirectoryException;
|
||||||
import org.thoughtcrime.securesms.database.TextSecureDirectory;
|
import org.thoughtcrime.securesms.database.TextSecureDirectory;
|
||||||
import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
|
|
||||||
import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
|
import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
|
||||||
import org.thoughtcrime.securesms.notifications.MessageNotifier;
|
import org.thoughtcrime.securesms.notifications.MessageNotifier;
|
||||||
import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
|
import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
|
||||||
import org.thoughtcrime.securesms.recipients.Recipients;
|
import org.thoughtcrime.securesms.recipients.Recipients;
|
||||||
import org.thoughtcrime.securesms.sms.IncomingGroupMessage;
|
|
||||||
import org.thoughtcrime.securesms.sms.IncomingJoinedMessage;
|
import org.thoughtcrime.securesms.sms.IncomingJoinedMessage;
|
||||||
import org.thoughtcrime.securesms.sms.MessageSender;
|
|
||||||
import org.thoughtcrime.securesms.util.DirectoryHelper.UserCapabilities.Capability;
|
import org.thoughtcrime.securesms.util.DirectoryHelper.UserCapabilities.Capability;
|
||||||
import org.whispersystems.libaxolotl.util.guava.Optional;
|
import org.whispersystems.libaxolotl.util.guava.Optional;
|
||||||
import org.whispersystems.textsecure.api.TextSecureAccountManager;
|
import org.whispersystems.textsecure.api.TextSecureAccountManager;
|
||||||
@ -80,11 +77,7 @@ public class DirectoryHelper {
|
|||||||
.add(new MultiDeviceContactUpdateJob(context));
|
.add(new MultiDeviceContactUpdateJob(context));
|
||||||
}
|
}
|
||||||
|
|
||||||
for (String newUser : newUsers) {
|
notifyNewUsers(context, masterSecret, newUsers);
|
||||||
IncomingJoinedMessage message = new IncomingJoinedMessage(newUser);
|
|
||||||
Pair<Long, Long> smsAndThreadId = DatabaseFactory.getSmsDatabase(context).insertMessageInbox(message);
|
|
||||||
MessageNotifier.updateNotification(context, masterSecret, smsAndThreadId.second);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static @NonNull List<String> refreshDirectory(@NonNull Context context,
|
public static @NonNull List<String> refreshDirectory(@NonNull Context context,
|
||||||
@ -93,7 +86,6 @@ public class DirectoryHelper {
|
|||||||
throws IOException
|
throws IOException
|
||||||
{
|
{
|
||||||
TextSecureDirectory directory = TextSecureDirectory.getInstance(context);
|
TextSecureDirectory directory = TextSecureDirectory.getInstance(context);
|
||||||
Optional<Account> account = getOrCreateAccount(context);
|
|
||||||
Set<String> eligibleContactNumbers = directory.getPushEligibleContactNumbers(localNumber);
|
Set<String> eligibleContactNumbers = directory.getPushEligibleContactNumbers(localNumber);
|
||||||
List<ContactTokenDetails> activeTokens = accountManager.getContacts(eligibleContactNumbers);
|
List<ContactTokenDetails> activeTokens = accountManager.getContacts(eligibleContactNumbers);
|
||||||
|
|
||||||
@ -104,33 +96,35 @@ public class DirectoryHelper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
directory.setNumbers(activeTokens, eligibleContactNumbers);
|
directory.setNumbers(activeTokens, eligibleContactNumbers);
|
||||||
|
return updateContactsDatabase(context, localNumber, activeTokens, true);
|
||||||
if (account.isPresent()) {
|
|
||||||
try {
|
|
||||||
return DatabaseFactory.getContactsDatabase(context)
|
|
||||||
.setRegisteredUsers(account.get(), localNumber, activeTokens);
|
|
||||||
} catch (RemoteException | OperationApplicationException e) {
|
|
||||||
Log.w(TAG, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return new LinkedList<>();
|
return new LinkedList<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static UserCapabilities refreshDirectoryFor(Context context, Recipients recipients)
|
public static UserCapabilities refreshDirectoryFor(@NonNull Context context,
|
||||||
|
@Nullable MasterSecret masterSecret,
|
||||||
|
@NonNull Recipients recipients,
|
||||||
|
@NonNull String localNumber)
|
||||||
throws IOException
|
throws IOException
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
TextSecureDirectory directory = TextSecureDirectory.getInstance(context);
|
TextSecureDirectory directory = TextSecureDirectory.getInstance(context);
|
||||||
TextSecureAccountManager accountManager = TextSecureCommunicationFactory.createManager(context);
|
TextSecureAccountManager accountManager = TextSecureCommunicationFactory.createManager(context);
|
||||||
String number = Util.canonicalizeNumber(context, recipients.getPrimaryRecipient().getNumber());
|
String number = Util.canonicalizeNumber(context, recipients.getPrimaryRecipient().getNumber());
|
||||||
|
Optional<ContactTokenDetails> details = accountManager.getContact(number);
|
||||||
Optional<ContactTokenDetails> details = accountManager.getContact(number);
|
|
||||||
|
|
||||||
if (details.isPresent()) {
|
if (details.isPresent()) {
|
||||||
directory.setNumber(details.get(), true);
|
directory.setNumber(details.get(), true);
|
||||||
ApplicationContext.getInstance(context).getJobManager().add(new DirectoryRefreshJob(context));
|
|
||||||
|
List<String> newUsers = updateContactsDatabase(context, localNumber, details.get());
|
||||||
|
|
||||||
|
if (!newUsers.isEmpty() && TextSecurePreferences.isMultiDevice(context)) {
|
||||||
|
ApplicationContext.getInstance(context).getJobManager().add(new MultiDeviceContactUpdateJob(context));
|
||||||
|
}
|
||||||
|
|
||||||
|
notifyNewUsers(context, masterSecret, newUsers);
|
||||||
|
|
||||||
return new UserCapabilities(Capability.SUPPORTED, details.get().isVoice() ? Capability.SUPPORTED : Capability.UNSUPPORTED);
|
return new UserCapabilities(Capability.SUPPORTED, details.get().isVoice() ? Capability.SUPPORTED : Capability.UNSUPPORTED);
|
||||||
} else {
|
} else {
|
||||||
ContactTokenDetails absent = new ContactTokenDetails();
|
ContactTokenDetails absent = new ContactTokenDetails();
|
||||||
@ -185,6 +179,45 @@ public class DirectoryHelper {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static @NonNull List<String> updateContactsDatabase(@NonNull Context context,
|
||||||
|
@NonNull String localNumber,
|
||||||
|
@NonNull final ContactTokenDetails activeToken)
|
||||||
|
{
|
||||||
|
return updateContactsDatabase(context, localNumber,
|
||||||
|
new LinkedList<ContactTokenDetails>() {{add(activeToken);}},
|
||||||
|
false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static @NonNull List<String> updateContactsDatabase(@NonNull Context context,
|
||||||
|
@NonNull String localNumber,
|
||||||
|
@NonNull List<ContactTokenDetails> activeTokens,
|
||||||
|
boolean removeMissing)
|
||||||
|
{
|
||||||
|
Optional<Account> account = getOrCreateAccount(context);
|
||||||
|
|
||||||
|
if (account.isPresent()) {
|
||||||
|
try {
|
||||||
|
return DatabaseFactory.getContactsDatabase(context)
|
||||||
|
.setRegisteredUsers(account.get(), localNumber, activeTokens, removeMissing);
|
||||||
|
} catch (RemoteException | OperationApplicationException e) {
|
||||||
|
Log.w(TAG, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return new LinkedList<>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void notifyNewUsers(@NonNull Context context,
|
||||||
|
@Nullable MasterSecret masterSecret,
|
||||||
|
@NonNull List<String> newUsers)
|
||||||
|
{
|
||||||
|
for (String newUser : newUsers) {
|
||||||
|
IncomingJoinedMessage message = new IncomingJoinedMessage(newUser);
|
||||||
|
Pair<Long, Long> smsAndThreadId = DatabaseFactory.getSmsDatabase(context).insertMessageInbox(message);
|
||||||
|
MessageNotifier.updateNotification(context, masterSecret, smsAndThreadId.second);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static Optional<Account> getOrCreateAccount(Context context) {
|
private static Optional<Account> getOrCreateAccount(Context context) {
|
||||||
AccountManager accountManager = AccountManager.get(context);
|
AccountManager accountManager = AccountManager.get(context);
|
||||||
Account[] accounts = accountManager.getAccountsByType("org.thoughtcrime.securesms");
|
Account[] accounts = accountManager.getAccountsByType("org.thoughtcrime.securesms");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user