recipients) {
@@ -2230,9 +2267,7 @@ public class RecipientDatabase extends Database {
* query such that this will only return true if a row was *actually* updated.
*/
private boolean update(@NonNull RecipientId id, @NonNull ContentValues contentValues) {
- String selection = ID + " = ?";
- String[] args = new String[]{id.serialize()};
- SqlUtil.UpdateQuery updateQuery = SqlUtil.buildTrueUpdateQuery(selection, args, contentValues);
+ SqlUtil.Query updateQuery = SqlUtil.buildTrueUpdateQuery(ID_WHERE, SqlUtil.buildArgs(id), contentValues);
return update(updateQuery, contentValues);
}
@@ -2242,7 +2277,7 @@ public class RecipientDatabase extends Database {
*
* This will only return true if a row was *actually* updated with respect to the where clause of the {@param updateQuery}.
*/
- private boolean update(@NonNull SqlUtil.UpdateQuery updateQuery, @NonNull ContentValues contentValues) {
+ private boolean update(@NonNull SqlUtil.Query updateQuery, @NonNull ContentValues contentValues) {
SQLiteDatabase database = databaseHelper.getWritableDatabase();
return database.update(TABLE_NAME, contentValues, updateQuery.getWhere(), updateQuery.getWhereArgs()) > 0;
@@ -2529,7 +2564,6 @@ public class RecipientDatabase extends Database {
private final String e164;
private final String email;
private final GroupId groupId;
- private final GroupMasterKey groupMasterKey;
private final GroupType groupType;
private final boolean blocked;
private final long muteUntil;
@@ -2559,10 +2593,8 @@ public class RecipientDatabase extends Database {
private final Recipient.Capability groupsV2Capability;
private final InsightsBannerTier insightsBannerTier;
private final byte[] storageId;
- private final byte[] identityKey;
- private final IdentityDatabase.VerifiedStatus identityStatus;
private final MentionSetting mentionSetting;
- private final byte[] storageProto;
+ private final SyncExtras syncExtras;
RecipientSettings(@NonNull RecipientId id,
@Nullable UUID uuid,
@@ -2570,7 +2602,6 @@ public class RecipientDatabase extends Database {
@Nullable String e164,
@Nullable String email,
@Nullable GroupId groupId,
- @Nullable GroupMasterKey groupMasterKey,
@NonNull GroupType groupType,
boolean blocked,
long muteUntil,
@@ -2600,10 +2631,8 @@ public class RecipientDatabase extends Database {
Recipient.Capability groupsV2Capability,
@NonNull InsightsBannerTier insightsBannerTier,
@Nullable byte[] storageId,
- @Nullable byte[] identityKey,
- @NonNull IdentityDatabase.VerifiedStatus identityStatus,
@NonNull MentionSetting mentionSetting,
- @Nullable byte[] storageProto)
+ @NonNull SyncExtras syncExtras)
{
this.id = id;
this.uuid = uuid;
@@ -2611,7 +2640,6 @@ public class RecipientDatabase extends Database {
this.e164 = e164;
this.email = email;
this.groupId = groupId;
- this.groupMasterKey = groupMasterKey;
this.groupType = groupType;
this.blocked = blocked;
this.muteUntil = muteUntil;
@@ -2641,10 +2669,8 @@ public class RecipientDatabase extends Database {
this.groupsV2Capability = groupsV2Capability;
this.insightsBannerTier = insightsBannerTier;
this.storageId = storageId;
- this.identityKey = identityKey;
- this.identityStatus = identityStatus;
this.mentionSetting = mentionSetting;
- this.storageProto = storageProto;
+ this.syncExtras = syncExtras;
}
public RecipientId getId() {
@@ -2671,13 +2697,6 @@ public class RecipientDatabase extends Database {
return groupId;
}
- /**
- * Only read populated for sync.
- */
- public @Nullable GroupMasterKey getGroupMasterKey() {
- return groupMasterKey;
- }
-
public @NonNull GroupType getGroupType() {
return groupType;
}
@@ -2794,20 +2813,64 @@ public class RecipientDatabase extends Database {
return storageId;
}
- public @Nullable byte[] getIdentityKey() {
- return identityKey;
- }
-
- public @NonNull IdentityDatabase.VerifiedStatus getIdentityStatus() {
- return identityStatus;
- }
-
public @NonNull MentionSetting getMentionSetting() {
return mentionSetting;
}
- public @Nullable byte[] getStorageProto() {
- return storageProto;
+ public @NonNull SyncExtras getSyncExtras() {
+ return syncExtras;
+ }
+
+ /**
+ * A bundle of data that's only necessary when syncing to storage service, not for a
+ * {@link Recipient}.
+ */
+ public static class SyncExtras {
+ private final byte[] storageProto;
+ private final GroupMasterKey groupMasterKey;
+ private final byte[] identityKey;
+ private final VerifiedStatus identityStatus;
+ private final boolean archived;
+ private final boolean forcedUnread;
+
+ public SyncExtras(@Nullable byte[] storageProto,
+ @Nullable GroupMasterKey groupMasterKey,
+ @Nullable byte[] identityKey,
+ @NonNull VerifiedStatus identityStatus,
+ boolean archived,
+ boolean forcedUnread)
+ {
+ this.storageProto = storageProto;
+ this.groupMasterKey = groupMasterKey;
+ this.identityKey = identityKey;
+ this.identityStatus = identityStatus;
+ this.archived = archived;
+ this.forcedUnread = forcedUnread;
+ }
+
+ public @Nullable byte[] getStorageProto() {
+ return storageProto;
+ }
+
+ public @Nullable GroupMasterKey getGroupMasterKey() {
+ return groupMasterKey;
+ }
+
+ public boolean isArchived() {
+ return archived;
+ }
+
+ public @Nullable byte[] getIdentityKey() {
+ return identityKey;
+ }
+
+ public @NonNull VerifiedStatus getIdentityStatus() {
+ return identityStatus;
+ }
+
+ public boolean isForcedUnread() {
+ return forcedUnread;
+ }
}
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index d19c3f810..911c97de0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -32,8 +32,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import net.sqlcipher.database.SQLiteDatabase;
import org.jsoup.helper.StringUtil;
-import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.storageservice.protos.groups.local.DecryptedMember;
import org.thoughtcrime.securesms.database.MessageDatabase.MarkedMessageInfo;
import org.thoughtcrime.securesms.database.RecipientDatabase.RecipientSettings;
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
@@ -56,11 +54,15 @@ import org.thoughtcrime.securesms.util.SqlUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
-import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
+import org.whispersystems.signalservice.api.storage.SignalContactRecord;
+import org.whispersystems.signalservice.api.storage.SignalGroupV1Record;
+import org.whispersystems.signalservice.api.storage.SignalGroupV2Record;
+import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
import java.io.Closeable;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -70,7 +72,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import java.util.UUID;
public class ThreadDatabase extends Database {
@@ -102,7 +103,7 @@ public class ThreadDatabase extends Database {
public static final String LAST_SEEN = "last_seen";
public static final String HAS_SENT = "has_sent";
private static final String LAST_SCROLLED = "last_scrolled";
- private static final String PINNED = "pinned";
+ static final String PINNED = "pinned";
public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ID + " INTEGER PRIMARY KEY, " +
DATE + " INTEGER DEFAULT 0, " +
@@ -144,7 +145,7 @@ public class ThreadDatabase extends Database {
.toList();
private static final List COMBINED_THREAD_RECIPIENT_GROUP_PROJECTION = Stream.concat(Stream.concat(Stream.of(TYPED_THREAD_PROJECTION),
- Stream.of(RecipientDatabase.TYPED_RECIPIENT_PROJECTION)),
+ Stream.of(RecipientDatabase.TYPED_RECIPIENT_PROJECTION_NO_ID)),
Stream.of(GroupDatabase.TYPED_GROUP_PROJECTION))
.toList();
@@ -405,6 +406,7 @@ public class ThreadDatabase extends Database {
List smsRecords = new LinkedList<>();
List mmsRecords = new LinkedList<>();
+ boolean needsSync = false;
db.beginTransaction();
@@ -417,6 +419,8 @@ public class ThreadDatabase extends Database {
}
for (long threadId : threadIds) {
+ ThreadRecord previous = getThreadRecord(threadId);
+
smsRecords.addAll(DatabaseFactory.getSmsDatabase(context).setMessagesReadSince(threadId, sinceTimestamp));
mmsRecords.addAll(DatabaseFactory.getMmsDatabase(context).setMessagesReadSince(threadId, sinceTimestamp));
@@ -427,7 +431,12 @@ public class ThreadDatabase extends Database {
contentValues.put(UNREAD_COUNT, unreadCount);
- db.update(TABLE_NAME, contentValues, ID_WHERE, new String[]{threadId + ""});
+ db.update(TABLE_NAME, contentValues, ID_WHERE, SqlUtil.buildArgs(threadId));
+
+ if (previous != null && previous.isForcedUnread()) {
+ DatabaseFactory.getRecipientDatabase(context).markNeedsSync(previous.getRecipient().getId());
+ needsSync = true;
+ }
}
db.setTransactionSuccessful();
@@ -437,6 +446,11 @@ public class ThreadDatabase extends Database {
notifyConversationListeners(new HashSet<>(threadIds));
notifyConversationListListeners();
+
+ if (needsSync) {
+ StorageSyncHelper.scheduleSyncForDataChange();
+ }
+
return Util.concatenatedList(smsRecords, mmsRecords);
}
@@ -445,19 +459,22 @@ public class ThreadDatabase extends Database {
db.beginTransaction();
try {
- ContentValues contentValues = new ContentValues();
+ List recipientIds = getRecipientIdsForThreadIds(threadIds);
+ SqlUtil.Query query = SqlUtil.buildCollectionQuery(ID, threadIds);
+ ContentValues contentValues = new ContentValues();
+
contentValues.put(READ, ReadStatus.FORCED_UNREAD.serialize());
- for (long threadId : threadIds) {
- db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] { String.valueOf(threadId) });
- }
+ db.update(TABLE_NAME, contentValues, query.getWhere(), query.getWhereArgs());
+ DatabaseFactory.getRecipientDatabase(context).markNeedsSync(recipientIds);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
- }
- notifyConversationListListeners();
+ StorageSyncHelper.scheduleSyncForDataChange();
+ notifyConversationListListeners();
+ }
}
@@ -949,6 +966,20 @@ public class ThreadDatabase extends Database {
return Recipient.resolved(id);
}
+ public @NonNull List getRecipientIdsForThreadIds(Collection threadIds) {
+ SQLiteDatabase db = databaseHelper.getReadableDatabase();
+ SqlUtil.Query query = SqlUtil.buildCollectionQuery(ID, threadIds);
+ List ids = new ArrayList<>(threadIds.size());
+
+ try (Cursor cursor = db.query(TABLE_NAME, new String[] { RECIPIENT_ID }, query.getWhere(), query.getWhereArgs(), null, null, null)) {
+ while (cursor != null && cursor.moveToNext()) {
+ ids.add(RecipientId.from(CursorUtil.requireLong(cursor, RECIPIENT_ID)));
+ }
+ }
+
+ return ids;
+ }
+
public boolean hasThread(@NonNull RecipientId recipientId) {
return getThreadIdIfExistsFor(recipientId) > -1;
}
@@ -964,16 +995,56 @@ public class ThreadDatabase extends Database {
}
void updateReadState(long threadId) {
- int unreadCount = DatabaseFactory.getMmsSmsDatabase(context).getUnreadCount(threadId);
+ ThreadRecord previous = getThreadRecord(threadId);
+ int unreadCount = DatabaseFactory.getMmsSmsDatabase(context).getUnreadCount(threadId);
ContentValues contentValues = new ContentValues();
- contentValues.put(READ, unreadCount == 0);
+ contentValues.put(READ, unreadCount == 0 ? ReadStatus.READ.serialize() : ReadStatus.UNREAD.serialize());
contentValues.put(UNREAD_COUNT, unreadCount);
- databaseHelper.getWritableDatabase().update(TABLE_NAME, contentValues,ID_WHERE,
- new String[] {String.valueOf(threadId)});
+ databaseHelper.getWritableDatabase().update(TABLE_NAME, contentValues, ID_WHERE, SqlUtil.buildArgs(threadId));
notifyConversationListListeners();
+
+ if (previous != null && previous.isForcedUnread()) {
+ DatabaseFactory.getRecipientDatabase(context).markNeedsSync(previous.getRecipient().getId());
+ StorageSyncHelper.scheduleSyncForDataChange();
+ }
+ }
+
+ public void applyStorageSyncUpdate(@NonNull RecipientId recipientId, @NonNull SignalContactRecord record) {
+ applyStorageSyncUpdate(recipientId, record.isArchived(), record.isForcedUnread());
+ }
+
+ public void applyStorageSyncUpdate(@NonNull RecipientId recipientId, @NonNull SignalGroupV1Record record) {
+ applyStorageSyncUpdate(recipientId, record.isArchived(), record.isForcedUnread());
+ }
+
+ public void applyStorageSyncUpdate(@NonNull RecipientId recipientId, @NonNull SignalGroupV2Record record) {
+ applyStorageSyncUpdate(recipientId, record.isArchived(), record.isForcedUnread());
+ }
+
+ public void applyStorageSyncUpdate(@NonNull RecipientId recipientId, @NonNull SignalAccountRecord record) {
+ applyStorageSyncUpdate(recipientId, record.isNoteToSelfArchived(), record.isNoteToSelfForcedUnread());
+ }
+
+ private void applyStorageSyncUpdate(@NonNull RecipientId recipientId, boolean archived, boolean forcedUnread) {
+ ContentValues values = new ContentValues();
+ values.put(ARCHIVED, archived);
+
+ if (forcedUnread) {
+ values.put(READ, ReadStatus.FORCED_UNREAD.serialize());
+ } else {
+ Long threadId = getThreadIdFor(recipientId);
+ if (threadId != null) {
+ int unreadCount = DatabaseFactory.getMmsSmsDatabase(context).getUnreadCount(threadId);
+
+ values.put(READ, unreadCount == 0 ? ReadStatus.READ.serialize() : ReadStatus.UNREAD.serialize());
+ values.put(UNREAD_COUNT, unreadCount);
+ }
+ }
+
+ databaseHelper.getWritableDatabase().update(TABLE_NAME, values, RECIPIENT_ID + " = ?", SqlUtil.buildArgs(recipientId));
}
public boolean update(long threadId, boolean unarchive) {
@@ -1404,7 +1475,7 @@ public class ThreadDatabase extends Database {
}
}
- private enum ReadStatus {
+ enum ReadStatus {
READ(1), UNREAD(0), FORCED_UNREAD(2);
private final int value;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
index 3f0de33ff..faa34e65d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.database.model;
import android.content.Context;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
import com.google.protobuf.ByteString;
@@ -81,7 +82,11 @@ final class GroupsV2UpdateMessageProducer {
}
}
- List describeChanges(@NonNull DecryptedGroupChange change) {
+ List describeChanges(@Nullable DecryptedGroup previousGroupState, @NonNull DecryptedGroupChange change) {
+ if (DecryptedGroup.getDefaultInstance().equals(previousGroupState)) {
+ previousGroupState = null;
+ }
+
List updates = new LinkedList<>();
if (change.getEditor().isEmpty() || UuidUtil.UNKNOWN_UUID.equals(UuidUtil.fromByteString(change.getEditor()))) {
@@ -96,7 +101,7 @@ final class GroupsV2UpdateMessageProducer {
describeUnknownEditorNewTimer(change, updates);
describeUnknownEditorNewAttributeAccess(change, updates);
describeUnknownEditorNewMembershipAccess(change, updates);
- describeUnknownEditorNewGroupInviteLinkAccess(change, updates);
+ describeUnknownEditorNewGroupInviteLinkAccess(previousGroupState, change, updates);
describeRequestingMembers(change, updates);
describeUnknownEditorRequestingMembersApprovals(change, updates);
describeUnknownEditorRequestingMembersDeletes(change, updates);
@@ -119,7 +124,7 @@ final class GroupsV2UpdateMessageProducer {
describeNewTimer(change, updates);
describeNewAttributeAccess(change, updates);
describeNewMembershipAccess(change, updates);
- describeNewGroupInviteLinkAccess(change, updates);
+ describeNewGroupInviteLinkAccess(previousGroupState, change, updates);
describeRequestingMembers(change, updates);
describeRequestingMembersApprovals(change, updates);
describeRequestingMembersDeletes(change, updates);
@@ -509,7 +514,16 @@ final class GroupsV2UpdateMessageProducer {
}
}
- private void describeNewGroupInviteLinkAccess(@NonNull DecryptedGroupChange change, @NonNull List updates) {
+ private void describeNewGroupInviteLinkAccess(@Nullable DecryptedGroup previousGroupState,
+ @NonNull DecryptedGroupChange change,
+ @NonNull List updates)
+ {
+ AccessControl.AccessRequired previousAccessControl = null;
+
+ if (previousGroupState != null) {
+ previousAccessControl = previousGroupState.getAccessControl().getAddFromInviteLink();
+ }
+
boolean editorIsYou = change.getEditor().equals(selfUuidBytes);
boolean groupLinkEnabled = false;
@@ -517,17 +531,33 @@ final class GroupsV2UpdateMessageProducer {
case ANY:
groupLinkEnabled = true;
if (editorIsYou) {
- updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_off)));
+ if (previousAccessControl == AccessControl.AccessRequired.ADMINISTRATOR) {
+ updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_off_admin_approval_for_the_group_link)));
+ } else {
+ updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_off)));
+ }
} else {
- updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_off, editor)));
+ if (previousAccessControl == AccessControl.AccessRequired.ADMINISTRATOR) {
+ updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_off_admin_approval_for_the_group_link, editor)));
+ } else {
+ updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_off, editor)));
+ }
}
break;
case ADMINISTRATOR:
groupLinkEnabled = true;
if (editorIsYou) {
- updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_on)));
+ if (previousAccessControl == AccessControl.AccessRequired.ANY) {
+ updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_admin_approval_for_the_group_link)));
+ } else {
+ updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_on)));
+ }
} else {
- updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_on, editor)));
+ if (previousAccessControl == AccessControl.AccessRequired.ANY) {
+ updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_admin_approval_for_the_group_link, editor)));
+ } else {
+ updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_on, editor)));
+ }
}
break;
case UNSATISFIABLE:
@@ -548,13 +578,30 @@ final class GroupsV2UpdateMessageProducer {
}
}
- private void describeUnknownEditorNewGroupInviteLinkAccess(@NonNull DecryptedGroupChange change, @NonNull List updates) {
+ private void describeUnknownEditorNewGroupInviteLinkAccess(@Nullable DecryptedGroup previousGroupState,
+ @NonNull DecryptedGroupChange change,
+ @NonNull List updates)
+ {
+ AccessControl.AccessRequired previousAccessControl = null;
+
+ if (previousGroupState != null) {
+ previousAccessControl = previousGroupState.getAccessControl().getAddFromInviteLink();
+ }
+
switch (change.getNewInviteLinkAccess()) {
case ANY:
- updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_off)));
+ if (previousAccessControl == AccessControl.AccessRequired.ADMINISTRATOR) {
+ updates.add(updateDescription(context.getString(R.string.MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_off)));
+ } else {
+ updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_off)));
+ }
break;
case ADMINISTRATOR:
- updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_on)));
+ if (previousAccessControl == AccessControl.AccessRequired.ANY) {
+ updates.add(updateDescription(context.getString(R.string.MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_on)));
+ } else {
+ updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_on)));
+ }
break;
case UNSATISFIABLE:
updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_off)));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
index 503d217fa..833ab70fc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
@@ -177,7 +177,7 @@ public abstract class MessageRecord extends DisplayRecord {
GroupsV2UpdateMessageProducer updateMessageProducer = new GroupsV2UpdateMessageProducer(context, descriptionStrategy, Recipient.self().getUuid().get());
if (decryptedGroupV2Context.hasChange() && decryptedGroupV2Context.getGroupState().getRevision() != 0) {
- return UpdateDescription.concatWithNewLines(updateMessageProducer.describeChanges(decryptedGroupV2Context.getChange()));
+ return UpdateDescription.concatWithNewLines(updateMessageProducer.describeChanges(decryptedGroupV2Context.getPreviousGroupState(), decryptedGroupV2Context.getChange()));
} else {
return updateMessageProducer.describeNewGroup(decryptedGroupV2Context.getGroupState(), decryptedGroupV2Context.getChange());
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
index a4adbec66..024b114cd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
@@ -6,6 +6,7 @@ import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.BuildConfig;
+import org.thoughtcrime.securesms.KbsEnclave;
import org.thoughtcrime.securesms.messages.IncomingMessageProcessor;
import org.thoughtcrime.securesms.messages.BackgroundMessageRetriever;
import org.thoughtcrime.securesms.groups.GroupsV2AuthorizationMemoryValueCache;
@@ -15,6 +16,7 @@ import org.thoughtcrime.securesms.keyvalue.KeyValueStore;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.megaphone.MegaphoneRepository;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
+import org.thoughtcrime.securesms.pin.KbsEnclaves;
import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
import org.thoughtcrime.securesms.recipients.LiveRecipientCache;
import org.thoughtcrime.securesms.messages.IncomingMessageObserver;
@@ -111,11 +113,11 @@ public class ApplicationDependencies {
return groupsV2Operations;
}
- public static synchronized @NonNull KeyBackupService getKeyBackupService() {
+ public static synchronized @NonNull KeyBackupService getKeyBackupService(@NonNull KbsEnclave enclave) {
return getSignalServiceAccountManager().getKeyBackupService(IasKeyStore.getIasKeyStore(application),
- BuildConfig.KBS_ENCLAVE_NAME,
- Hex.fromStringOrThrow(BuildConfig.KBS_SERVICE_ID),
- BuildConfig.KBS_MRENCLAVE,
+ enclave.getEnclaveName(),
+ Hex.fromStringOrThrow(enclave.getServiceId()),
+ enclave.getMrEnclave(),
10);
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
index 965a9f00d..8e4c44470 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
@@ -193,7 +193,7 @@ final class GroupManagerV2 {
.setEditor(UuidUtil.toByteString(selfUuid))
.build();
- RecipientAndThread recipientAndThread = sendGroupUpdate(masterKey, decryptedGroup, groupChange, null);
+ RecipientAndThread recipientAndThread = sendGroupUpdate(masterKey, new GroupMutation(null, groupChange, decryptedGroup), null);
return new GroupManager.GroupActionResult(recipientAndThread.groupRecipient,
recipientAndThread.threadId,
@@ -505,16 +505,18 @@ final class GroupManagerV2 {
private GroupManager.GroupActionResult commitChange(@NonNull GroupChange.Actions.Builder change)
throws GroupNotAMemberException, GroupChangeFailedException, IOException, GroupInsufficientRightsException
{
- final GroupDatabase.GroupRecord groupRecord = groupDatabase.requireGroup(groupId);
- final GroupDatabase.V2GroupProperties v2GroupProperties = groupRecord.requireV2GroupProperties();
- final int nextRevision = v2GroupProperties.getGroupRevision() + 1;
- final GroupChange.Actions changeActions = change.setRevision(nextRevision).build();
+ final GroupDatabase.GroupRecord groupRecord = groupDatabase.requireGroup(groupId);
+ final GroupDatabase.V2GroupProperties v2GroupProperties = groupRecord.requireV2GroupProperties();
+ final int nextRevision = v2GroupProperties.getGroupRevision() + 1;
+ final GroupChange.Actions changeActions = change.setRevision(nextRevision).build();
final DecryptedGroupChange decryptedChange;
final DecryptedGroup decryptedGroupState;
+ final DecryptedGroup previousGroupState;
try {
+ previousGroupState = v2GroupProperties.getDecryptedGroup();
decryptedChange = groupOperations.decryptChange(changeActions, selfUuid);
- decryptedGroupState = DecryptedGroupUtil.apply(v2GroupProperties.getDecryptedGroup(), decryptedChange);
+ decryptedGroupState = DecryptedGroupUtil.apply(previousGroupState, decryptedChange);
} catch (VerificationFailedException | InvalidGroupStateException | NotAbleToApplyGroupV2ChangeException e) {
Log.w(TAG, e);
throw new IOException(e);
@@ -523,7 +525,8 @@ final class GroupManagerV2 {
GroupChange signedGroupChange = commitToServer(changeActions);
groupDatabase.update(groupId, decryptedGroupState);
- RecipientAndThread recipientAndThread = sendGroupUpdate(groupMasterKey, decryptedGroupState, decryptedChange, signedGroupChange);
+ GroupMutation groupMutation = new GroupMutation(previousGroupState, decryptedChange, decryptedGroupState);
+ RecipientAndThread recipientAndThread = sendGroupUpdate(groupMasterKey, groupMutation, signedGroupChange);
int newMembersCount = decryptedChange.getNewMembersCount();
List newPendingMembers = getPendingMemberRecipientIds(decryptedChange.getNewPendingMembersList());
@@ -681,7 +684,7 @@ final class GroupManagerV2 {
} else if (requestToJoin) {
Log.i(TAG, "Requested to join, cannot send update");
- RecipientAndThread recipientAndThread = sendGroupUpdate(groupMasterKey, decryptedGroup, decryptedChange, signedGroupChange);
+ RecipientAndThread recipientAndThread = sendGroupUpdate(groupMasterKey, new GroupMutation(null, decryptedChange, decryptedGroup), signedGroupChange);
return new GroupManager.GroupActionResult(groupRecipient,
recipientAndThread.threadId,
@@ -706,7 +709,7 @@ final class GroupManagerV2 {
System.currentTimeMillis(),
decryptedChange);
- RecipientAndThread recipientAndThread = sendGroupUpdate(groupMasterKey, decryptedGroup, decryptedChange, signedGroupChange);
+ RecipientAndThread recipientAndThread = sendGroupUpdate(groupMasterKey, new GroupMutation(null, decryptedChange, decryptedGroup), signedGroupChange);
return new GroupManager.GroupActionResult(groupRecipient,
recipientAndThread.threadId,
@@ -905,7 +908,7 @@ final class GroupManagerV2 {
groupDatabase.update(groupId, resetRevision(newGroup, decryptedGroup.getRevision()));
- sendGroupUpdate(groupMasterKey, decryptedGroup, decryptedChange, signedGroupChange);
+ sendGroupUpdate(groupMasterKey, new GroupMutation(decryptedGroup, decryptedChange, newGroup), signedGroupChange);
} catch (VerificationFailedException | InvalidGroupStateException | NotAbleToApplyGroupV2ChangeException e) {
throw new GroupChangeFailedException(e);
}
@@ -959,13 +962,12 @@ final class GroupManagerV2 {
}
private @NonNull RecipientAndThread sendGroupUpdate(@NonNull GroupMasterKey masterKey,
- @NonNull DecryptedGroup decryptedGroup,
- @Nullable DecryptedGroupChange plainGroupChange,
+ @NonNull GroupMutation groupMutation,
@Nullable GroupChange signedGroupChange)
{
GroupId.V2 groupId = GroupId.v2(masterKey);
Recipient groupRecipient = Recipient.externalGroup(context, groupId);
- DecryptedGroupV2Context decryptedGroupV2Context = GroupProtoUtil.createDecryptedGroupV2Context(masterKey, decryptedGroup, plainGroupChange, signedGroupChange);
+ DecryptedGroupV2Context decryptedGroupV2Context = GroupProtoUtil.createDecryptedGroupV2Context(masterKey, groupMutation, signedGroupChange);
OutgoingGroupUpdateMessage outgoingMessage = new OutgoingGroupUpdateMessage(groupRecipient,
decryptedGroupV2Context,
null,
@@ -977,8 +979,11 @@ final class GroupManagerV2 {
Collections.emptyList(),
Collections.emptyList());
+
+ DecryptedGroupChange plainGroupChange = groupMutation.getGroupChange();
+
if (plainGroupChange != null && DecryptedGroupUtil.changeIsEmptyExceptForProfileKeyChanges(plainGroupChange)) {
- ApplicationDependencies.getJobManager().add(PushGroupSilentUpdateSendJob.create(context, groupId, decryptedGroup, outgoingMessage));
+ ApplicationDependencies.getJobManager().add(PushGroupSilentUpdateSendJob.create(context, groupId, groupMutation.getNewGroupState(), outgoingMessage));
return new RecipientAndThread(groupRecipient, -1);
} else {
long threadId = MessageSender.send(context, outgoingMessage, -1, false, null);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupMutation.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupMutation.java
new file mode 100644
index 000000000..9108d3dbe
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupMutation.java
@@ -0,0 +1,31 @@
+package org.thoughtcrime.securesms.groups;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.signal.storageservice.protos.groups.local.DecryptedGroup;
+import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
+
+public final class GroupMutation {
+ @Nullable private final DecryptedGroup previousGroupState;
+ @Nullable private final DecryptedGroupChange groupChange;
+ @NonNull private final DecryptedGroup newGroupState;
+
+ public GroupMutation(@Nullable DecryptedGroup previousGroupState, @Nullable DecryptedGroupChange groupChange, @NonNull DecryptedGroup newGroupState) {
+ this.previousGroupState = previousGroupState;
+ this.groupChange = groupChange;
+ this.newGroupState = newGroupState;
+ }
+
+ public @Nullable DecryptedGroup getPreviousGroupState() {
+ return previousGroupState;
+ }
+
+ public @Nullable DecryptedGroupChange getGroupChange() {
+ return groupChange;
+ }
+
+ public @NonNull DecryptedGroup getNewGroupState() {
+ return newGroupState;
+ }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java
index 43bab80e3..1a0d290a7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java
@@ -49,12 +49,13 @@ public final class GroupProtoUtil {
}
public static DecryptedGroupV2Context createDecryptedGroupV2Context(@NonNull GroupMasterKey masterKey,
- @NonNull DecryptedGroup decryptedGroup,
- @Nullable DecryptedGroupChange plainGroupChange,
+ @NonNull GroupMutation groupMutation,
@Nullable GroupChange signedServerChange)
{
- int revision = plainGroupChange != null ? plainGroupChange.getRevision() : decryptedGroup.getRevision();
- SignalServiceProtos.GroupContextV2.Builder contextBuilder = SignalServiceProtos.GroupContextV2.newBuilder()
+ DecryptedGroupChange plainGroupChange = groupMutation.getGroupChange();
+ DecryptedGroup decryptedGroup = groupMutation.getNewGroupState();
+ int revision = plainGroupChange != null ? plainGroupChange.getRevision() : decryptedGroup.getRevision();
+ SignalServiceProtos.GroupContextV2.Builder contextBuilder = SignalServiceProtos.GroupContextV2.newBuilder()
.setMasterKey(ByteString.copyFrom(masterKey.serialize()))
.setRevision(revision);
@@ -66,6 +67,10 @@ public final class GroupProtoUtil {
.setContext(contextBuilder.build())
.setGroupState(decryptedGroup);
+ if (groupMutation.getPreviousGroupState() != null) {
+ builder.setPreviousGroupState(groupMutation.getPreviousGroupState());
+ }
+
if (plainGroupChange != null) {
builder.setChange(plainGroupChange);
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java
index fa6252616..6f708bec7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java
@@ -195,7 +195,7 @@ public final class GroupJoinBottomSheetDialogFragment extends BottomSheetDialogF
private GroupInviteLinkUrl getGroupInviteLinkUrl() {
try {
//noinspection ConstantConditions
- return GroupInviteLinkUrl.fromUrl(requireArguments().getString(ARG_GROUP_INVITE_LINK_URL));
+ return GroupInviteLinkUrl.fromUri(requireArguments().getString(ARG_GROUP_INVITE_LINK_URL));
} catch (GroupInviteLinkUrl.InvalidGroupLinkException | GroupInviteLinkUrl.UnknownGroupLinkVersionException e) {
throw new AssertionError();
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java
index 7995fe9ed..40ee561b9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java
@@ -12,8 +12,8 @@ import org.signal.zkgroup.groups.GroupMasterKey;
import org.whispersystems.util.Base64UrlSafe;
import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
public final class GroupInviteLinkUrl {
@@ -38,24 +38,24 @@ public final class GroupInviteLinkUrl {
* @return null iff not a group url.
* @throws InvalidGroupLinkException If group url, but cannot be parsed.
*/
- public static @Nullable GroupInviteLinkUrl fromUrl(@NonNull String urlString)
+ public static @Nullable GroupInviteLinkUrl fromUri(@NonNull String urlString)
throws InvalidGroupLinkException, UnknownGroupLinkVersionException
{
- URL url = getGroupUrl(urlString);
+ URI uri = getGroupUrl(urlString);
- if (url == null) {
+ if (uri == null) {
return null;
}
try {
- if (!"/".equals(url.getPath()) && url.getPath().length() > 0) {
- throw new InvalidGroupLinkException("No path was expected in url");
+ if (!"/".equals(uri.getPath()) && uri.getPath().length() > 0) {
+ throw new InvalidGroupLinkException("No path was expected in uri");
}
- String encoding = url.getRef();
+ String encoding = uri.getFragment();
if (encoding == null || encoding.length() == 0) {
- throw new InvalidGroupLinkException("No reference was in the url");
+ throw new InvalidGroupLinkException("No reference was in the uri");
}
byte[] bytes = Base64UrlSafe.decodePaddingAgnostic(encoding);
@@ -78,16 +78,23 @@ public final class GroupInviteLinkUrl {
}
/**
- * @return {@link URL} if the host name matches.
+ * @return {@link URI} if the host name matches.
*/
- private static URL getGroupUrl(@NonNull String urlString) {
+ private static URI getGroupUrl(@NonNull String urlString) {
try {
- URL url = new URL(urlString);
+ URI url = new URI(urlString);
+
+ if (!"https".equalsIgnoreCase(url.getScheme()) &&
+ !"sgnl".equalsIgnoreCase(url.getScheme()))
+ {
+ return null;
+ }
return GROUP_URL_HOST.equalsIgnoreCase(url.getHost())
? url
: null;
- } catch (MalformedURLException e) {
+
+ } catch (URISyntaxException e) {
return null;
}
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java
index 38276b4cc..37ccde7e9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java
@@ -23,6 +23,7 @@ import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.groups.GroupId;
+import org.thoughtcrime.securesms.groups.GroupMutation;
import org.thoughtcrime.securesms.groups.GroupNotAMemberException;
import org.thoughtcrime.securesms.groups.GroupProtoUtil;
import org.thoughtcrime.securesms.groups.GroupsV2Authorization;
@@ -226,9 +227,9 @@ public final class GroupsV2StateProcessor {
determineProfileSharing(inputGroupState, newLocalState);
if (localState != null && localState.getRevision() == GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION) {
Log.i(TAG, "Inserting single update message for restore placeholder");
- insertUpdateMessages(timestamp, Collections.singleton(new LocalGroupLogEntry(newLocalState, null)));
+ insertUpdateMessages(timestamp, null, Collections.singleton(new LocalGroupLogEntry(newLocalState, null)));
} else {
- insertUpdateMessages(timestamp, advanceGroupStateResult.getProcessedLogEntries());
+ insertUpdateMessages(timestamp, localState, advanceGroupStateResult.getProcessedLogEntries());
}
persistLearnedProfileKeys(inputGroupState);
@@ -260,7 +261,7 @@ public final class GroupsV2StateProcessor {
.addDeleteMembers(UuidUtil.toByteString(selfUuid))
.build();
- DecryptedGroupV2Context decryptedGroupV2Context = GroupProtoUtil.createDecryptedGroupV2Context(masterKey, simulatedGroupState, simulatedGroupChange, null);
+ DecryptedGroupV2Context decryptedGroupV2Context = GroupProtoUtil.createDecryptedGroupV2Context(masterKey, new GroupMutation(decryptedGroup, simulatedGroupChange, simulatedGroupState), null);
OutgoingGroupUpdateMessage leaveMessage = new OutgoingGroupUpdateMessage(groupRecipient,
decryptedGroupV2Context,
null,
@@ -362,13 +363,17 @@ public final class GroupsV2StateProcessor {
}
}
- private void insertUpdateMessages(long timestamp, Collection processedLogEntries) {
+ private void insertUpdateMessages(long timestamp,
+ @Nullable DecryptedGroup previousGroupState,
+ Collection processedLogEntries)
+ {
for (LocalGroupLogEntry entry : processedLogEntries) {
if (entry.getChange() != null && DecryptedGroupUtil.changeIsEmptyExceptForProfileKeyChanges(entry.getChange()) && !DecryptedGroupUtil.changeIsEmpty(entry.getChange())) {
Log.d(TAG, "Skipping profile key changes only update message");
} else {
- storeMessage(GroupProtoUtil.createDecryptedGroupV2Context(masterKey, entry.getGroup(), entry.getChange(), null), timestamp);
+ storeMessage(GroupProtoUtil.createDecryptedGroupV2Context(masterKey, new GroupMutation(previousGroupState, entry.getChange(), entry.getGroup()), null), timestamp);
}
+ previousGroupState = entry.getGroup();
}
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ClearFallbackKbsEnclaveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ClearFallbackKbsEnclaveJob.java
new file mode 100644
index 000000000..834f63f5a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ClearFallbackKbsEnclaveJob.java
@@ -0,0 +1,102 @@
+package org.thoughtcrime.securesms.jobs;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.KbsEnclave;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobmanager.Data;
+import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.pin.KbsEnclaves;
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
+import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Clears data from an old KBS enclave.
+ */
+public class ClearFallbackKbsEnclaveJob extends BaseJob {
+
+ public static final String KEY = "ClearFallbackKbsEnclaveJob";
+
+ private static final String TAG = Log.tag(ClearFallbackKbsEnclaveJob.class);
+
+ private static final String KEY_ENCLAVE_NAME = "enclaveName";
+ private static final String KEY_SERVICE_ID = "serviceId";
+ private static final String KEY_MR_ENCLAVE = "mrEnclave";
+
+ private final KbsEnclave enclave;
+
+ ClearFallbackKbsEnclaveJob(@NonNull KbsEnclave enclave) {
+ this(new Parameters.Builder()
+ .addConstraint(NetworkConstraint.KEY)
+ .setLifespan(TimeUnit.DAYS.toMillis(90))
+ .setMaxAttempts(Parameters.UNLIMITED)
+ .setQueue("ClearFallbackKbsEnclaveJob")
+ .build(),
+ enclave);
+ }
+
+ public static void clearAll() {
+ if (KbsEnclaves.fallbacks().isEmpty()) {
+ Log.i(TAG, "No fallbacks!");
+ return;
+ }
+
+ JobManager jobManager = ApplicationDependencies.getJobManager();
+
+ for (KbsEnclave enclave : KbsEnclaves.fallbacks()) {
+ jobManager.add(new ClearFallbackKbsEnclaveJob(enclave));
+ }
+ }
+
+ private ClearFallbackKbsEnclaveJob(@NonNull Parameters parameters, @NonNull KbsEnclave enclave) {
+ super(parameters);
+ this.enclave = enclave;
+ }
+
+ @Override
+ public @NonNull String getFactoryKey() {
+ return KEY;
+ }
+
+ @Override
+ public @NonNull Data serialize() {
+ return new Data.Builder().putString(KEY_ENCLAVE_NAME, enclave.getEnclaveName())
+ .putString(KEY_SERVICE_ID, enclave.getServiceId())
+ .putString(KEY_MR_ENCLAVE, enclave.getMrEnclave())
+ .build();
+ }
+
+ @Override
+ public void onRun() throws IOException, UnauthenticatedResponseException {
+ Log.i(TAG, "Preparing to delete data from " + enclave.getEnclaveName());
+ ApplicationDependencies.getKeyBackupService(enclave).newPinChangeSession().removePin();
+ Log.i(TAG, "Successfully deleted the data from " + enclave.getEnclaveName());
+ }
+
+ @Override
+ public boolean onShouldRetry(@NonNull Exception e) {
+ return true;
+ }
+
+ @Override
+ public void onFailure() {
+ throw new AssertionError("This job should never fail. " + getClass().getSimpleName());
+ }
+
+ public static class Factory implements Job.Factory {
+ @Override
+ public @NonNull ClearFallbackKbsEnclaveJob create(@NonNull Parameters parameters, @NonNull Data data) {
+ KbsEnclave enclave = new KbsEnclave(data.getString(KEY_ENCLAVE_NAME),
+ data.getString(KEY_SERVICE_ID),
+ data.getString(KEY_MR_ENCLAVE));
+
+ return new ClearFallbackKbsEnclaveJob(parameters, enclave);
+ }
+ }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
index 7409d6856..8b85b83e8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
@@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.migrations.AvatarIdRemovalMigrationJob;
import org.thoughtcrime.securesms.migrations.AvatarMigrationJob;
import org.thoughtcrime.securesms.migrations.CachedAttachmentsMigrationJob;
import org.thoughtcrime.securesms.migrations.DatabaseMigrationJob;
+import org.thoughtcrime.securesms.migrations.KbsEnclaveMigrationJob;
import org.thoughtcrime.securesms.migrations.LegacyMigrationJob;
import org.thoughtcrime.securesms.migrations.MigrationCompleteJob;
import org.thoughtcrime.securesms.migrations.PassingMigrationJob;
@@ -62,9 +63,11 @@ public final class JobManagerFactories {
put(AvatarGroupsV1DownloadJob.KEY, new AvatarGroupsV1DownloadJob.Factory());
put(AvatarGroupsV2DownloadJob.KEY, new AvatarGroupsV2DownloadJob.Factory());
put(CleanPreKeysJob.KEY, new CleanPreKeysJob.Factory());
+ put(ClearFallbackKbsEnclaveJob.KEY, new ClearFallbackKbsEnclaveJob.Factory());
put(CreateSignedPreKeyJob.KEY, new CreateSignedPreKeyJob.Factory());
put(DirectoryRefreshJob.KEY, new DirectoryRefreshJob.Factory());
put(FcmRefreshJob.KEY, new FcmRefreshJob.Factory());
+ put(KbsEnclaveMigrationWorkerJob.KEY, new KbsEnclaveMigrationWorkerJob.Factory());
put(LeaveGroupJob.KEY, new LeaveGroupJob.Factory());
put(LocalBackupJob.KEY, new LocalBackupJob.Factory());
put(MmsDownloadJob.KEY, new MmsDownloadJob.Factory());
@@ -132,6 +135,7 @@ public final class JobManagerFactories {
put(AvatarMigrationJob.KEY, new AvatarMigrationJob.Factory());
put(CachedAttachmentsMigrationJob.KEY, new CachedAttachmentsMigrationJob.Factory());
put(DatabaseMigrationJob.KEY, new DatabaseMigrationJob.Factory());
+ put(KbsEnclaveMigrationJob.KEY, new KbsEnclaveMigrationJob.Factory());
put(LegacyMigrationJob.KEY, new LegacyMigrationJob.Factory());
put(MigrationCompleteJob.KEY, new MigrationCompleteJob.Factory());
put(PinOptOutMigration.KEY, new PinOptOutMigration.Factory());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/KbsEnclaveMigrationWorkerJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/KbsEnclaveMigrationWorkerJob.java
new file mode 100644
index 000000000..c9c046e1c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/KbsEnclaveMigrationWorkerJob.java
@@ -0,0 +1,85 @@
+package org.thoughtcrime.securesms.jobs;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.jobmanager.Data;
+import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.migrations.KbsEnclaveMigrationJob;
+import org.thoughtcrime.securesms.pin.PinState;
+import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
+
+import java.io.IOException;
+
+/**
+ * Should only be enqueued by {@link KbsEnclaveMigrationJob}. Does the actual work of migrating KBS
+ * data to the new enclave and deleting it from the old enclave(s).
+ */
+public class KbsEnclaveMigrationWorkerJob extends BaseJob {
+
+ public static final String KEY = "KbsEnclaveMigrationWorkerJob";
+
+ private static final String TAG = Log.tag(KbsEnclaveMigrationWorkerJob.class);
+
+ public KbsEnclaveMigrationWorkerJob() {
+ this(new Parameters.Builder()
+ .addConstraint(NetworkConstraint.KEY)
+ .setLifespan(Parameters.IMMORTAL)
+ .setMaxAttempts(Parameters.UNLIMITED)
+ .setQueue("KbsEnclaveMigrationWorkerJob")
+ .setMaxInstances(1)
+ .build());
+ }
+
+ private KbsEnclaveMigrationWorkerJob(@NonNull Parameters parameters) {
+ super(parameters);
+ }
+
+ @Override
+ public @NonNull String getFactoryKey() {
+ return KEY;
+ }
+
+ @Override
+ public @NonNull Data serialize() {
+ return Data.EMPTY;
+ }
+
+ @Override
+ public void onRun() throws IOException, UnauthenticatedResponseException {
+ String pin = SignalStore.kbsValues().getPin();
+
+ if (SignalStore.kbsValues().hasOptedOut()) {
+ Log.w(TAG, "Opted out of KBS! Nothing to migrate.");
+ return;
+ }
+
+ if (pin == null) {
+ Log.w(TAG, "No PIN available! Can't migrate!");
+ return;
+ }
+
+ PinState.onMigrateToNewEnclave(pin);
+ Log.i(TAG, "Migration successful!");
+ }
+
+ @Override
+ public boolean onShouldRetry(@NonNull Exception e) {
+ return e instanceof IOException ||
+ e instanceof UnauthenticatedResponseException;
+ }
+
+ @Override
+ public void onFailure() {
+ throw new AssertionError("This job should never fail. " + getClass().getSimpleName());
+ }
+
+ public static class Factory implements Job.Factory {
+ @Override
+ public @NonNull KbsEnclaveMigrationWorkerJob create(@NonNull Parameters parameters, @NonNull Data data) {
+ return new KbsEnclaveMigrationWorkerJob(parameters);
+ }
+ }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
index a78f19164..a47a0728a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
@@ -512,7 +512,7 @@ public final class PushProcessMessageJob extends BaseJob {
Intent intent = new Intent(context, WebRtcCallService.class);
Recipient recipient = Recipient.externalHighTrustPush(context, content.getSender());
RemotePeer remotePeer = new RemotePeer(recipient.getId());
- byte[] remoteIdentityKey = recipient.getIdentityKey();
+ byte[] remoteIdentityKey = DatabaseFactory.getIdentityDatabase(context).getIdentity(recipient.getId()).transform(record -> record.getIdentityKey().serialize()).orNull();
intent.setAction(WebRtcCallService.ACTION_RECEIVE_OFFER)
.putExtra(WebRtcCallService.EXTRA_CALL_ID, message.getId())
@@ -538,7 +538,7 @@ public final class PushProcessMessageJob extends BaseJob {
Intent intent = new Intent(context, WebRtcCallService.class);
Recipient recipient = Recipient.externalHighTrustPush(context, content.getSender());
RemotePeer remotePeer = new RemotePeer(recipient.getId());
- byte[] remoteIdentityKey = recipient.getIdentityKey();
+ byte[] remoteIdentityKey = DatabaseFactory.getIdentityDatabase(context).getIdentity(recipient.getId()).transform(record -> record.getIdentityKey().serialize()).orNull();
intent.setAction(WebRtcCallService.ACTION_RECEIVE_ANSWER)
.putExtra(WebRtcCallService.EXTRA_CALL_ID, message.getId())
@@ -1830,7 +1830,7 @@ public final class PushProcessMessageJob extends BaseJob {
Optional groupId = GroupUtil.idFromGroupContext(message.getGroupContext());
if (groupId.isPresent() && groupDatabase.isUnknownGroup(groupId.get())) {
- return false;
+ return sender.isBlocked();
}
boolean isTextMessage = message.getBody().isPresent();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java
index 362ffa903..32d155fa0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java
@@ -83,11 +83,10 @@ public class StorageForcePushJob extends BaseJob {
long newVersion = currentVersion + 1;
Map newContactStorageIds = generateContactStorageIds(oldContactStorageIds);
- Set archivedRecipients = DatabaseFactory.getThreadDatabase(context).getArchivedRecipients();
List inserts = Stream.of(oldContactStorageIds.keySet())
.map(recipientDatabase::getRecipientSettingsForSync)
.withoutNulls()
- .map(s -> StorageSyncModels.localToRemoteRecord(s, Objects.requireNonNull(newContactStorageIds.get(s.getId())).getRaw(), archivedRecipients))
+ .map(s -> StorageSyncModels.localToRemoteRecord(s, Objects.requireNonNull(newContactStorageIds.get(s.getId())).getRaw()))
.toList();
SignalStorageRecord accountRecord = StorageSyncHelper.buildAccountRecord(context, Recipient.self().fresh());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
index 969aa536e..a4abe45fc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
@@ -152,8 +152,7 @@ public class StorageSyncJob extends BaseJob {
if (!keyDifference.isEmpty()) {
Log.i(TAG, "[Remote Newer] There's a difference in keys. Local-only: " + keyDifference.getLocalOnlyKeys().size() + ", Remote-only: " + keyDifference.getRemoteOnlyKeys().size());
- Set archivedRecipients = DatabaseFactory.getThreadDatabase(context).getArchivedRecipients();
- List localOnly = buildLocalStorageRecords(context, keyDifference.getLocalOnlyKeys(), archivedRecipients);
+ List localOnly = buildLocalStorageRecords(context, keyDifference.getLocalOnlyKeys());
List remoteOnly = accountManager.readStorageRecords(storageServiceKey, keyDifference.getRemoteOnlyKeys());
MergeResult mergeResult = StorageSyncHelper.resolveConflict(remoteOnly, localOnly);
WriteOperationResult writeOperationResult = StorageSyncHelper.createWriteOperation(remoteManifest.get().getVersion(), allLocalStorageKeys, mergeResult);
@@ -184,6 +183,8 @@ public class StorageSyncJob extends BaseJob {
}
remoteManifestVersion = writeOperationResult.getManifest().getVersion();
+
+ needsMultiDeviceSync = true;
} else {
Log.i(TAG, "[Remote Newer] After resolving the conflict, all changes are local. No remote writes needed.");
}
@@ -191,7 +192,6 @@ public class StorageSyncJob extends BaseJob {
recipientDatabase.applyStorageSyncUpdates(mergeResult.getLocalContactInserts(), mergeResult.getLocalContactUpdates(), mergeResult.getLocalGroupV1Inserts(), mergeResult.getLocalGroupV1Updates(), mergeResult.getLocalGroupV2Inserts(), mergeResult.getLocalGroupV2Updates());
storageKeyDatabase.applyStorageSyncUpdates(mergeResult.getLocalUnknownInserts(), mergeResult.getLocalUnknownDeletes());
StorageSyncHelper.applyAccountStorageSyncUpdates(context, mergeResult.getLocalAccountUpdate());
- needsMultiDeviceSync = true;
Log.i(TAG, "[Remote Newer] Updating local manifest version to: " + remoteManifestVersion);
TextSecurePreferences.setStorageManifestVersion(context, remoteManifestVersion);
@@ -212,15 +212,13 @@ public class StorageSyncJob extends BaseJob {
List pendingDeletions = recipientDatabase.getPendingRecipientSyncDeletions();
Optional pendingAccountInsert = StorageSyncHelper.getPendingAccountSyncInsert(context, self);
Optional pendingAccountUpdate = StorageSyncHelper.getPendingAccountSyncUpdate(context, self);
- Set archivedRecipients = DatabaseFactory.getThreadDatabase(context).getArchivedRecipients();
Optional localWriteResult = StorageSyncHelper.buildStorageUpdatesForLocal(localManifestVersion,
allLocalStorageKeys,
pendingUpdates,
pendingInsertions,
pendingDeletions,
pendingAccountUpdate,
- pendingAccountInsert,
- archivedRecipients);
+ pendingAccountInsert);
if (localWriteResult.isPresent()) {
Log.i(TAG, String.format(Locale.ENGLISH, "[Local Changes] Local changes present. %d updates, %d inserts, %d deletes, account update: %b, account insert: %b.", pendingUpdates.size(), pendingInsertions.size(), pendingDeletions.size(), pendingAccountUpdate.isPresent(), pendingAccountInsert.isPresent()));
@@ -273,7 +271,7 @@ public class StorageSyncJob extends BaseJob {
DatabaseFactory.getStorageKeyDatabase(context).getAllKeys());
}
- private static @NonNull List buildLocalStorageRecords(@NonNull Context context, @NonNull List ids, @NonNull Set archivedRecipients) {
+ private static @NonNull List buildLocalStorageRecords(@NonNull Context context, @NonNull List ids) {
Recipient self = Recipient.self().fresh();
RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
StorageKeyDatabase storageKeyDatabase = DatabaseFactory.getStorageKeyDatabase(context);
@@ -287,10 +285,10 @@ public class StorageSyncJob extends BaseJob {
case ManifestRecord.Identifier.Type.GROUPV2_VALUE:
RecipientSettings settings = recipientDatabase.getByStorageId(id.getRaw());
if (settings != null) {
- if (settings.getGroupType() == RecipientDatabase.GroupType.SIGNAL_V2 && settings.getGroupMasterKey() == null) {
+ if (settings.getGroupType() == RecipientDatabase.GroupType.SIGNAL_V2 && settings.getSyncExtras().getGroupMasterKey() == null) {
Log.w(TAG, "Missing master key on gv2 recipient");
} else {
- records.add(StorageSyncModels.localToRemoteRecord(settings, archivedRecipients));
+ records.add(StorageSyncModels.localToRemoteRecord(settings));
}
} else {
Log.w(TAG, "Missing local recipient model! Type: " + id.getType());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
index e2fb45106..8dd450f2c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
@@ -137,6 +137,10 @@ public final class KbsValues extends SignalStoreValues {
}
}
+ public synchronized @Nullable String getPin() {
+ return getString(PIN, null);
+ }
+
public synchronized @Nullable String getLocalPinHash() {
return getString(LOCK_LOCAL_PIN_HASH, null);
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
index 136fb581a..d5e667caa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
@@ -252,7 +252,7 @@ public class LinkPreviewRepository {
{
SignalExecutors.UNBOUNDED.execute(() -> {
try {
- GroupInviteLinkUrl groupInviteLinkUrl = GroupInviteLinkUrl.fromUrl(groupUrl);
+ GroupInviteLinkUrl groupInviteLinkUrl = GroupInviteLinkUrl.fromUri(groupUrl);
if (groupInviteLinkUrl == null) {
throw new AssertionError();
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
index 9ee8995bb..522baa6ed 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
@@ -14,6 +14,7 @@ import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.groups.GroupChangeException;
+import org.thoughtcrime.securesms.groups.GroupId;
import org.thoughtcrime.securesms.groups.GroupManager;
import org.thoughtcrime.securesms.groups.ui.GroupChangeErrorCallback;
import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason;
@@ -229,6 +230,10 @@ final class MessageRequestRepository {
});
}
+ boolean isPendingMember(@NonNull GroupId.V2 groupId) {
+ return DatabaseFactory.getGroupDatabase(context).isPendingMember(groupId, Recipient.self());
+ }
+
enum MessageRequestState {
/**
* Message request permission does not need to be gained at this time.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestViewModel.java
index 749f1bef9..3538894ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestViewModel.java
@@ -5,6 +5,7 @@ import android.content.Context;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.Transformations;
@@ -19,6 +20,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.SingleLiveEvent;
import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
import org.thoughtcrime.securesms.util.livedata.LiveDataTriple;
+import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
import java.util.Collections;
import java.util.List;
@@ -28,6 +30,7 @@ public class MessageRequestViewModel extends ViewModel {
private final SingleLiveEvent status = new SingleLiveEvent<>();
private final SingleLiveEvent failures = new SingleLiveEvent<>();
private final MutableLiveData recipient = new MutableLiveData<>();
+ private final LiveData messageData;
private final MutableLiveData> groups = new MutableLiveData<>(Collections.emptyList());
private final MutableLiveData memberCount = new MutableLiveData<>(GroupMemberCount.ZERO);
private final MutableLiveData displayState = new MutableLiveData<>();
@@ -46,7 +49,8 @@ public class MessageRequestViewModel extends ViewModel {
};
private MessageRequestViewModel(MessageRequestRepository repository) {
- this.repository = repository;
+ this.repository = repository;
+ this.messageData = LiveDataUtil.mapAsync(recipient, this::createMessageDataForRecipient);
}
public void setConversationInfo(@NonNull RecipientId recipientId, long threadId) {
@@ -77,6 +81,10 @@ public class MessageRequestViewModel extends ViewModel {
return recipient;
}
+ public LiveData getMessageData() {
+ return messageData;
+ }
+
public LiveData getRecipientInfo() {
return recipientInfo;
}
@@ -152,6 +160,29 @@ public class MessageRequestViewModel extends ViewModel {
repository.getMemberCount(liveRecipient.getId(), memberCount::postValue);
}
+ @WorkerThread
+ private @NonNull MessageData createMessageDataForRecipient(@NonNull Recipient recipient) {
+ if (recipient.isBlocked()) {
+ if (recipient.isGroup()) {
+ return new MessageData(recipient, MessageClass.BLOCKED_GROUP);
+ } else {
+ return new MessageData(recipient, MessageClass.BLOCKED_INDIVIDUAL);
+ }
+ } else if (recipient.isGroup()) {
+ if (recipient.isPushV2Group()) {
+ if (repository.isPendingMember(recipient.requireGroupId().requireV2())) {
+ return new MessageData(recipient, MessageClass.GROUP_V2_INVITE);
+ } else {
+ return new MessageData(recipient, MessageClass.GROUP_V2_ADD);
+ }
+ } else {
+ return new MessageData(recipient, MessageClass.GROUP_V1);
+ }
+ } else {
+ return new MessageData(recipient, MessageClass.INDIVIDUAL);
+ }
+ }
+
@SuppressWarnings("ConstantConditions")
private void loadMessageRequestAccepted(@NonNull Recipient recipient) {
if (recipient.isBlocked()) {
@@ -218,6 +249,33 @@ public class MessageRequestViewModel extends ViewModel {
DISPLAY_MESSAGE_REQUEST, DISPLAY_LEGACY, DISPLAY_NONE
}
+ public enum MessageClass {
+ BLOCKED_INDIVIDUAL,
+ BLOCKED_GROUP,
+ GROUP_V1,
+ GROUP_V2_INVITE,
+ GROUP_V2_ADD,
+ INDIVIDUAL
+ }
+
+ public static final class MessageData {
+ private final Recipient recipient;
+ private final MessageClass messageClass;
+
+ public MessageData(@NonNull Recipient recipient, @NonNull MessageClass messageClass) {
+ this.recipient = recipient;
+ this.messageClass = messageClass;
+ }
+
+ public @NonNull Recipient getRecipient() {
+ return recipient;
+ }
+
+ public @NonNull MessageClass getMessageClass() {
+ return messageClass;
+ }
+ }
+
public static class Factory implements ViewModelProvider.Factory {
private final Context context;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.java
index cf18d3946..e7e4a7c8b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.java
@@ -60,23 +60,33 @@ public class MessageRequestsBottomView extends ConstraintLayout {
busyIndicator = findViewById(R.id.message_request_busy_indicator);
}
- public void setRecipient(@NonNull Recipient recipient) {
- if (recipient.isBlocked()) {
- if (recipient.isGroup()) {
+ public void setMessageData(@NonNull MessageRequestViewModel.MessageData messageData) {
+ Recipient recipient = messageData.getRecipient();
+
+ switch (messageData.getMessageClass()) {
+ case BLOCKED_INDIVIDUAL:
+ question.setText(HtmlCompat.fromHtml(getContext().getString(R.string.MessageRequestBottomView_do_you_want_to_let_s_message_you_wont_receive_any_messages_until_you_unblock_them,
+ HtmlUtil.bold(recipient.getShortDisplayName(getContext()))), 0));
+ setActiveInactiveGroups(blockedButtons, normalButtons);
+ break;
+ case BLOCKED_GROUP:
question.setText(R.string.MessageRequestBottomView_unblock_this_group_and_share_your_name_and_photo_with_its_members);
- } else {
- String name = recipient.getShortDisplayName(getContext());
- question.setText(HtmlCompat.fromHtml(getContext().getString(R.string.MessageRequestBottomView_do_you_want_to_let_s_message_you_wont_receive_any_messages_until_you_unblock_them, HtmlUtil.bold(name)), 0));
- }
- setActiveInactiveGroups(blockedButtons, normalButtons);
- } else {
- if (recipient.isGroup()) {
+ setActiveInactiveGroups(blockedButtons, normalButtons);
+ break;
+ case GROUP_V1:
+ case GROUP_V2_INVITE:
question.setText(R.string.MessageRequestBottomView_do_you_want_to_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept);
- } else {
- String name = recipient.getShortDisplayName(getContext());
- question.setText(HtmlCompat.fromHtml(getContext().getString(R.string.MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept, HtmlUtil.bold(name)), 0));
- }
- setActiveInactiveGroups(normalButtons, blockedButtons);
+ setActiveInactiveGroups(normalButtons, blockedButtons);
+ break;
+ case GROUP_V2_ADD:
+ question.setText(R.string.MessageRequestBottomView_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept);
+ setActiveInactiveGroups(normalButtons, blockedButtons);
+ break;
+ case INDIVIDUAL:
+ question.setText(HtmlCompat.fromHtml(getContext().getString(R.string.MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept,
+ HtmlUtil.bold(recipient.getShortDisplayName(getContext()))), 0));
+ setActiveInactiveGroups(normalButtons, blockedButtons);
+ break;
}
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/KbsEnclaveMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/KbsEnclaveMigrationJob.java
new file mode 100644
index 000000000..dff47afb7
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/KbsEnclaveMigrationJob.java
@@ -0,0 +1,53 @@
+package org.thoughtcrime.securesms.migrations;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobmanager.Data;
+import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobs.KbsEnclaveMigrationWorkerJob;
+
+/**
+ * A job to be run whenever we add a new KBS enclave. In order to prevent this moderately-expensive
+ * task from blocking the network for too long, this task simply enqueues another non-migration job,
+ * {@link KbsEnclaveMigrationWorkerJob}, to do the heavy lifting.
+ */
+public class KbsEnclaveMigrationJob extends MigrationJob {
+
+ public static final String KEY = "KbsEnclaveMigrationJob";
+
+ KbsEnclaveMigrationJob() {
+ this(new Parameters.Builder().build());
+ }
+
+ private KbsEnclaveMigrationJob(@NonNull Parameters parameters) {
+ super(parameters);
+ }
+
+ @Override
+ public boolean isUiBlocking() {
+ return false;
+ }
+
+ @Override
+ public @NonNull String getFactoryKey() {
+ return KEY;
+ }
+
+ @Override
+ public void performMigration() {
+ ApplicationDependencies.getJobManager().add(new KbsEnclaveMigrationWorkerJob());
+ }
+
+ @Override
+ boolean shouldRetry(@NonNull Exception e) {
+ return false;
+ }
+
+ public static class Factory implements Job.Factory {
+ @Override
+ public @NonNull KbsEnclaveMigrationJob create(@NonNull Parameters parameters, @NonNull Data data) {
+ return new KbsEnclaveMigrationJob(parameters);
+ }
+ }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java
index 29f83cfb2..ae561f0fb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java
@@ -53,7 +53,7 @@ public class AudioSlide extends Slide {
@Override
public boolean hasImage() {
- return true;
+ return false;
}
@Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/KbsEnclaves.java b/app/src/main/java/org/thoughtcrime/securesms/pin/KbsEnclaves.java
new file mode 100644
index 000000000..df0d209ed
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/KbsEnclaves.java
@@ -0,0 +1,26 @@
+package org.thoughtcrime.securesms.pin;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.BuildConfig;
+import org.thoughtcrime.securesms.KbsEnclave;
+import org.thoughtcrime.securesms.util.Util;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public final class KbsEnclaves {
+
+ public static @NonNull KbsEnclave current() {
+ return BuildConfig.KBS_ENCLAVE;
+ }
+
+ public static @NonNull List all() {
+ return Util.join(Collections.singletonList(BuildConfig.KBS_ENCLAVE), fallbacks());
+ }
+
+ public static @NonNull List fallbacks() {
+ return Arrays.asList(BuildConfig.KBS_FALLBACKS);
+ }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreRepository.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreRepository.java
index 5ac818d12..7b19c9d4b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreRepository.java
@@ -1,11 +1,15 @@
package org.thoughtcrime.securesms.pin;
-import androidx.annotation.NonNull;
+import android.os.Parcel;
+import android.os.Parcelable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.KbsEnclave;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobs.StorageAccountRestoreJob;
import org.thoughtcrime.securesms.jobs.StorageSyncJob;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.registration.service.KeyBackupSystemWrongPinException;
import org.thoughtcrime.securesms.util.Stopwatch;
@@ -21,32 +25,58 @@ import java.util.Objects;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
-class PinRestoreRepository {
+public class PinRestoreRepository {
private static final String TAG = Log.tag(PinRestoreRepository.class);
- private final Executor executor = SignalExecutors.UNBOUNDED;
- private final KeyBackupService kbs = ApplicationDependencies.getKeyBackupService();
+ private final Executor executor = SignalExecutors.UNBOUNDED;
void getToken(@NonNull Callback> callback) {
executor.execute(() -> {
try {
- String authorization = kbs.getAuthorization();
- TokenResponse token = kbs.getToken(authorization);
- TokenData tokenData = new TokenData(authorization, token);
- callback.onComplete(Optional.of(tokenData));
+ callback.onComplete(Optional.fromNullable(getTokenSync(null)));
} catch (IOException e) {
callback.onComplete(Optional.absent());
}
});
}
+ /**
+ * @param authorization If this is being called before the user is registered (i.e. as part of
+ * reglock), you must pass in an authorization token that can be used to
+ * retrieve a backup. Otherwise, pass in null and we'll fetch one.
+ */
+ public @NonNull TokenData getTokenSync(@Nullable String authorization) throws IOException {
+ TokenData firstKnownTokenData = null;
+
+ for (KbsEnclave enclave : KbsEnclaves.all()) {
+ KeyBackupService kbs = ApplicationDependencies.getKeyBackupService(enclave);
+
+ authorization = authorization == null ? kbs.getAuthorization() : authorization;
+
+ TokenResponse token = kbs.getToken(authorization);
+ TokenData tokenData = new TokenData(enclave, authorization, token);
+
+ if (tokenData.getTriesRemaining() > 0) {
+ Log.i(TAG, "Found data! " + enclave.getEnclaveName());
+ return tokenData;
+ } else if (firstKnownTokenData == null) {
+ Log.i(TAG, "No data, but storing as the first response. " + enclave.getEnclaveName());
+ firstKnownTokenData = tokenData;
+ } else {
+ Log.i(TAG, "No data, and we already have a 'first response'. " + enclave.getEnclaveName());
+ }
+ }
+
+ return Objects.requireNonNull(firstKnownTokenData);
+ }
+
void submitPin(@NonNull String pin, @NonNull TokenData tokenData, @NonNull Callback callback) {
executor.execute(() -> {
try {
Stopwatch stopwatch = new Stopwatch("PinSubmission");
- KbsPinData kbsData = PinState.restoreMasterKey(pin, tokenData.basicAuth, tokenData.tokenResponse);
+ KbsPinData kbsData = PinState.restoreMasterKey(pin, tokenData.getEnclave(), tokenData.getBasicAuth(), tokenData.getTokenResponse());
PinState.onSignalPinRestore(ApplicationDependencies.getApplication(), Objects.requireNonNull(kbsData), pin);
stopwatch.split("MasterKey");
@@ -64,7 +94,7 @@ class PinRestoreRepository {
} catch (KeyBackupSystemNoDataException e) {
callback.onComplete(new PinResultData(PinResult.LOCKED, tokenData));
} catch (KeyBackupSystemWrongPinException e) {
- callback.onComplete(new PinResultData(PinResult.INCORRECT, new TokenData(tokenData.basicAuth, e.getTokenResponse())));
+ callback.onComplete(new PinResultData(PinResult.INCORRECT, TokenData.withResponse(tokenData, e.getTokenResponse())));
}
});
}
@@ -73,18 +103,81 @@ class PinRestoreRepository {
void onComplete(@NonNull T value);
}
- static class TokenData {
+ public static class TokenData implements Parcelable {
+ private final KbsEnclave enclave;
private final String basicAuth;
private final TokenResponse tokenResponse;
- TokenData(@NonNull String basicAuth, @NonNull TokenResponse tokenResponse) {
+ TokenData(@NonNull KbsEnclave enclave, @NonNull String basicAuth, @NonNull TokenResponse tokenResponse) {
+ this.enclave = enclave;
this.basicAuth = basicAuth;
this.tokenResponse = tokenResponse;
}
- int getTriesRemaining() {
+ private TokenData(Parcel in) {
+ //noinspection ConstantConditions
+ this.enclave = new KbsEnclave(in.readString(), in.readString(), in.readString());
+ this.basicAuth = in.readString();
+
+ byte[] backupId = new byte[0];
+ byte[] token = new byte[0];
+
+ in.readByteArray(backupId);
+ in.readByteArray(token);
+
+ this.tokenResponse = new TokenResponse(backupId, token, in.readInt());
+ }
+
+ public static @NonNull TokenData withResponse(@NonNull TokenData data, @NonNull TokenResponse response) {
+ return new TokenData(data.getEnclave(), data.getBasicAuth(), response);
+ }
+
+ public int getTriesRemaining() {
return tokenResponse.getTries();
}
+
+ public @NonNull String getBasicAuth() {
+ return basicAuth;
+ }
+
+ public @NonNull TokenResponse getTokenResponse() {
+ return tokenResponse;
+ }
+
+ public @NonNull KbsEnclave getEnclave() {
+ return enclave;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeString(enclave.getEnclaveName());
+ dest.writeString(enclave.getServiceId());
+ dest.writeString(enclave.getMrEnclave());
+
+ dest.writeString(basicAuth);
+
+ dest.writeByteArray(tokenResponse.getBackupId());
+ dest.writeByteArray(tokenResponse.getToken());
+ dest.writeInt(tokenResponse.getTries());
+ }
+
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public TokenData createFromParcel(Parcel in) {
+ return new TokenData(in);
+ }
+
+ @Override
+ public TokenData[] newArray(int size) {
+ return new TokenData[size];
+ }
+ };
+
}
static class PinResultData {
@@ -92,7 +185,7 @@ class PinRestoreRepository {
private final TokenData tokenData;
PinResultData(@NonNull PinResult result, @NonNull TokenData tokenData) {
- this.result = result;
+ this.result = result;
this.tokenData = tokenData;
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java
index 20faacb49..0c9cbd520 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java
@@ -6,8 +6,11 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
+import org.thoughtcrime.securesms.BuildConfig;
+import org.thoughtcrime.securesms.KbsEnclave;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JobTracker;
+import org.thoughtcrime.securesms.jobs.ClearFallbackKbsEnclaveJob;
import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
import org.thoughtcrime.securesms.jobs.StorageForcePushJob;
import org.thoughtcrime.securesms.keyvalue.KbsValues;
@@ -26,12 +29,14 @@ import org.whispersystems.signalservice.api.KeyBackupServicePinException;
import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;
import org.whispersystems.signalservice.api.kbs.HashedPin;
import org.whispersystems.signalservice.api.kbs.MasterKey;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse;
import java.io.IOException;
import java.security.SecureRandom;
import java.util.Arrays;
+import java.util.List;
import java.util.Locale;
import java.util.concurrent.TimeUnit;
@@ -46,6 +51,7 @@ public final class PinState {
* Does not affect {@link PinState}.
*/
public static synchronized @Nullable KbsPinData restoreMasterKey(@Nullable String pin,
+ @NonNull KbsEnclave enclave,
@Nullable String basicStorageCredentials,
@NonNull TokenResponse tokenResponse)
throws IOException, KeyBackupSystemWrongPinException, KeyBackupSystemNoDataException
@@ -58,20 +64,31 @@ public final class PinState {
throw new AssertionError("Cannot restore KBS key, no storage credentials supplied");
}
- KeyBackupService keyBackupService = ApplicationDependencies.getKeyBackupService();
+ Log.i(TAG, "Preparing to restore from " + enclave.getEnclaveName());
+ return restoreMasterKeyFromEnclave(enclave, pin, basicStorageCredentials, tokenResponse);
+ }
- Log.i(TAG, "Opening key backup service session");
- KeyBackupService.RestoreSession session = keyBackupService.newRegistrationSession(basicStorageCredentials, tokenResponse);
+ private static @NonNull KbsPinData restoreMasterKeyFromEnclave(@NonNull KbsEnclave enclave,
+ @NonNull String pin,
+ @NonNull String basicStorageCredentials,
+ @NonNull TokenResponse tokenResponse)
+ throws IOException, KeyBackupSystemWrongPinException, KeyBackupSystemNoDataException
+ {
+ KeyBackupService keyBackupService = ApplicationDependencies.getKeyBackupService(enclave);
+ KeyBackupService.RestoreSession session = keyBackupService.newRegistrationSession(basicStorageCredentials, tokenResponse);
try {
Log.i(TAG, "Restoring pin from KBS");
+
HashedPin hashedPin = PinHashing.hashPin(pin, session);
KbsPinData kbsData = session.restorePin(hashedPin);
+
if (kbsData != null) {
Log.i(TAG, "Found registration lock token on KBS.");
} else {
throw new AssertionError("Null not expected");
}
+
return kbsData;
} catch (UnauthenticatedResponseException e) {
Log.w(TAG, "Failed to restore key", e);
@@ -90,7 +107,7 @@ public final class PinState {
@Nullable String pin,
boolean hasPinToRestore)
{
- Log.i(TAG, "onNewRegistration()");
+ Log.i(TAG, "onRegistration()");
TextSecurePreferences.setV1RegistrationLockPin(context, pin);
@@ -106,7 +123,8 @@ public final class PinState {
SignalStore.kbsValues().setV2RegistrationLockEnabled(true);
SignalStore.kbsValues().setKbsMasterKey(kbsData, pin);
SignalStore.pinValues().resetPinReminders();
- resetPinRetryCount(context, pin, kbsData);
+ resetPinRetryCount(context, pin);
+ ClearFallbackKbsEnclaveJob.clearAll();
} else if (hasPinToRestore) {
Log.i(TAG, "Has a PIN to restore.");
SignalStore.kbsValues().clearRegistrationLockAndPin();
@@ -131,7 +149,8 @@ public final class PinState {
SignalStore.kbsValues().setV2RegistrationLockEnabled(false);
SignalStore.pinValues().resetPinReminders();
SignalStore.storageServiceValues().setNeedsAccountRestore(false);
- resetPinRetryCount(context, pin, kbsData);
+ resetPinRetryCount(context, pin);
+ ClearFallbackKbsEnclaveJob.clearAll();
updateState(buildInferredStateFromOtherFields());
}
@@ -158,7 +177,7 @@ public final class PinState {
KbsValues kbsValues = SignalStore.kbsValues();
boolean isFirstPin = !kbsValues.hasPin() || kbsValues.hasOptedOut();
MasterKey masterKey = kbsValues.getOrCreateMasterKey();
- KeyBackupService keyBackupService = ApplicationDependencies.getKeyBackupService();
+ KeyBackupService keyBackupService = ApplicationDependencies.getKeyBackupService(KbsEnclaves.current());
KeyBackupService.PinChangeSession pinChangeSession = keyBackupService.newPinChangeSession();
HashedPin hashedPin = PinHashing.hashPin(pin, pinChangeSession);
KbsPinData kbsData = pinChangeSession.setPin(hashedPin, masterKey);
@@ -217,7 +236,7 @@ public final class PinState {
assertState(State.PIN_WITH_REGISTRATION_LOCK_DISABLED);
SignalStore.kbsValues().setV2RegistrationLockEnabled(false);
- ApplicationDependencies.getKeyBackupService()
+ ApplicationDependencies.getKeyBackupService(KbsEnclaves.current())
.newPinChangeSession(SignalStore.kbsValues().getRegistrationLockTokenResponse())
.enableRegistrationLock(SignalStore.kbsValues().getOrCreateMasterKey());
SignalStore.kbsValues().setV2RegistrationLockEnabled(true);
@@ -240,7 +259,7 @@ public final class PinState {
assertState(State.PIN_WITH_REGISTRATION_LOCK_ENABLED);
SignalStore.kbsValues().setV2RegistrationLockEnabled(true);
- ApplicationDependencies.getKeyBackupService()
+ ApplicationDependencies.getKeyBackupService(KbsEnclaves.current())
.newPinChangeSession(SignalStore.kbsValues().getRegistrationLockTokenResponse())
.disableRegistrationLock();
SignalStore.kbsValues().setV2RegistrationLockEnabled(false);
@@ -259,7 +278,7 @@ public final class PinState {
KbsValues kbsValues = SignalStore.kbsValues();
MasterKey masterKey = kbsValues.getOrCreateMasterKey();
- KeyBackupService keyBackupService = ApplicationDependencies.getKeyBackupService();
+ KeyBackupService keyBackupService = ApplicationDependencies.getKeyBackupService(KbsEnclaves.current());
KeyBackupService.PinChangeSession pinChangeSession = keyBackupService.newPinChangeSession();
HashedPin hashedPin = PinHashing.hashPin(pin, pinChangeSession);
KbsPinData kbsData = pinChangeSession.setPin(hashedPin, masterKey);
@@ -272,6 +291,22 @@ public final class PinState {
updateState(buildInferredStateFromOtherFields());
}
+ /**
+ * Should only be called by {@link org.thoughtcrime.securesms.jobs.KbsEnclaveMigrationWorkerJob}.
+ */
+ @WorkerThread
+ public static synchronized void onMigrateToNewEnclave(@NonNull String pin)
+ throws IOException, UnauthenticatedResponseException
+ {
+ Log.i(TAG, "onMigrateToNewEnclave()");
+ assertState(State.PIN_WITH_REGISTRATION_LOCK_DISABLED, State.PIN_WITH_REGISTRATION_LOCK_ENABLED);
+
+ Log.i(TAG, "Migrating to enclave " + KbsEnclaves.current().getEnclaveName());
+ setPinOnEnclave(KbsEnclaves.current(), pin, SignalStore.kbsValues().getOrCreateMasterKey());
+
+ ClearFallbackKbsEnclaveJob.clearAll();
+ }
+
@WorkerThread
private static void bestEffortRefreshAttributes() {
Optional result = ApplicationDependencies.getJobManager().runSynchronously(new RefreshAttributesJob(), TimeUnit.SECONDS.toMillis(10));
@@ -301,23 +336,14 @@ public final class PinState {
}
@WorkerThread
- private static void resetPinRetryCount(@NonNull Context context, @Nullable String pin, @NonNull KbsPinData kbsData) {
+ private static void resetPinRetryCount(@NonNull Context context, @Nullable String pin) {
if (pin == null) {
return;
}
- KeyBackupService keyBackupService = ApplicationDependencies.getKeyBackupService();
-
try {
- KbsValues kbsValues = SignalStore.kbsValues();
- MasterKey masterKey = kbsValues.getOrCreateMasterKey();
- KeyBackupService.PinChangeSession pinChangeSession = keyBackupService.newPinChangeSession(kbsData.getTokenResponse());
- HashedPin hashedPin = PinHashing.hashPin(pin, pinChangeSession);
- KbsPinData newData = pinChangeSession.setPin(hashedPin, masterKey);
-
- kbsValues.setKbsMasterKey(newData, pin);
+ setPinOnEnclave(KbsEnclaves.current(), pin, SignalStore.kbsValues().getOrCreateMasterKey());
TextSecurePreferences.clearRegistrationLockV1(context);
-
Log.i(TAG, "Pin set/attempts reset on KBS");
} catch (IOException e) {
Log.w(TAG, "May have failed to reset pin attempts!", e);
@@ -326,6 +352,20 @@ public final class PinState {
}
}
+ @WorkerThread
+ private static @NonNull KbsPinData setPinOnEnclave(@NonNull KbsEnclave enclave, @NonNull String pin, @NonNull MasterKey masterKey)
+ throws IOException, UnauthenticatedResponseException
+ {
+ KeyBackupService kbs = ApplicationDependencies.getKeyBackupService(enclave);
+ KeyBackupService.PinChangeSession pinChangeSession = kbs.newPinChangeSession();
+ HashedPin hashedPin = PinHashing.hashPin(pin, pinChangeSession);
+ KbsPinData newData = pinChangeSession.setPin(hashedPin, masterKey);
+
+ SignalStore.kbsValues().setKbsMasterKey(newData, pin);
+
+ return newData;
+ }
+
@WorkerThread
private static void optOutOfPin() {
SignalStore.kbsValues().optOut();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
index 9ee867d49..d97ad07dd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -102,8 +102,6 @@ public class Recipient {
private final Capability groupsV2Capability;
private final InsightsBannerTier insightsBannerTier;
private final byte[] storageId;
- private final byte[] identityKey;
- private final VerifiedStatus identityStatus;
private final MentionSetting mentionSetting;
@@ -317,8 +315,6 @@ public class Recipient {
this.uuidCapability = Capability.UNKNOWN;
this.groupsV2Capability = Capability.UNKNOWN;
this.storageId = null;
- this.identityKey = null;
- this.identityStatus = VerifiedStatus.DEFAULT;
this.mentionSetting = MentionSetting.ALWAYS_NOTIFY;
}
@@ -361,8 +357,6 @@ public class Recipient {
this.uuidCapability = details.uuidCapability;
this.groupsV2Capability = details.groupsV2Capability;
this.storageId = details.storageId;
- this.identityKey = details.identityKey;
- this.identityStatus = details.identityStatus;
this.mentionSetting = details.mentionSetting;
}
@@ -782,14 +776,6 @@ public class Recipient {
return storageId;
}
- public @NonNull VerifiedStatus getIdentityVerifiedStatus() {
- return identityStatus;
- }
-
- public @Nullable byte[] getIdentityKey() {
- return identityKey;
- }
-
public @NonNull UnidentifiedAccessMode getUnidentifiedAccessMode() {
return unidentifiedAccessMode;
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java
index 010f12ce2..f23bac94b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java
@@ -65,9 +65,7 @@ public class RecipientDetails {
final Recipient.Capability uuidCapability;
final Recipient.Capability groupsV2Capability;
final InsightsBannerTier insightsBannerTier;
- final byte[] storageId;
- final byte[] identityKey;
- final VerifiedStatus identityStatus;
+ final byte[] storageId;
final MentionSetting mentionSetting;
public RecipientDetails(@Nullable String name,
@@ -113,8 +111,6 @@ public class RecipientDetails {
this.groupsV2Capability = settings.getGroupsV2Capability();
this.insightsBannerTier = settings.getInsightsBannerTier();
this.storageId = settings.getStorageId();
- this.identityKey = settings.getIdentityKey();
- this.identityStatus = settings.getIdentityStatus();
this.mentionSetting = settings.getMentionSetting();
if (name == null) this.name = settings.getSystemDisplayName();
@@ -162,8 +158,6 @@ public class RecipientDetails {
this.uuidCapability = Recipient.Capability.UNKNOWN;
this.groupsV2Capability = Recipient.Capability.UNKNOWN;
this.storageId = null;
- this.identityKey = null;
- this.identityStatus = VerifiedStatus.DEFAULT;
this.mentionSetting = MentionSetting.ALWAYS_NOTIFY;
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsDialogFragment.java
index a587e5ceb..d28ae22e7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsDialogFragment.java
@@ -71,9 +71,9 @@ public class CustomNotificationsDialogFragment extends DialogFragment {
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (ThemeUtil.isDarkTheme(requireActivity())) {
- setStyle(STYLE_NO_FRAME, R.style.TextSecure_DarkTheme);
+ setStyle(STYLE_NO_FRAME, R.style.TextSecure_DarkTheme_AnimatedDialog);
} else {
- setStyle(STYLE_NO_FRAME, R.style.TextSecure_LightTheme);
+ setStyle(STYLE_NO_FRAME, R.style.TextSecure_LightTheme_AnimatedDialog);
}
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkDialogFragment.java
index 81262831e..830ebdaf6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkDialogFragment.java
@@ -10,6 +10,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
import androidx.appcompat.widget.SwitchCompat;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.DialogFragment;
@@ -43,8 +44,8 @@ public final class ShareableGroupLinkDialogFragment extends DialogFragment {
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setStyle(STYLE_NO_FRAME, ThemeUtil.isDarkTheme(requireActivity()) ? R.style.TextSecure_DarkTheme
- : R.style.TextSecure_LightTheme);
+ setStyle(STYLE_NO_FRAME, ThemeUtil.isDarkTheme(requireActivity()) ? R.style.TextSecure_DarkTheme_AnimatedDialog
+ : R.style.TextSecure_LightTheme_AnimatedDialog);
}
@Override
@@ -101,16 +102,19 @@ public final class ShareableGroupLinkDialogFragment extends DialogFragment {
shareRow.setOnClickListener(v -> GroupLinkBottomSheetDialogFragment.show(requireFragmentManager(), groupId));
- shareableGroupLinkRow.setOnClickListener(v -> viewModel.onToggleGroupLink(requireContext()));
- approveNewMembersRow.setOnClickListener(v -> viewModel.onToggleApproveMembers(requireContext()));
- resetLinkRow.setOnClickListener(v ->
- new AlertDialog.Builder(requireContext())
- .setMessage(R.string.ShareableGroupLinkDialogFragment__are_you_sure_you_want_to_reset_the_group_link)
- .setPositiveButton(R.string.ShareableGroupLinkDialogFragment__reset_link, (dialog, which) -> viewModel.onResetLink(requireContext()))
- .setNegativeButton(android.R.string.cancel, null)
- .show());
+ viewModel.getCanEdit().observe(getViewLifecycleOwner(), canEdit -> {
+ if (canEdit) {
+ shareableGroupLinkRow.setOnClickListener(v -> viewModel.onToggleGroupLink());
+ approveNewMembersRow.setOnClickListener(v -> viewModel.onToggleApproveMembers());
+ resetLinkRow.setOnClickListener(v -> onResetGroupLink());
+ } else {
+ shareableGroupLinkRow.setOnClickListener(v -> toast(R.string.ManageGroupActivity_only_admins_can_enable_or_disable_the_sharable_group_link));
+ approveNewMembersRow.setOnClickListener(v -> toast(R.string.ManageGroupActivity_only_admins_can_enable_or_disable_the_option_to_approve_new_members));
+ resetLinkRow.setOnClickListener(v -> toast(R.string.ManageGroupActivity_only_admins_can_reset_the_sharable_group_link));
+ }
+ });
- viewModel.getToasts().observe(getViewLifecycleOwner(), t -> Toast.makeText(requireContext(), t, Toast.LENGTH_SHORT).show());
+ viewModel.getToasts().observe(getViewLifecycleOwner(), this::toast);
viewModel.getBusy().observe(getViewLifecycleOwner(), busy -> {
if (busy) {
@@ -126,6 +130,18 @@ public final class ShareableGroupLinkDialogFragment extends DialogFragment {
});
}
+ private void onResetGroupLink() {
+ new AlertDialog.Builder(requireContext())
+ .setMessage(R.string.ShareableGroupLinkDialogFragment__are_you_sure_you_want_to_reset_the_group_link)
+ .setPositiveButton(R.string.ShareableGroupLinkDialogFragment__reset_link, (dialog, which) -> viewModel.onResetLink())
+ .setNegativeButton(android.R.string.cancel, null)
+ .show();
+ }
+
+ protected void toast(@StringRes int message) {
+ Toast.makeText(requireContext(), getString(message), Toast.LENGTH_SHORT).show();
+ }
+
/**
* Inserts zero width space characters between each character in the original ensuring it takes
* the full width of the TextView.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkViewModel.java
index c95be3d5e..dcc73a111 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/sharablegrouplink/ShareableGroupLinkViewModel.java
@@ -1,14 +1,11 @@
package org.thoughtcrime.securesms.recipients.ui.sharablegrouplink;
-import android.content.Context;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.ViewModel;
import androidx.lifecycle.ViewModelProvider;
-import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.groups.GroupId;
import org.thoughtcrime.securesms.groups.LiveGroup;
import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason;
@@ -21,12 +18,16 @@ final class ShareableGroupLinkViewModel extends ViewModel {
private final ShareableGroupLinkRepository repository;
private final LiveData groupLink;
- private final SingleLiveEvent toasts;
+ private final SingleLiveEvent toasts;
private final SingleLiveEvent busy;
+ private final LiveData canEdit;
private ShareableGroupLinkViewModel(@NonNull GroupId.V2 groupId, @NonNull ShareableGroupLinkRepository repository) {
+ LiveGroup liveGroup = new LiveGroup(groupId);
+
this.repository = repository;
- this.groupLink = new LiveGroup(groupId).getGroupLink();
+ this.groupLink = liveGroup.getGroupLink();
+ this.canEdit = liveGroup.isSelfAdmin();
this.toasts = new SingleLiveEvent<>();
this.busy = new SingleLiveEvent<>();
}
@@ -35,7 +36,7 @@ final class ShareableGroupLinkViewModel extends ViewModel {
return groupLink;
}
- LiveData getToasts() {
+ LiveData getToasts() {
return toasts;
}
@@ -43,7 +44,11 @@ final class ShareableGroupLinkViewModel extends ViewModel {
return busy;
}
- void onToggleGroupLink(@NonNull Context context) {
+ LiveData getCanEdit() {
+ return canEdit;
+ }
+
+ void onToggleGroupLink() {
busy.setValue(true);
repository.toggleGroupLinkEnabled(new AsynchronousCallback.WorkerThread() {
@Override
@@ -54,12 +59,12 @@ final class ShareableGroupLinkViewModel extends ViewModel {
@Override
public void onError(@Nullable GroupChangeFailureReason error) {
busy.postValue(false);
- toasts.postValue(context.getString(GroupErrors.getUserDisplayMessage(error)));
+ toasts.postValue(GroupErrors.getUserDisplayMessage(error));
}
});
}
- void onToggleApproveMembers(@NonNull Context context) {
+ void onToggleApproveMembers() {
busy.setValue(true);
repository.toggleGroupLinkApprovalRequired(new AsynchronousCallback.WorkerThread() {
@Override
@@ -70,24 +75,23 @@ final class ShareableGroupLinkViewModel extends ViewModel {
@Override
public void onError(@Nullable GroupChangeFailureReason error) {
busy.postValue(false);
- toasts.postValue(context.getString(GroupErrors.getUserDisplayMessage(error)));
+ toasts.postValue(GroupErrors.getUserDisplayMessage(error));
}
});
}
- void onResetLink(@NonNull Context context) {
+ void onResetLink() {
busy.setValue(true);
repository.cycleGroupLinkPassword(new AsynchronousCallback.WorkerThread() {
@Override
public void onComplete(@Nullable Void result) {
busy.postValue(false);
- toasts.postValue(context.getString(R.string.ShareableGroupLinkDialogFragment__group_link_reset));
}
@Override
public void onError(@Nullable GroupChangeFailureReason error) {
busy.postValue(false);
- toasts.postValue(context.getString(GroupErrors.getUserDisplayMessage(error)));
+ toasts.postValue(GroupErrors.getUserDisplayMessage(error));
}
});
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java
index 5c6d93320..23337840b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java
@@ -22,6 +22,7 @@ import org.thoughtcrime.securesms.components.registration.CallMeCountDownView;
import org.thoughtcrime.securesms.components.registration.VerificationCodeView;
import org.thoughtcrime.securesms.components.registration.VerificationPinKeyboard;
import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.pin.PinRestoreRepository;
import org.thoughtcrime.securesms.registration.ReceivedSmsEvent;
import org.thoughtcrime.securesms.registration.service.CodeVerificationRequest;
import org.thoughtcrime.securesms.registration.service.RegistrationCodeRequest;
@@ -30,7 +31,6 @@ import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
import org.thoughtcrime.securesms.util.CommunicationActions;
import org.thoughtcrime.securesms.util.SupportEmailUtil;
import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
-import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse;
import java.util.ArrayList;
import java.util.Collections;
@@ -107,7 +107,7 @@ public final class EnterCodeFragment extends BaseRegistrationFragment {
RegistrationService registrationService = RegistrationService.getInstance(model.getNumber().getE164Number(), model.getRegistrationSecret());
- registrationService.verifyAccount(requireActivity(), model.getFcmToken(), code, null, null, null,
+ registrationService.verifyAccount(requireActivity(), model.getFcmToken(), code, null, null,
new CodeVerificationRequest.VerifyCallback() {
@Override
@@ -133,10 +133,9 @@ public final class EnterCodeFragment extends BaseRegistrationFragment {
}
@Override
- public void onKbsRegistrationLockPinRequired(long timeRemaining, @NonNull TokenResponse tokenResponse, @NonNull String kbsStorageCredentials) {
+ public void onKbsRegistrationLockPinRequired(long timeRemaining, @NonNull PinRestoreRepository.TokenData tokenData, @NonNull String kbsStorageCredentials) {
model.setLockedTimeRemaining(timeRemaining);
- model.setStorageCredentials(kbsStorageCredentials);
- model.setKeyBackupCurrentToken(tokenResponse);
+ model.setKeyBackupTokenData(tokenData);
keyboard.displayLocked().addListener(new AssertedSuccessListener() {
@Override
public void onSuccess(Boolean r) {
@@ -147,7 +146,7 @@ public final class EnterCodeFragment extends BaseRegistrationFragment {
}
@Override
- public void onIncorrectKbsRegistrationLockPin(@NonNull TokenResponse tokenResponse) {
+ public void onIncorrectKbsRegistrationLockPin(@NonNull PinRestoreRepository.TokenData tokenData) {
throw new AssertionError("Unexpected, user has made no pin guesses");
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
index 35e4b6559..c48cc6cf5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
@@ -25,12 +25,12 @@ import org.thoughtcrime.securesms.jobs.StorageAccountRestoreJob;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.lock.v2.PinKeyboardType;
import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.pin.PinRestoreRepository.TokenData;
import org.thoughtcrime.securesms.registration.service.CodeVerificationRequest;
import org.thoughtcrime.securesms.registration.service.RegistrationService;
import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
import org.thoughtcrime.securesms.util.ServiceUtil;
import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
-import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse;
import java.util.concurrent.TimeUnit;
@@ -106,10 +106,10 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
getModel().getLockedTimeRemaining()
.observe(getViewLifecycleOwner(), t -> timeRemaining = t);
- TokenResponse keyBackupCurrentToken = getModel().getKeyBackupCurrentToken();
+ TokenData keyBackupCurrentToken = getModel().getKeyBackupCurrentToken();
if (keyBackupCurrentToken != null) {
- int triesRemaining = keyBackupCurrentToken.getTries();
+ int triesRemaining = keyBackupCurrentToken.getTriesRemaining();
if (triesRemaining <= 3) {
int daysRemaining = getLockoutDays(timeRemaining);
@@ -158,8 +158,7 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
RegistrationViewModel model = getModel();
RegistrationService registrationService = RegistrationService.getInstance(model.getNumber().getE164Number(), model.getRegistrationSecret());
- TokenResponse tokenResponse = model.getKeyBackupCurrentToken();
- String basicStorageCredentials = model.getBasicStorageCredentials();
+ TokenData tokenData = model.getKeyBackupCurrentToken();
setSpinning(pinButton);
@@ -167,8 +166,7 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
model.getFcmToken(),
model.getTextCodeEntered(),
pin,
- basicStorageCredentials,
- tokenResponse,
+ tokenData,
new CodeVerificationRequest.VerifyCallback() {
@@ -189,19 +187,19 @@ public final class RegistrationLockFragment extends BaseRegistrationFragment {
}
@Override
- public void onKbsRegistrationLockPinRequired(long timeRemaining, @NonNull TokenResponse kbsTokenResponse, @NonNull String kbsStorageCredentials) {
+ public void onKbsRegistrationLockPinRequired(long timeRemaining, @NonNull TokenData kbsTokenData, @NonNull String kbsStorageCredentials) {
throw new AssertionError("Not expected after a pin guess");
}
@Override
- public void onIncorrectKbsRegistrationLockPin(@NonNull TokenResponse tokenResponse) {
+ public void onIncorrectKbsRegistrationLockPin(@NonNull TokenData tokenData) {
cancelSpinning(pinButton);
pinEntry.getText().clear();
enableAndFocusPinEntry();
- model.setKeyBackupCurrentToken(tokenResponse);
+ model.setKeyBackupTokenData(tokenData);
- int triesRemaining = tokenResponse.getTries();
+ int triesRemaining = tokenData.getTriesRemaining();
if (triesRemaining == 0) {
Log.w(TAG, "Account locked. User out of attempts on KBS.");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java b/app/src/main/java/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java
index c6088ba43..2bebb0a1e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/service/CodeVerificationRequest.java
@@ -22,6 +22,8 @@ import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
import org.thoughtcrime.securesms.jobs.RotateCertificateJob;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.pin.PinRestoreRepository;
+import org.thoughtcrime.securesms.pin.PinRestoreRepository.TokenData;
import org.thoughtcrime.securesms.pin.PinState;
import org.thoughtcrime.securesms.push.AccountManagerFactory;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -65,41 +67,40 @@ public final class CodeVerificationRequest {
/**
* Asynchronously verify the account via the code.
*
- * @param fcmToken The FCM token for the device.
- * @param code The code that was delivered to the user.
- * @param pin The users registration pin.
- * @param callback Exactly one method on this callback will be called.
- * @param kbsTokenResponse By keeping the token, on failure, a newly returned token will be reused in subsequent pin
- * attempts, preventing certain attacks, we can also track the attempts making missing replies easier to spot.
+ * @param fcmToken The FCM token for the device.
+ * @param code The code that was delivered to the user.
+ * @param pin The users registration pin.
+ * @param callback Exactly one method on this callback will be called.
+ * @param kbsTokenData By keeping the token, on failure, a newly returned token will be reused in subsequent pin
+ * attempts, preventing certain attacks, we can also track the attempts making missing replies easier to spot.
*/
static void verifyAccount(@NonNull Context context,
@NonNull Credentials credentials,
@Nullable String fcmToken,
@NonNull String code,
@Nullable String pin,
- @Nullable String basicStorageCredentials,
- @Nullable TokenResponse kbsTokenResponse,
+ @Nullable TokenData kbsTokenData,
@NonNull VerifyCallback callback)
{
new AsyncTask() {
private volatile LockedException lockedException;
- private volatile TokenResponse kbsToken;
+ private volatile TokenData tokenData;
@Override
protected Result doInBackground(Void... voids) {
final boolean pinSupplied = pin != null;
- final boolean tryKbs = kbsTokenResponse != null;
+ final boolean tryKbs = tokenData != null;
try {
- kbsToken = kbsTokenResponse;
- verifyAccount(context, credentials, code, pin, kbsTokenResponse, basicStorageCredentials, fcmToken);
+ this.tokenData = kbsTokenData;
+ verifyAccount(context, credentials, code, pin, tokenData, fcmToken);
return Result.SUCCESS;
} catch (KeyBackupSystemNoDataException e) {
Log.w(TAG, "No data found on KBS");
return Result.KBS_ACCOUNT_LOCKED;
} catch (KeyBackupSystemWrongPinException e) {
- kbsToken = e.getTokenResponse();
+ tokenData = TokenData.withResponse(tokenData, e.getTokenResponse());
return Result.KBS_WRONG_PIN;
} catch (LockedException e) {
if (pinSupplied && tryKbs) {
@@ -110,8 +111,8 @@ public final class CodeVerificationRequest {
lockedException = e;
if (e.getBasicStorageCredentials() != null) {
try {
- kbsToken = getToken(e.getBasicStorageCredentials());
- if (kbsToken == null || kbsToken.getTries() == 0) {
+ tokenData = getToken(e.getBasicStorageCredentials());
+ if (tokenData == null || tokenData.getTriesRemaining() == 0) {
return Result.KBS_ACCOUNT_LOCKED;
}
} catch (IOException ex) {
@@ -137,12 +138,12 @@ public final class CodeVerificationRequest {
callback.onSuccessfulRegistration();
break;
case PIN_LOCKED:
- if (kbsToken != null) {
+ if (tokenData != null) {
if (lockedException.getBasicStorageCredentials() == null) {
throw new AssertionError("KBS Token set, but no storage credentials supplied.");
}
Log.w(TAG, "Reg Locked: V2 pin needed for registration");
- callback.onKbsRegistrationLockPinRequired(lockedException.getTimeRemaining(), kbsToken, lockedException.getBasicStorageCredentials());
+ callback.onKbsRegistrationLockPinRequired(lockedException.getTimeRemaining(), tokenData, lockedException.getBasicStorageCredentials());
} else {
Log.w(TAG, "Reg Locked: V1 pin needed for registration");
callback.onV1RegistrationLockPinRequiredOrIncorrect(lockedException.getTimeRemaining());
@@ -156,7 +157,7 @@ public final class CodeVerificationRequest {
break;
case KBS_WRONG_PIN:
Log.w(TAG, "KBS Pin was wrong");
- callback.onIncorrectKbsRegistrationLockPin(kbsToken);
+ callback.onIncorrectKbsRegistrationLockPin(tokenData);
break;
case KBS_ACCOUNT_LOCKED:
Log.w(TAG, "KBS Account is locked");
@@ -167,9 +168,9 @@ public final class CodeVerificationRequest {
}.executeOnExecutor(SignalExecutors.UNBOUNDED);
}
- private static TokenResponse getToken(@Nullable String basicStorageCredentials) throws IOException {
+ private static TokenData getToken(@Nullable String basicStorageCredentials) throws IOException {
if (basicStorageCredentials == null) return null;
- return ApplicationDependencies.getKeyBackupService().getToken(basicStorageCredentials);
+ return new PinRestoreRepository().getTokenSync(basicStorageCredentials);
}
private static void handleSuccessfulRegistration(@NonNull Context context) {
@@ -185,12 +186,11 @@ public final class CodeVerificationRequest {
@NonNull Credentials credentials,
@NonNull String code,
@Nullable String pin,
- @Nullable TokenResponse kbsTokenResponse,
- @Nullable String kbsStorageCredentials,
+ @Nullable TokenData kbsTokenData,
@Nullable String fcmToken)
throws IOException, KeyBackupSystemWrongPinException, KeyBackupSystemNoDataException
{
- boolean isV2RegistrationLock = kbsTokenResponse != null;
+ boolean isV2RegistrationLock = kbsTokenData != null;
int registrationId = KeyHelper.generateRegistrationId(false);
boolean universalUnidentifiedAccess = TextSecurePreferences.isUniversalUnidentifiedAccess(context);
ProfileKey profileKey = findExistingProfileKey(context, credentials.getE164number());
@@ -206,7 +206,7 @@ public final class CodeVerificationRequest {
SessionUtil.archiveAllSessions(context);
SignalServiceAccountManager accountManager = AccountManagerFactory.createUnauthenticated(context, credentials.getE164number(), credentials.getPassword());
- KbsPinData kbsData = isV2RegistrationLock ? PinState.restoreMasterKey(pin, kbsStorageCredentials, kbsTokenResponse) : null;
+ KbsPinData kbsData = isV2RegistrationLock ? PinState.restoreMasterKey(pin, kbsTokenData.getEnclave(), kbsTokenData.getBasicAuth(), kbsTokenData.getTokenResponse()) : null;
String registrationLockV2 = kbsData != null ? kbsData.getMasterKey().deriveRegistrationLock() : null;
String registrationLockV1 = isV2RegistrationLock ? null : pin;
boolean hasFcm = fcmToken != null;
@@ -292,14 +292,14 @@ public final class CodeVerificationRequest {
/**
* The account is locked with a V2 (KBS) pin. Called before any user pin guesses.
*/
- void onKbsRegistrationLockPinRequired(long timeRemaining, @NonNull TokenResponse kbsTokenResponse, @NonNull String kbsStorageCredentials);
+ void onKbsRegistrationLockPinRequired(long timeRemaining, @NonNull TokenData kbsTokenData, @NonNull String kbsStorageCredentials);
/**
* The account is locked with a V2 (KBS) pin. Called after a user pin guess.
*
* i.e. an attempt has likely been used.
*/
- void onIncorrectKbsRegistrationLockPin(@NonNull TokenResponse kbsTokenResponse);
+ void onIncorrectKbsRegistrationLockPin(@NonNull TokenData kbsTokenResponse);
/**
* V2 (KBS) pin is set, but there is no data on KBS.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/service/RegistrationService.java b/app/src/main/java/org/thoughtcrime/securesms/registration/service/RegistrationService.java
index 29ce4052b..d89a0f90f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/service/RegistrationService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/service/RegistrationService.java
@@ -5,6 +5,7 @@ import android.app.Activity;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import org.thoughtcrime.securesms.pin.PinRestoreRepository;
import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse;
import java.io.IOException;
@@ -39,10 +40,9 @@ public final class RegistrationService {
@Nullable String fcmToken,
@NonNull String code,
@Nullable String pin,
- @Nullable String basicStorageCredentials,
- @Nullable TokenResponse tokenResponse,
+ @Nullable PinRestoreRepository.TokenData tokenData,
@NonNull CodeVerificationRequest.VerifyCallback callback)
{
- CodeVerificationRequest.verifyAccount(activity, credentials, fcmToken, code, pin, basicStorageCredentials, tokenResponse, callback);
+ CodeVerificationRequest.verifyAccount(activity, credentials, fcmToken, code, pin, tokenData, callback);
}
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
index c3894dea3..b851d95fb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
@@ -9,6 +9,7 @@ import androidx.lifecycle.SavedStateHandle;
import androidx.lifecycle.ViewModel;
import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.pin.PinRestoreRepository.TokenData;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse;
import org.whispersystems.signalservice.internal.util.JsonUtil;
@@ -28,11 +29,10 @@ public final class RegistrationViewModel extends ViewModel {
private final MutableLiveData textCodeEntered;
private final MutableLiveData captchaToken;
private final MutableLiveData fcmToken;
- private final MutableLiveData basicStorageCredentials;
private final MutableLiveData restoreFlowShown;
private final MutableLiveData successfulCodeRequestAttempts;
private final MutableLiveData requestLimiter;
- private final MutableLiveData keyBackupCurrentTokenJson;
+ private final MutableLiveData kbsTokenData;
private final MutableLiveData lockedTimeRemaining;
private final MutableLiveData canCallAtTime;
@@ -43,11 +43,10 @@ public final class RegistrationViewModel extends ViewModel {
textCodeEntered = savedStateHandle.getLiveData("TEXT_CODE_ENTERED", "");
captchaToken = savedStateHandle.getLiveData("CAPTCHA");
fcmToken = savedStateHandle.getLiveData("FCM_TOKEN");
- basicStorageCredentials = savedStateHandle.getLiveData("BASIC_STORAGE_CREDENTIALS");
restoreFlowShown = savedStateHandle.getLiveData("RESTORE_FLOW_SHOWN", false);
successfulCodeRequestAttempts = savedStateHandle.getLiveData("SUCCESSFUL_CODE_REQUEST_ATTEMPTS", 0);
requestLimiter = savedStateHandle.getLiveData("REQUEST_RATE_LIMITER", new LocalCodeRequestRateLimiter(60_000));
- keyBackupCurrentTokenJson = savedStateHandle.getLiveData("KBS_TOKEN");
+ kbsTokenData = savedStateHandle.getLiveData("KBS_TOKEN");
lockedTimeRemaining = savedStateHandle.getLiveData("TIME_REMAINING", 0L);
canCallAtTime = savedStateHandle.getLiveData("CAN_CALL_AT_TIME", 0L);
}
@@ -158,28 +157,12 @@ public final class RegistrationViewModel extends ViewModel {
requestLimiter.setValue(requestLimiter.getValue());
}
- public void setStorageCredentials(@Nullable String storageCredentials) {
- basicStorageCredentials.setValue(storageCredentials);
+ public @Nullable TokenData getKeyBackupCurrentToken() {
+ return kbsTokenData.getValue();
}
- public @Nullable String getBasicStorageCredentials() {
- return basicStorageCredentials.getValue();
- }
-
- public @Nullable TokenResponse getKeyBackupCurrentToken() {
- String json = keyBackupCurrentTokenJson.getValue();
- if (json == null) return null;
- try {
- return JsonUtil.fromJson(json, TokenResponse.class);
- } catch (IOException e) {
- Log.w(TAG, e);
- return null;
- }
- }
-
- public void setKeyBackupCurrentToken(TokenResponse tokenResponse) {
- String json = tokenResponse == null ? null : JsonUtil.toJson(tokenResponse);
- keyBackupCurrentTokenJson.setValue(json);
+ public void setKeyBackupTokenData(TokenData tokenData) {
+ kbsTokenData.setValue(tokenData);
}
public LiveData getLockedTimeRemaining() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/AccountConflictMerger.java b/app/src/main/java/org/thoughtcrime/securesms/storage/AccountConflictMerger.java
index 277a5210c..8a5ed2494 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/AccountConflictMerger.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/AccountConflictMerger.java
@@ -60,14 +60,15 @@ class AccountConflictMerger implements StorageSyncHelper.ConflictMerger inserts,
@NonNull List deletes,
@NonNull Optional accountUpdate,
- @NonNull Optional accountInsert,
- @NonNull Set archivedRecipients)
+ @NonNull Optional accountInsert)
{
int accountCount = Stream.of(currentLocalKeys)
.filter(id -> id.getType() == ManifestRecord.Identifier.Type.ACCOUNT_VALUE)
@@ -119,12 +119,12 @@ public final class StorageSyncHelper {
Map storageKeyUpdates = new HashMap<>();
for (RecipientSettings insert : inserts) {
- if (insert.getGroupType() == RecipientDatabase.GroupType.SIGNAL_V2 && insert.getGroupMasterKey() == null) {
+ if (insert.getGroupType() == RecipientDatabase.GroupType.SIGNAL_V2 && insert.getSyncExtras().getGroupMasterKey() == null) {
Log.w(TAG, "Missing master key on gv2 recipient");
continue;
}
- storageInserts.add(StorageSyncModels.localToRemoteRecord(insert, archivedRecipients));
+ storageInserts.add(StorageSyncModels.localToRemoteRecord(insert));
switch (insert.getGroupType()) {
case NONE:
@@ -173,7 +173,7 @@ public final class StorageSyncHelper {
throw new AssertionError("Unsupported type!");
}
- storageInserts.add(StorageSyncModels.localToRemoteRecord(update, newId.getRaw(), archivedRecipients));
+ storageInserts.add(StorageSyncModels.localToRemoteRecord(update, newId.getRaw()));
storageDeletes.add(ByteBuffer.wrap(oldId.getRaw()));
completeIds.remove(oldId);
completeIds.add(newId);
@@ -330,21 +330,23 @@ public final class StorageSyncHelper {
@NonNull List currentLocalStorageKeys,
@NonNull MergeResult mergeResult)
{
- Set completeKeys = new HashSet<>(currentLocalStorageKeys);
-
- completeKeys.addAll(Stream.of(mergeResult.getAllNewRecords()).map(SignalRecord::getId).toList());
- completeKeys.removeAll(Stream.of(mergeResult.getAllRemovedRecords()).map(SignalRecord::getId).toList());
-
- SignalStorageManifest manifest = new SignalStorageManifest(currentManifestVersion + 1, new ArrayList<>(completeKeys));
-
List inserts = new ArrayList<>();
inserts.addAll(mergeResult.getRemoteInserts());
inserts.addAll(Stream.of(mergeResult.getRemoteUpdates()).map(RecordUpdate::getNew).toList());
- List deletes = Stream.of(mergeResult.getRemoteUpdates()).map(RecordUpdate::getOld).map(SignalStorageRecord::getId).map(StorageId::getRaw).toList();
- deletes.addAll(Stream.of(mergeResult.getRemoteDeletes()).map(SignalRecord::getId).map(StorageId::getRaw).toList());
+ List deletes = new ArrayList<>();
+ deletes.addAll(Stream.of(mergeResult.getRemoteDeletes()).map(SignalRecord::getId).toList());
+ deletes.addAll(Stream.of(mergeResult.getRemoteUpdates()).map(RecordUpdate::getOld).map(SignalStorageRecord::getId).toList());
- return new WriteOperationResult(manifest, inserts, deletes);
+ Set completeKeys = new HashSet<>(currentLocalStorageKeys);
+ completeKeys.addAll(Stream.of(mergeResult.getAllNewRecords()).map(SignalRecord::getId).toList());
+ completeKeys.removeAll(Stream.of(mergeResult.getAllRemovedRecords()).map(SignalRecord::getId).toList());
+ completeKeys.addAll(Stream.of(inserts).map(SignalStorageRecord::getId).toList());
+ completeKeys.removeAll(deletes);
+
+ SignalStorageManifest manifest = new SignalStorageManifest(currentManifestVersion + 1, new ArrayList<>(completeKeys));
+
+ return new WriteOperationResult(manifest, inserts, Stream.of(deletes).map(StorageId::getRaw).toList());
}
public static @NonNull byte[] generateKey() {
@@ -413,12 +415,13 @@ public final class StorageSyncHelper {
RecipientSettings settings = DatabaseFactory.getRecipientDatabase(context).getRecipientSettingsForSync(self.getId());
SignalAccountRecord account = new SignalAccountRecord.Builder(self.getStorageServiceId())
- .setUnknownFields(settings != null ? settings.getStorageProto() : null)
+ .setUnknownFields(settings != null ? settings.getSyncExtras().getStorageProto() : null)
.setProfileKey(self.getProfileKey())
.setGivenName(self.getProfileName().getGivenName())
.setFamilyName(self.getProfileName().getFamilyName())
.setAvatarUrlPath(self.getProfileAvatar())
- .setNoteToSelfArchived(DatabaseFactory.getThreadDatabase(context).isArchived(self.getId()))
+ .setNoteToSelfArchived(settings != null && settings.getSyncExtras().isArchived())
+ .setNoteToSelfForcedUnread(settings != null && settings.getSyncExtras().isForcedUnread())
.setTypingIndicatorsEnabled(TextSecurePreferences.isTypingIndicatorsEnabled(context))
.setReadReceiptsEnabled(TextSecurePreferences.isReadReceiptsEnabled(context))
.setSealedSenderIndicatorsEnabled(TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context))
@@ -439,6 +442,15 @@ public final class StorageSyncHelper {
}
}
+ private static PhoneNumberPrivacyValues.PhoneNumberSharingMode remoteToLocalPhoneNumberSharingMode(AccountRecord.PhoneNumberSharingMode phoneNumberPhoneNumberSharingMode) {
+ switch (phoneNumberPhoneNumberSharingMode) {
+ case EVERYBODY : return PhoneNumberPrivacyValues.PhoneNumberSharingMode.EVERYONE;
+ case CONTACTS_ONLY: return PhoneNumberPrivacyValues.PhoneNumberSharingMode.CONTACTS;
+ case NOBODY : return PhoneNumberPrivacyValues.PhoneNumberSharingMode.NOBODY;
+ default : return PhoneNumberPrivacyValues.PhoneNumberSharingMode.CONTACTS;
+ }
+ }
+
public static void applyAccountStorageSyncUpdates(@NonNull Context context, Optional> update) {
if (!update.isPresent()) {
return;
@@ -448,12 +460,13 @@ public final class StorageSyncHelper {
public static void applyAccountStorageSyncUpdates(@NonNull Context context, @NonNull StorageId storageId, @NonNull SignalAccountRecord update, boolean fetchProfile) {
DatabaseFactory.getRecipientDatabase(context).applyStorageSyncUpdates(storageId, update);
- DatabaseFactory.getThreadDatabase(context).setArchived(Recipient.self().getId(), update.isNoteToSelfArchived());
TextSecurePreferences.setReadReceiptsEnabled(context, update.isReadReceiptsEnabled());
TextSecurePreferences.setTypingIndicatorsEnabled(context, update.isTypingIndicatorsEnabled());
TextSecurePreferences.setShowUnidentifiedDeliveryIndicatorsEnabled(context, update.isSealedSenderIndicatorsEnabled());
SignalStore.settings().setLinkPreviewsEnabled(update.isLinkPreviewsEnabled());
+ SignalStore.phoneNumberPrivacy().setPhoneNumberListingMode(update.isPhoneNumberUnlisted() ? PhoneNumberPrivacyValues.PhoneNumberListingMode.UNLISTED : PhoneNumberPrivacyValues.PhoneNumberListingMode.LISTED);
+ SignalStore.phoneNumberPrivacy().setPhoneNumberSharingMode(remoteToLocalPhoneNumberSharingMode(update.getPhoneNumberSharingMode()));
if (fetchProfile && update.getAvatarUrlPath().isPresent()) {
ApplicationDependencies.getJobManager().add(new RetrieveProfileAvatarJob(Recipient.self(), update.getAvatarUrlPath().get()));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
index 6c43296b1..6084c91fa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
@@ -20,42 +20,43 @@ public final class StorageSyncModels {
private StorageSyncModels() {}
- public static @NonNull SignalStorageRecord localToRemoteRecord(@NonNull RecipientSettings settings, @NonNull Set archived) {
+ public static @NonNull SignalStorageRecord localToRemoteRecord(@NonNull RecipientSettings settings) {
if (settings.getStorageId() == null) {
throw new AssertionError("Must have a storage key!");
}
- return localToRemoteRecord(settings, settings.getStorageId(), archived);
+ return localToRemoteRecord(settings, settings.getStorageId());
}
- public static @NonNull SignalStorageRecord localToRemoteRecord(@NonNull RecipientSettings settings, @NonNull byte[] rawStorageId, @NonNull Set archived) {
+ public static @NonNull SignalStorageRecord localToRemoteRecord(@NonNull RecipientSettings settings, @NonNull byte[] rawStorageId) {
switch (settings.getGroupType()) {
- case NONE: return SignalStorageRecord.forContact(localToRemoteContact(settings, rawStorageId, archived));
- case SIGNAL_V1: return SignalStorageRecord.forGroupV1(localToRemoteGroupV1(settings, rawStorageId, archived));
- case SIGNAL_V2: return SignalStorageRecord.forGroupV2(localToRemoteGroupV2(settings, rawStorageId, archived));
+ case NONE: return SignalStorageRecord.forContact(localToRemoteContact(settings, rawStorageId));
+ case SIGNAL_V1: return SignalStorageRecord.forGroupV1(localToRemoteGroupV1(settings, rawStorageId));
+ case SIGNAL_V2: return SignalStorageRecord.forGroupV2(localToRemoteGroupV2(settings, rawStorageId));
default: throw new AssertionError("Unsupported type!");
}
}
- private static @NonNull SignalContactRecord localToRemoteContact(@NonNull RecipientSettings recipient, byte[] rawStorageId, @NonNull Set archived) {
+ private static @NonNull SignalContactRecord localToRemoteContact(@NonNull RecipientSettings recipient, byte[] rawStorageId) {
if (recipient.getUuid() == null && recipient.getE164() == null) {
throw new AssertionError("Must have either a UUID or a phone number!");
}
return new SignalContactRecord.Builder(rawStorageId, new SignalServiceAddress(recipient.getUuid(), recipient.getE164()))
- .setUnknownFields(recipient.getStorageProto())
+ .setUnknownFields(recipient.getSyncExtras().getStorageProto())
.setProfileKey(recipient.getProfileKey())
.setGivenName(recipient.getProfileName().getGivenName())
.setFamilyName(recipient.getProfileName().getFamilyName())
.setBlocked(recipient.isBlocked())
.setProfileSharingEnabled(recipient.isProfileSharing() || recipient.getSystemContactUri() != null)
- .setIdentityKey(recipient.getIdentityKey())
- .setIdentityState(localToRemoteIdentityState(recipient.getIdentityStatus()))
- .setArchived(archived.contains(recipient.getId()))
+ .setIdentityKey(recipient.getSyncExtras().getIdentityKey())
+ .setIdentityState(localToRemoteIdentityState(recipient.getSyncExtras().getIdentityStatus()))
+ .setArchived(recipient.getSyncExtras().isArchived())
+ .setForcedUnread(recipient.getSyncExtras().isForcedUnread())
.build();
}
- private static @NonNull SignalGroupV1Record localToRemoteGroupV1(@NonNull RecipientSettings recipient, byte[] rawStorageId, @NonNull Set archived) {
+ private static @NonNull SignalGroupV1Record localToRemoteGroupV1(@NonNull RecipientSettings recipient, byte[] rawStorageId) {
GroupId groupId = recipient.getGroupId();
if (groupId == null) {
@@ -67,14 +68,15 @@ public final class StorageSyncModels {
}
return new SignalGroupV1Record.Builder(rawStorageId, groupId.getDecodedId())
- .setUnknownFields(recipient.getStorageProto())
+ .setUnknownFields(recipient.getSyncExtras().getStorageProto())
.setBlocked(recipient.isBlocked())
.setProfileSharingEnabled(recipient.isProfileSharing())
- .setArchived(archived.contains(recipient.getId()))
+ .setArchived(recipient.getSyncExtras().isArchived())
+ .setForcedUnread(recipient.getSyncExtras().isForcedUnread())
.build();
}
- private static @NonNull SignalGroupV2Record localToRemoteGroupV2(@NonNull RecipientSettings recipient, byte[] rawStorageId, @NonNull Set archived) {
+ private static @NonNull SignalGroupV2Record localToRemoteGroupV2(@NonNull RecipientSettings recipient, byte[] rawStorageId) {
GroupId groupId = recipient.getGroupId();
if (groupId == null) {
@@ -85,17 +87,18 @@ public final class StorageSyncModels {
throw new AssertionError("Group is not V2");
}
- GroupMasterKey groupMasterKey = recipient.getGroupMasterKey();
+ GroupMasterKey groupMasterKey = recipient.getSyncExtras().getGroupMasterKey();
if (groupMasterKey == null) {
throw new AssertionError("Group master key not on recipient record");
}
return new SignalGroupV2Record.Builder(rawStorageId, groupMasterKey)
- .setUnknownFields(recipient.getStorageProto())
+ .setUnknownFields(recipient.getSyncExtras().getStorageProto())
.setBlocked(recipient.isBlocked())
.setProfileSharingEnabled(recipient.isProfileSharing())
- .setArchived(archived.contains(recipient.getId()))
+ .setArchived(recipient.getSyncExtras().isArchived())
+ .setForcedUnread(recipient.getSyncExtras().isForcedUnread())
.build();
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
index 511ae27df..4fb9460d0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
@@ -165,7 +165,7 @@ public class CommunicationActions {
*/
public static boolean handlePotentialGroupLinkUrl(@NonNull FragmentActivity activity, @NonNull String potentialGroupLinkUrl) {
try {
- GroupInviteLinkUrl groupInviteLinkUrl = GroupInviteLinkUrl.fromUrl(potentialGroupLinkUrl);
+ GroupInviteLinkUrl groupInviteLinkUrl = GroupInviteLinkUrl.fromUri(potentialGroupLinkUrl);
if (groupInviteLinkUrl == null) {
return false;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/CursorUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/CursorUtil.java
index 698ee1937..c5a87af8a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/CursorUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/CursorUtil.java
@@ -26,6 +26,10 @@ public final class CursorUtil {
return requireInt(cursor, column) != 0;
}
+ public static byte[] requireBlob(@NonNull Cursor cursor, @NonNull String column) {
+ return cursor.getBlob(cursor.getColumnIndexOrThrow(column));
+ }
+
public static Optional getString(@NonNull Cursor cursor, @NonNull String column) {
if (cursor.getColumnIndex(column) < 0) {
return Optional.absent();
@@ -41,4 +45,20 @@ public final class CursorUtil {
return Optional.of(requireInt(cursor, column));
}
}
+
+ public static Optional getBoolean(@NonNull Cursor cursor, @NonNull String column) {
+ if (cursor.getColumnIndex(column) < 0) {
+ return Optional.absent();
+ } else {
+ return Optional.of(requireBoolean(cursor, column));
+ }
+ }
+
+ public static Optional getBlob(@NonNull Cursor cursor, @NonNull String column) {
+ if (cursor.getColumnIndex(column) < 0) {
+ return Optional.absent();
+ } else {
+ return Optional.fromNullable(requireBlob(cursor, column));
+ }
+ }
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index 7b407b809..645b5d392 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -48,7 +48,6 @@ public final class FeatureFlags {
private static final long FETCH_INTERVAL = TimeUnit.HOURS.toMillis(2);
private static final String USERNAMES = "android.usernames";
- private static final String REMOTE_DELETE = "android.remoteDelete";
private static final String GROUPS_V2_CREATE_VERSION = "android.groupsv2.createVersion";
private static final String GROUPS_V2_JOIN_VERSION = "android.groupsv2.joinVersion";
private static final String GROUPS_V2_LINKS_VERSION = "android.groupsv2.manageGroupLinksVersion";
@@ -66,7 +65,6 @@ public final class FeatureFlags {
*/
private static final Set REMOTE_CAPABLE = Sets.newHashSet(
- REMOTE_DELETE,
GROUPS_V2_CREATE_VERSION,
GROUPS_V2_CAPACITY,
GROUPS_V2_JOIN_VERSION,
@@ -174,11 +172,6 @@ public final class FeatureFlags {
return getBoolean(USERNAMES, false);
}
- /** Send support for remotely deleting a message. */
- public static boolean remoteDelete() {
- return getBoolean(REMOTE_DELETE, false);
- }
-
/** Attempt groups v2 creation. */
public static boolean groupsV2create() {
return getVersionFlag(GROUPS_V2_CREATE_VERSION) == VersionFlag.ON &&
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
index 93a7cc7ef..7a48332f7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
@@ -6,6 +6,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
+import org.signal.zkgroup.InvalidInputException;
+import org.signal.zkgroup.groups.GroupMasterKey;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.GroupDatabase;
@@ -66,6 +68,14 @@ public final class GroupUtil {
return Optional.absent();
}
+ public static @NonNull GroupMasterKey requireMasterKey(@NonNull byte[] masterKey) {
+ try {
+ return new GroupMasterKey(masterKey);
+ } catch (InvalidInputException e) {
+ throw new AssertionError(e);
+ }
+ }
+
public static @NonNull GroupDescription getNonV2GroupDescription(@NonNull Context context, @Nullable String encodedGroup) {
if (encodedGroup == null) {
return new GroupDescription(context, null);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SqlUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SqlUtil.java
index c0149dd01..b23240acb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SqlUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SqlUtil.java
@@ -7,11 +7,13 @@ import androidx.annotation.NonNull;
import net.sqlcipher.database.SQLiteDatabase;
-import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.whispersystems.libsignal.util.guava.Preconditions;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -63,9 +65,9 @@ public final class SqlUtil {
* change. In other words, if {@link SQLiteDatabase#update(String, ContentValues, String, String[])}
* returns > 0, then you know something *actually* changed.
*/
- public static @NonNull UpdateQuery buildTrueUpdateQuery(@NonNull String selection,
- @NonNull String[] args,
- @NonNull ContentValues contentValues)
+ public static @NonNull Query buildTrueUpdateQuery(@NonNull String selection,
+ @NonNull String[] args,
+ @NonNull ContentValues contentValues)
{
StringBuilder qualifier = new StringBuilder();
Set> valueSet = contentValues.valueSet();
@@ -90,7 +92,29 @@ public final class SqlUtil {
i++;
}
- return new UpdateQuery("(" + selection + ") AND (" + qualifier + ")", fullArgs.toArray(new String[0]));
+ return new Query("(" + selection + ") AND (" + qualifier + ")", fullArgs.toArray(new String[0]));
+ }
+
+ public static @NonNull Query buildCollectionQuery(@NonNull String column, @NonNull Collection values) {
+ Preconditions.checkArgument(values.size() > 0);
+
+ StringBuilder query = new StringBuilder();
+ Object[] args = new Object[values.size()];
+
+ int i = 0;
+
+ for (Object value : values) {
+ query.append("?");
+ args[i] = value;
+
+ if (i != values.size() - 1) {
+ query.append(", ");
+ }
+
+ i++;
+ }
+
+ return new Query(column + " IN (" + query.toString() + ")", buildArgs(args));
}
public static String[] appendArg(@NonNull String[] args, String addition) {
@@ -102,11 +126,11 @@ public final class SqlUtil {
return output;
}
- public static class UpdateQuery {
+ public static class Query {
private final String where;
private final String[] whereArgs;
- private UpdateQuery(@NonNull String where, @NonNull String[] whereArgs) {
+ private Query(@NonNull String where, @NonNull String[] whereArgs) {
this.where = where;
this.whereArgs = whereArgs;
}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Util.java b/app/src/main/java/org/thoughtcrime/securesms/util/Util.java
index 86b0b444d..45895e1d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Util.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Util.java
@@ -116,6 +116,18 @@ public class Util {
return join(boxed, delimeter);
}
+ @SafeVarargs
+ public static @NonNull List join(@NonNull List... lists) {
+ int totalSize = Stream.of(lists).reduce(0, (sum, list) -> sum + list.size());
+ List joined = new ArrayList<>(totalSize);
+
+ for (List list : lists) {
+ joined.addAll(list);
+ }
+
+ return joined;
+ }
+
public static String join(List list, String delimeter) {
StringBuilder sb = new StringBuilder();
diff --git a/app/src/main/proto/Database.proto b/app/src/main/proto/Database.proto
index df6edc9d5..ad1937d18 100644
--- a/app/src/main/proto/Database.proto
+++ b/app/src/main/proto/Database.proto
@@ -28,9 +28,10 @@ import "SignalService.proto";
import "DecryptedGroups.proto";
message DecryptedGroupV2Context {
- signalservice.GroupContextV2 context = 1;
- DecryptedGroupChange change = 2;
- DecryptedGroup groupState = 3;
+ signalservice.GroupContextV2 context = 1;
+ DecryptedGroupChange change = 2;
+ DecryptedGroup groupState = 3;
+ DecryptedGroup previousGroupState = 4;
}
message TemporalAuthCredentialResponse {
diff --git a/app/src/main/res/layout/group_new_candidate_recipient_list_item.xml b/app/src/main/res/layout/group_new_candidate_recipient_list_item.xml
index 64af41b64..a5ecc2cc2 100644
--- a/app/src/main/res/layout/group_new_candidate_recipient_list_item.xml
+++ b/app/src/main/res/layout/group_new_candidate_recipient_list_item.xml
@@ -17,7 +17,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
- حذف الرسائل جارٍ…
إحذف بالنسبة لي
إحذف بالنسبة للجميع
- سيتم حذف هذه الرسالة لجميع الأعضاء في هذه المحادثة. الجميع سيرى أنك حذفت رسالة.
+
لم يتم العثور على الرسالة الأصلية
الرسالة الأصلية لم تعد متوفرة
فشل في فتح الرسالة
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 0eaaba900..b2279d910 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -131,8 +131,11 @@
Ukloni sliku grupe
Ažurirajte Signal
+ Ova verzija aplikacije više nije podržana. Da biste mogli slati i primati poruke, instalirajte zadnju verziju.
Ažuriraj
+ Ne ažuriraj
Upozorenje
+ Vaša verzija Signala je istekla. Možete pristupiti ranijim porukama, ali nećete moći slati ni primati nove poruke dok ne ažurirate aplikaciju.
Nije pronađen internet-preglednik.
Nije pronađena aplikacija za email.
@@ -293,7 +296,7 @@
Brišem poruke…
Izbriši za mene
Izbriši za svakoga
- Ova će poruka biti bespovratno izbrisana za sve učesnike u konverzaciji. Oni će moći vidjeti da ste Vi izbrisali poruku.
+
Originalna poruka nije pronađena
Originalna poruka više nije dostupna
Neuspjelo otvaranje poruke
@@ -385,6 +388,8 @@
Optimizuj za nepostojanje Play Services
Ovaj uređaj ne podržava Play Services. Pritisnite ovdje kako biste onemogućili sistemske optimizacije korištenja baterije koje sprečavaju Signal da prima poruke dok je aplikacija zatvorena.
+ Ova verzija Signala je istekla. Ažurirajte aplikaciju sada da biste mogli slati i primati poruke.
+ Ažuriraj sada
Dijeli sa
Višestruki prilozi podržani su samo za slike i videozapise
@@ -519,6 +524,8 @@
Zahtjevi za članstvo i pozivnice
Dodajte članove
Izmijeni informacije o grupi
+ Ko može uvrstiti nove članove?
+ Ko može mijenjati informacije o ovoj grupi?
Link grupe
Blokiraj grupu
Prestani s blokiranjem grupe
@@ -550,6 +557,9 @@
Neuspjelo ažuriranje grupe usljed greške u mreži, molimo, pokušajte kasnije
Upišite ime i dodajte sliku
Stara grupa
+ Ovo je stara grupa. Opcije poput grupnog administratora dostupne su samo za nove grupe.
+ Ovo je nezaštićena MMS grupa. Da biste razgovarali u privatnosti i imali pristup opcijama poput naziva grupe, pozovite svoje kontakte da koriste Signal.
+ Pozovi odmah
Obavijesti me kad me neko spomene
Primiti obavještenja kad Vas neko spomene u prigušenim konverzacijama?
@@ -646,6 +656,7 @@
Pristupanje grupi putem linka nije još podržano u Signalu. To će biti moguće u jednoj od narednih verzija.
Verzija Signala koju koristite ne podržava linkove za grupu. Instalirajte zadnju verziju da biste se mogli priključiti ovoj grupi putem linka.
Ažurirajte Signal
+ Jedan ili više Vaših povezanih uređaja koriste verziju Signala koja ne podržava linkove za grupe. Ažurirajte Signal na svojim povezanim uređajima da biste pristupili ovoj grupi.
Link za grupu nije ispravan
Uvrstiti “%1$s” u grupu?
@@ -985,6 +996,13 @@
Vaše poruke neće isteći.
Poslane i primljene poruke u ovoj konverzaciji nestat će %s nakon što su viđene.
+ Ažuriraj sada
+ Ova verzija Signala ističe danas. Ažurirajte aplikaciju na posljednju verziju.
+
+ - Ova verzija Signala ističe sutra. Ažurirajte aplikaciju na posljednju verziju.
+ - Ova verzija Signala ističe za %d dana. Ažurirajte aplikaciju na posljednju verziju.
+ - Ova verzija Signala ističe za %d dana. Ažurirajte aplikaciju na posljednju verziju.
+
Unesite lozinku
Signal sličica
@@ -1063,10 +1081,20 @@
Da biste nazvali %1$s, Signalu je potreban pristup Vašoj kameri
Signal %1$s
Pozivam…
+ Grupni poziv
Signal glasovni poziv…
Signal videopoziv…
+ Nazovi
+ Grupni poziv
+ Vidi učesnike
+ Vaš videoprikaz je isključen
+
+ - U ovom pozivu · %1$d osoba
+ - U ovom pozivu · %1$d osobe
+ - U ovom pozivu · %1$d osoba
+
Odaberite svoju zemlju
Morate precizirati
@@ -2140,9 +2168,15 @@
Podsjetit ćemo Vas kasnije. Kreiranje PIN-a postat će obavezno za %1$d dana.
Podsjetit ćemo Vas kasnije. Potvrda Vašeg PIN-a postat će obavezna za %1$d dana.
+ Kažite Signalu svoje utiske
+ Voljeli bismo čuti Vaše utiske i prijedloge kako bismo Signal učinili najboljom aplikacijom za komunikaciju na planetu.
Saznajte više
Odbaci
+ Signal istraživanje
+ Mi vjerujemo u privatnost.
Signal Vas ne prati, niti prikuplja Vaše podatke. Da bismo unaprijedili Signal, oslanjamo se na utiske i sugestije korisnika, i voljeli bismo čuti Vaše.
Pokrenuli smo anketu s ciljem da razumijemo kako Vi koristite Signal. Naša anketa ne pohranjuje bilo kakve podatke na temelju kojih biste bili identifikovani. Ako želite s nama podijeliti dodatna zapažanja, imat ćete mogućnost da ostavite kontakt-informacije.
Ako možete izdvojiti nekoliko minuta i kazati nam svoje utiske, bit ćemo sretni da ih saslušamo.
]]>
+ Započni anketu
Ne, hvala
+ Anketa se sprovodi putem Surveygizma na sigurnoj domeni surveys.signalusers.org
Sličica transporta
Učitavanje…
@@ -2282,6 +2316,8 @@
Nezaštićen poziv
Videopoziv
Smijeniti %1$s kao administratora grupe?
+ \"%1$s\" će moći uređivati ovu grupu i njene članove.
+ Udaljiti %1$s iz grupe?
Ukloni
Kopirano u međuspremnik
Administrator
@@ -2291,6 +2327,9 @@
Stare spram novih grupa
Šta su stare gurpe?
Stare su one grupe koje nisu kompatibilne s novim grupnim opcijama poput administratora i detaljnih grupnih izvještaja.
+ Mogu li nadograditi staru grupu?
+ Stare grupe ne mogu se još uvijek nadograditi u nove, ali možete oformiti novu grupu sa istim članovima, ako oni koriste posljednju verziju Signala.
+ Signal će u budućnosti nuditi mogućnost za nadogradnju starih grupa.
Podijeli preko Signala
Kopiraj
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 8a01a0b3c..a73e6a704 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -128,8 +128,11 @@
Voleu suprimir la foto del grup?
Actualitza el Signal
- Actualització
+ Aquesta versió de l\'aplicació ja no té assistència. Per continuar enviant i rebent missatges, actualitzeu-la a la darrera versió.
+ Actualitza-la
+ No l\'actualitzis
Advertiment
+ La versió del Signal ha vençut. Podeu veure l\'historial de missatges però no podreu enviar-ne ni rebre\'n fins que l\'actualitzeu.
No s\'ha trobat cap navegador web.
No s\'ha trobat cap aplicació de correu.
@@ -283,7 +286,7 @@
Se suprimeixen missatges…
Suprimeix per a mi
Suprimeix per a tothom
- Aquest missatge se suprimirà permanentment per a tothom que sigui a la conversa. Els membres podran veure que heu suprimit un missatge.
+
No s\'ha trobat el missatge original.
El missatge original ja no està disponible.
Ha fallat obrir el missatge.
@@ -371,6 +374,8 @@
Optimitza per a la no presència dels Play Services
El dispositiu no és compatible amb Play Services. Toqueu per desactivar les optimitzacions de la bateria que impedeixen que el Signal rebi missatges quan estigui inactiu.
+ Aquesta versió del Signal ha vençut. Actualitzeu-la ara per enviar i rebre missatges.
+ Actualitza-la ara
Comparteix amb
Els adjunts múltiples només s\'admeten per a imatges i vídeos.
@@ -498,6 +503,8 @@
Sol·licituds d\'adhesió i invitacions
Afegiu-hi membres
Edita la informació del grup
+ Qui pot afegir membres nous?
+ Qui pot editar la informació del grup?
Enllaç del grup
Bloca el grup
Desbloca el grup
@@ -527,6 +534,9 @@
Ha fallat actualitzar el grup a causa d\'un error de xarxa. Torneu-ho a provar més tard.
Editeu el nom i la imatge
Grup de llegat
+ Aquest és un grup de llegat. Característiques com ara els administradors de grup només estan disponibles per als grups nous.
+ Aquest és un grup d\'MMS no segur. Per conversar privadament i accedir a funcions com ara els noms de grup, convideu els contactes al Signal.
+ Convida ara
Notifica\'m les mencions
Voleu rebre notificacions quan us mencionin en converses silenciades?
@@ -619,6 +629,7 @@
Afegir-se a un grup per un enllaç encara no és possible amb el Signal. Aquesta funció s\'activarà en una actualització propera.
La versió del Signal que useu no admet enllaços de grup. Actualitzeu-lo a la versió més recent per afegir-vos a aquest grup per l\'enllaç.
Actualitza el Signal
+ Un o més dels vostres dispositius enllaçats executen una versió del Signal que no admet enllaços de grup. Actualitzeu el Signal dels dispositius enllaçats per afegir-vos a aquest grup.
L\'enllaç de grup no és vàlid.
Voleu afegir %1$s al grup?
@@ -939,9 +950,15 @@
No es pot escanejar un codi QR sense permís de la càmera.
Missatges efímers
- El missatges no expiraran.
+ El missatges no venceran.
Els missatges enviats i rebuts a aquesta conversa desapareixeran %s després que s\'hagin llegit.
+ Actualitza-la ara
+ La vostra versió del Signal vencerà avui. Actualitzeu-la a la versió més recent.
+
+ - Aquesta versió del Signal vencerà demà. Actualitzeu-la a la versió més recent.
+ - Aquesta versió del Signal vencerà d\'aquí a %d dies. Actualitzeu-la a la versió més recent.
+
Escriviu la contrasenya
Icona del Signal
@@ -1019,10 +1036,19 @@
Per trucar a %1$s, el Signal necessita accés a la càmera.
Trucada del Signal: %1$s
Es truca…
+ Trucada de grup
Trucada de veu del Signal…
Trucada de vídeo del Signal…
+ Inicia una trucada
+ Trucada de grup
+ Mostra els participants
+ El vídeo està desactivat.
+
+ - En aquesta trucada · %1$d persona
+ - En aquesta trucada · %1$d persones
+
Seleccioneu el país
Heu d\'especificar el
@@ -1868,7 +1894,7 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
Missatges efímers
- Missatges que caduquen
+ Missatges que vencen
Convida
@@ -2074,9 +2100,11 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
Us ho recordarem més tard. Confirmar el PIN serà obligatori d\'aquí a %1$d dies.
Expliqueu a Signal què en penseu
+ Per fer del Signal la millor aplicació de missatgeria del planeta, ens agradaria rebre\'n els vostres comentaris.
Més informació
Descarta
Recerca del Signal
+ Creiem en la privadesa.
El Signal no us fa un seguiment ni recopila les vostres dades. Per millorar el Signal per a tothom, confiem en els comentaris dels usuaris i ens encantaria rebre el vostre.
Estem fent una enquesta per entendre com useu el Signal. La nostra enquesta no recull cap dada que us identifiqui. Si esteu interessats a compartir comentaris addicionals, podreu proporcionar la informació de contacte.
Si teniu uns quants minuts i comentaris a oferir, ens encantaria rebre notícies vostres.
]]>