Render GV1->GV2 migration event.

app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java

@@ -59,6 +59,7 @@ public interface BindableConversationItem extends Unbindable {
     void onVoiceNotePause(@NonNull Uri uri);
     void onVoiceNotePlay(@NonNull Uri uri, long messageId, double position);
     void onVoiceNoteSeekTo(@NonNull Uri uri, double position);
+    void onGroupMigrationLearnMoreClicked(@NonNull List<RecipientId> pendingRecipients);
 
     /** @return true if handled, false if you want to let the normal url handling continue */
     boolean onUrlClicked(@NonNull String url);

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java

@@ -22,7 +22,6 @@ import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -90,6 +89,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
+import org.thoughtcrime.securesms.groups.ui.migration.GroupsV1MigrationBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceViewOnceOpenJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -1417,6 +1417,11 @@ public class ConversationFragment extends LoggingFragment {
     public boolean onUrlClicked(@NonNull String url) {
       return CommunicationActions.handlePotentialGroupLinkUrl(requireActivity(), url);
     }
+
+    @Override
+    public void onGroupMigrationLearnMoreClicked(@NonNull List<RecipientId> pendingRecipients) {
+      GroupsV1MigrationBottomSheetDialogFragment.showForLearnMore(requireFragmentManager(), pendingRecipients);
+    }
   }
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java

@@ -42,12 +42,14 @@ public final class ConversationUpdateItem extends LinearLayout
 
   private Set<ConversationMessage> batchSelected;
 
-  private TextView                  body;
-  private LiveRecipient             sender;
-  private ConversationMessage       conversationMessage;
-  private MessageRecord             messageRecord;
-  private Locale                    locale;
-  private LiveData<Spannable> displayBody;
+  private TextView                body;
+  private TextView                actionButton;
+  private LiveRecipient           sender;
+  private ConversationMessage     conversationMessage;
+  private Optional<MessageRecord> nextMessageRecord;
+  private MessageRecord           messageRecord;
+  private LiveData<Spannable>     displayBody;
+  private EventListener           eventListener;
 
   private final UpdateObserver updateObserver = new UpdateObserver();
   private final SenderObserver senderObserver = new SenderObserver();
@@ -63,7 +65,8 @@ public final class ConversationUpdateItem extends LinearLayout
   @Override
   public void onFinishInflate() {
     super.onFinishInflate();
-    this.body = findViewById(R.id.conversation_update_body);
+    this.body         = findViewById(R.id.conversation_update_body);
+    this.actionButton = findViewById(R.id.conversation_update_action);
 
     this.setOnClickListener(new InternalClickListener(null));
   }
@@ -82,12 +85,12 @@ public final class ConversationUpdateItem extends LinearLayout
   {
     this.batchSelected = batchSelected;
 
-    bind(lifecycleOwner, conversationMessage, locale);
+    bind(lifecycleOwner, conversationMessage, nextMessageRecord);
   }
 
   @Override
   public void setEventListener(@Nullable EventListener listener) {
-    // No events to report yet
+    this.eventListener = listener;
   }
 
   @Override
@@ -95,10 +98,13 @@ public final class ConversationUpdateItem extends LinearLayout
     return conversationMessage;
   }
 
-  private void bind(@NonNull LifecycleOwner lifecycleOwner, @NonNull ConversationMessage conversationMessage, @NonNull Locale locale) {
+  private void bind(@NonNull LifecycleOwner lifecycleOwner,
+                    @NonNull ConversationMessage conversationMessage,
+                    @NonNull Optional<MessageRecord> nextMessageRecord)
+  {
     this.conversationMessage = conversationMessage;
     this.messageRecord       = conversationMessage.getMessageRecord();
-    this.locale              = locale;
+    this.nextMessageRecord   = nextMessageRecord;
 
     observeSender(lifecycleOwner, messageRecord.getIndividualRecipient());
 
@@ -106,7 +112,7 @@ public final class ConversationUpdateItem extends LinearLayout
     LiveData<Spannable> liveUpdateMessage = LiveUpdateMessage.fromMessageDescription(getContext(), updateDescription);
     LiveData<Spannable> spannableMessage  = loading(liveUpdateMessage);
 
-    present(conversationMessage);
+    present(conversationMessage, nextMessageRecord);
 
     observeDisplayBody(lifecycleOwner, spannableMessage);
   }
@@ -156,9 +162,24 @@ public final class ConversationUpdateItem extends LinearLayout
     }
   }
 
-  private void present(ConversationMessage conversationMessage) {
+  private void present(ConversationMessage conversationMessage, @NonNull Optional<MessageRecord> nextMessageRecord) {
     if (batchSelected.contains(conversationMessage)) setSelected(true);
     else                                             setSelected(false);
+
+    if (conversationMessage.getMessageRecord().isGroupV1MigrationEvent() &&
+        (!nextMessageRecord.isPresent() || !nextMessageRecord.get().isGroupV1MigrationEvent()))
+    {
+      actionButton.setText(R.string.ConversationUpdateItem_learn_more);
+      actionButton.setVisibility(VISIBLE);
+      actionButton.setOnClickListener(v -> {
+        if (batchSelected.isEmpty() && eventListener != null) {
+          eventListener.onGroupMigrationLearnMoreClicked(conversationMessage.getMessageRecord().getGroupV1MigrationEventInvites());
+        }
+      });
+    } else {
+      actionButton.setVisibility(GONE);
+      actionButton.setOnClickListener(null);
+    }
   }
 
   @Override
@@ -170,7 +191,7 @@ public final class ConversationUpdateItem extends LinearLayout
 
     @Override
     public void onChanged(Recipient recipient) {
-      present(conversationMessage);
+      present(conversationMessage, nextMessageRecord);
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java

@@ -137,7 +137,7 @@ public abstract class MessageDatabase extends Database implements MmsSmsColumns
   public abstract long insertMessageOutbox(@NonNull OutgoingMediaMessage message, long threadId, boolean forceSms, @Nullable SmsDatabase.InsertListener insertListener) throws MmsException;
   public abstract long insertMessageOutbox(@NonNull OutgoingMediaMessage message, long threadId, boolean forceSms, int defaultReceiptStatus, @Nullable SmsDatabase.InsertListener insertListener) throws MmsException;
   public abstract void insertProfileNameChangeMessages(@NonNull Recipient recipient, @NonNull String newProfileName, @NonNull String previousProfileName);
-  public abstract void insertGroupV1MigrationEvent(@NonNull RecipientId recipientId, long threadId, List<RecipientId> pendingRecipients);
+  public abstract void insertGroupV1MigrationEvents(@NonNull RecipientId recipientId, long threadId, List<RecipientId> pendingRecipients);
 
   public abstract boolean deleteMessage(long messageId);
   abstract void deleteThread(long threadId);

app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java

@@ -415,7 +415,7 @@ public class MmsDatabase extends MessageDatabase {
   }
 
   @Override
-  public void insertGroupV1MigrationEvent(@NonNull RecipientId recipientId, long threadId, List<RecipientId> pendingRecipients) {
+  public void insertGroupV1MigrationEvents(@NonNull RecipientId recipientId, long threadId, List<RecipientId> pendingRecipients) {
     throw new UnsupportedOperationException();
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java

@@ -266,6 +266,10 @@ public interface MmsSmsColumns {
       return type == PROFILE_CHANGE_TYPE;
     }
 
+    public static boolean isGroupV1MigrationEvent(long type) {
+      return type == GV1_MIGRATION_TYPE;
+    }
+
     public static long translateFromSystemBaseType(long theirType) {
 //    public static final int NONE_TYPE           = 0;
 //    public static final int INBOX_TYPE          = 1;

app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java

@@ -740,7 +740,22 @@ public class SmsDatabase extends MessageDatabase {
   }
 
   @Override
-  public void insertGroupV1MigrationEvent(@NonNull RecipientId recipientId, long threadId, List<RecipientId> pendingRecipients) {
+  public void insertGroupV1MigrationEvents(@NonNull RecipientId recipientId, long threadId, @NonNull List<RecipientId> pendingRecipients) {
+    insertGroupV1MigrationNotification(recipientId, threadId);
+
+    if (pendingRecipients.size() > 0) {
+      insertGroupV1MigrationEvent(recipientId, threadId, pendingRecipients);
+    }
+
+    notifyConversationListeners(threadId);
+    ApplicationDependencies.getJobManager().add(new TrimThreadJob(threadId));
+  }
+
+  private void insertGroupV1MigrationNotification(@NonNull RecipientId recipientId, long threadId) {
+    insertGroupV1MigrationEvent(recipientId, threadId, Collections.emptyList());
+  }
+
+  private void insertGroupV1MigrationEvent(@NonNull RecipientId recipientId, long threadId, @NonNull List<RecipientId> pendingRecipients) {
     ContentValues values = new ContentValues();
     values.put(RECIPIENT_ID, recipientId.serialize());
     values.put(ADDRESS_DEVICE_ID, 1);
@@ -749,12 +764,12 @@ public class SmsDatabase extends MessageDatabase {
     values.put(READ, 1);
     values.put(TYPE, Types.GV1_MIGRATION_TYPE);
     values.put(THREAD_ID, threadId);
-    values.put(BODY, RecipientId.toSerializedList(pendingRecipients));
+
+    if (pendingRecipients.size() > 0) {
+      values.put(BODY, RecipientId.toSerializedList(pendingRecipients));
+    }
 
     databaseHelper.getWritableDatabase().insert(TABLE_NAME, null, values);
-
-    notifyConversationListeners(threadId);
-    ApplicationDependencies.getJobManager().add(new TrimThreadJob(threadId));
   }
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java

@@ -17,7 +17,6 @@
 package org.thoughtcrime.securesms.database.model;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.RelativeSizeSpan;
@@ -46,6 +45,7 @@ import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.StringUtil;
+import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.guava.Function;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
 import org.whispersystems.signalservice.api.util.UuidUtil;
@@ -172,6 +172,13 @@ public abstract class MessageRecord extends DisplayRecord {
     } else if (isEndSession()) {
       if (isOutgoing()) return staticUpdateDescription(context.getString(R.string.SmsMessageRecord_secure_session_reset), R.drawable.ic_update_info_light_16, R.drawable.ic_update_info_dark_16);
       else              return fromRecipient(getIndividualRecipient(), r-> context.getString(R.string.SmsMessageRecord_secure_session_reset_s, r.getDisplayName(context)), R.drawable.ic_update_info_light_16, R.drawable.ic_update_info_dark_16);
+    } else if (isGroupV1MigrationEvent()) {
+      if (Util.isEmpty(getBody())) {
+        return staticUpdateDescription(context.getString(R.string.MessageRecord_this_group_was_updated_to_a_new_group), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16);
+      } else {
+        int count = getGroupV1MigrationEventInvites().size();
+        return staticUpdateDescription(context.getResources().getQuantityString(R.plurals.MessageRecord_members_couldnt_be_added_to_the_new_group_and_have_been_invited, count, count), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16);
+      }
     }
 
     return null;
@@ -347,9 +354,22 @@ public abstract class MessageRecord extends DisplayRecord {
     return SmsDatabase.Types.isInvalidVersionKeyExchange(type);
   }
 
+  public boolean isGroupV1MigrationEvent() {
+    return SmsDatabase.Types.isGroupV1MigrationEvent(type);
+  }
+
+  public @NonNull List<RecipientId> getGroupV1MigrationEventInvites() {
+    if (isGroupV1MigrationEvent()) {
+      return RecipientId.fromSerializedList(getBody());
+    } else {
+      return Collections.emptyList();
+    }
+  }
+
   public boolean isUpdate() {
     return isGroupAction() || isJoined() || isExpirationTimerUpdate() || isCallLog() ||
-           isEndSession()  || isIdentityUpdate() || isIdentityVerified() || isIdentityDefault() || isProfileChange();
+           isEndSession()  || isIdentityUpdate() || isIdentityVerified() || isIdentityDefault() ||
+           isProfileChange() || isGroupV1MigrationEvent();
   }
 
   public boolean isMediaPending() {

app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListView.java

@@ -9,7 +9,10 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.annimon.stream.Stream;
+
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.List;
 
@@ -74,6 +77,10 @@ public final class GroupMemberListView extends RecyclerView {
     membersAdapter.updateData(recipients);
   }
 
+  public void setDisplayOnlyMembers(@NonNull List<Recipient> recipients) {
+    membersAdapter.updateData(Stream.of(recipients).map(r -> new GroupMemberEntry.FullMember(r, false)).toList());
+  }
+
   @Override
   protected void onMeasure(int widthSpec, int heightSpec) {
     if (maxHeight > 0) {

app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationBottomSheetDialogFragment.java

@@ -0,0 +1,79 @@
+package org.thoughtcrime.securesms.groups.ui.migration;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.ViewModelProviders;
+
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.groups.ui.GroupMemberListView;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.BottomSheetUtil;
+import org.thoughtcrime.securesms.util.ThemeUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class GroupsV1MigrationBottomSheetDialogFragment extends BottomSheetDialogFragment {
+
+  private static final String KEY_PENDING = "pending";
+
+  private GroupsV1MigrationViewModel viewModel;
+  private GroupMemberListView        pendingList;
+  private TextView                   pendingTitle;
+
+  public static void showForLearnMore(@NonNull FragmentManager manager, @NonNull List<RecipientId> pendingRecipients) {
+    Bundle args = new Bundle();
+    args.putParcelableArrayList(KEY_PENDING, new ArrayList<>(pendingRecipients));
+
+    GroupsV1MigrationBottomSheetDialogFragment fragment = new GroupsV1MigrationBottomSheetDialogFragment();
+    fragment.setArguments(args);
+
+    fragment.show(manager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG);
+  }
+
+  @Override
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    setStyle(DialogFragment.STYLE_NORMAL,
+             ThemeUtil.isDarkTheme(requireContext()) ? R.style.Theme_Signal_RoundedBottomSheet
+                                                     : R.style.Theme_Signal_RoundedBottomSheet_Light);
+
+    super.onCreate(savedInstanceState);
+  }
+
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return inflater.inflate(R.layout.groupsv1_migration_learn_more_bottom_sheet, container, false);
+  }
+
+  @Override
+  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+    this.pendingTitle = view.findViewById(R.id.gv1_learn_more_pending_title);
+    this.pendingList  = view.findViewById(R.id.gv1_learn_more_pending_list);
+
+    List<RecipientId> pending = getArguments().containsKey(KEY_PENDING) ? getArguments().getParcelableArrayList(KEY_PENDING) : null;
+
+    this.viewModel = ViewModelProviders.of(this, new GroupsV1MigrationViewModel.Factory(pending)).get(GroupsV1MigrationViewModel.class);
+    viewModel.getPendingMembers().observe(getViewLifecycleOwner(), this::onPendingMembersChanged);
+  }
+
+  @Override
+  public void show(@NonNull FragmentManager manager, @Nullable String tag) {
+    BottomSheetUtil.show(manager, tag, this);
+  }
+
+  private void onPendingMembersChanged(@NonNull List<Recipient> pendingMembers) {
+    pendingTitle.setText(getResources().getQuantityText(R.plurals.GroupsV1MigrationLearnMore_these_members_will_need_to_accept_an_invite, pendingMembers.size()));
+    pendingList.setDisplayOnlyMembers(pendingMembers);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationViewModel.java

@@ -0,0 +1,44 @@
+package org.thoughtcrime.securesms.groups.ui.migration;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
+
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+
+import java.util.List;
+
+class GroupsV1MigrationViewModel extends ViewModel {
+
+  private final MutableLiveData<List<Recipient>> pendingMembers;
+
+  private GroupsV1MigrationViewModel(@NonNull List<RecipientId> pendingMembers) {
+    this.pendingMembers = new MutableLiveData<>();
+
+    SignalExecutors.BOUNDED.execute(() -> {
+      this.pendingMembers.postValue(Recipient.resolvedList(pendingMembers));
+    });
+  }
+
+  @NonNull LiveData<List<Recipient>> getPendingMembers() {
+    return pendingMembers;
+  }
+
+  static class Factory extends ViewModelProvider.NewInstanceFactory {
+
+    private final List<RecipientId> pendingMembers;
+
+    Factory(List<RecipientId> pendingMembers) {
+      this.pendingMembers = pendingMembers;
+    }
+
+    @Override
+    public @NonNull<T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+      return modelClass.cast(new GroupsV1MigrationViewModel(pendingMembers));
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/jobs/GroupV1MigrationJob.java

@@ -285,7 +285,7 @@ public class GroupV1MigrationJob extends BaseJob {
 
     Log.i(TAG, "[Local] Migrating group over to the version we were added to: V" + decryptedGroup.getRevision());
     DatabaseFactory.getGroupDatabase(context).migrateToV2(gv1Id, decryptedGroup);
-    DatabaseFactory.getSmsDatabase(context).insertGroupV1MigrationEvent(groupRecipient.getId(), threadId, pendingRecipients);
+    DatabaseFactory.getSmsDatabase(context).insertGroupV1MigrationEvents(groupRecipient.getId(), threadId, pendingRecipients);
 
     Log.i(TAG, "[Local] Applying all changes since V" + decryptedGroup.getRevision());
     try {