Merge upstream v5.2.3

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,20 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 📃Support Center
+    url: https://support.signal.org/
+    about: Find answers to many common questions.
+  - name: ✨ Feature request
+    url: https://community.signalusers.org/c/feature-requests/
+    about: Missing something in Signal? Let us know.
+  - name: 💬 Community support
+    url: https://community.signalusers.org/c/support/
+    about: Feel free to ask anything.
+  - name: 📖 Developer documentation
+    url: https://signal.org/docs/
+    about: Official Signal developer documentation.
+  - name: 📚 Translation feedback.
+    url: https://community.signalusers.org/c/translation-feedback/
+    about: Share feedback on translations.
+  - name: ❓ Other issue?
+    url: https://community.signalusers.org/
+    about: Search on the community forums.

app/build.gradle

@@ -69,10 +69,10 @@ protobuf {
     }
 }
 
-def canonicalVersionCode = 769
-def canonicalVersionName = "5.1.9"
+def canonicalVersionCode = 772
+def canonicalVersionName = "5.2.3"
 
-def postFixSize = 10
+def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
                   'armeabi-v7a' : 1,
                   'arm64-v8a'   : 2,

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

@@ -40,9 +40,9 @@
 import org.thoughtcrime.securesms.preferences.BackupsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.DataAndStoragePreferenceFragment;
 import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.NetworkPreferenceFragment;
-import org.thoughtcrime.securesms.preferences.StoragePreferenceFragment;
 import org.thoughtcrime.securesms.preferences.widgets.ProfilePreference;
 import org.thoughtcrime.securesms.preferences.widgets.UsernamePreference;
 import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
@@ -67,6 +67,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
 {
   public static final String LAUNCH_TO_NETWORK_FRAGMENT = "launch.to.network.fragment";
   public static final String LAUNCH_TO_BACKUPS_FRAGMENT = "launch.to.backups.fragment";
+  public static final String LAUNCH_TO_HELP_FRAGMENT    = "launch.to.help.fragment";
 
   @SuppressWarnings("unused")
   private static final String TAG = ApplicationPreferencesActivity.class.getSimpleName();
@@ -108,6 +109,8 @@ protected void onCreate(Bundle icicle, boolean ready) {
       initFragment(android.R.id.content, new NetworkPreferenceFragment());
     } else if (getIntent() != null && getIntent().getBooleanExtra(LAUNCH_TO_BACKUPS_FRAGMENT, false)) {
       initFragment(android.R.id.content, new BackupsPreferenceFragment());
+    } else if (getIntent() != null && getIntent().getBooleanExtra(LAUNCH_TO_HELP_FRAGMENT, false)) {
+      initFragment(android.R.id.content, new HelpFragment());
     } else if (icicle == null) {
       initFragment(android.R.id.content, new ApplicationPreferenceFragment());
     } else {
@@ -310,7 +313,7 @@ public boolean onPreferenceClick(Preference preference) {
           fragment = new ChatsPreferenceFragment();
           break;
         case PREFERENCE_CATEGORY_STORAGE:
-          fragment = new StoragePreferenceFragment();
+          fragment = new DataAndStoragePreferenceFragment();
           break;
         case PREFERENCE_CATEGORY_DEVICES:
           Intent intent = new Intent(getActivity(), DeviceActivity.class);

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

@@ -61,6 +61,8 @@ interface EventListener {
     void onVoiceNotePlay(@NonNull Uri uri, long messageId, double position);
     void onVoiceNoteSeekTo(@NonNull Uri uri, double position);
     void onGroupMigrationLearnMoreClicked(@NonNull GroupMigrationMembershipChange membershipChange);
+    void onDecryptionFailedLearnMoreClicked();
+    void onSafetyNumberLearnMoreClicked(@NonNull Recipient recipient);
     void onJoinGroupCallClicked();
     void onInviteFriendsToGroupClicked(@NonNull GroupId.V2 groupId);
 

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

@@ -237,7 +237,7 @@ private void initializeClearKeyReceiver() {
     this.clearKeyReceiver = new BroadcastReceiver() {
       @Override
       public void onReceive(Context context, Intent intent) {
-        Log.i(TAG, "onReceive() for clear key event");
+        Log.i(TAG, "onReceive() for clear key event. PassphraseLock: " + TextSecurePreferences.isPassphraseLockEnabled(context));
         onMasterSecretCleared();
       }
     };

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

@@ -27,14 +27,18 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Rational;
+import android.view.View;
 import android.view.Window;
+import android.view.WindowInsetsController;
 import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProviders;
+import androidx.transition.Transition;
+import androidx.transition.TransitionListenerAdapter;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -58,8 +62,10 @@
 import org.thoughtcrime.securesms.service.WebRtcCallService;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
+import org.thoughtcrime.securesms.util.FullscreenHelper;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.WindowUtil;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
 import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
@@ -80,6 +86,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
   private CallParticipantsListUpdatePopupWindow participantUpdateWindow;
 
+  private FullscreenHelper    fullscreenHelper;
   private WebRtcCallView      callScreen;
   private TooltipPopup        videoTooltip;
   private WebRtcCallViewModel viewModel;
@@ -100,8 +107,8 @@ public void onCreate(Bundle savedInstanceState) {
 
     requestWindowFeature(Window.FEATURE_NO_TITLE);
     setContentView(R.layout.webrtc_call_activity);
-    //noinspection ConstantConditions
-    getSupportActionBar().hide();
+
+    fullscreenHelper = new FullscreenHelper(this);
 
     setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
 
@@ -636,6 +643,16 @@ public void onControlsFadeOut() {
       }
     }
 
+    @Override
+    public void showSystemUI() {
+      fullscreenHelper.showSystemUI();
+    }
+
+    @Override
+    public void hideSystemUI() {
+      fullscreenHelper.hideSystemUI();
+    }
+
     @Override
     public void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput) {
       switch (audioOutput) {
@@ -701,5 +718,10 @@ public void onShowParticipantsList() {
     public void onPageChanged(@NonNull CallParticipantsState.SelectedPage page) {
       viewModel.setIsViewingFocusedParticipant(page);
     }
+
+    @Override
+    public void onLocalPictureInPictureClicked() {
+      viewModel.onLocalPictureInPictureClicked();
+    }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/LabeledEditText.java

@@ -8,6 +8,7 @@
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.TextView;
@@ -91,4 +92,18 @@ public void setEnabled(boolean enabled) {
     super.setEnabled(enabled);
     input.setEnabled(enabled);
   }
+
+  public void focusAndMoveCursorToEndAndOpenKeyboard() {
+    input.requestFocus();
+
+    int numberLength = getText().length();
+    input.setSelection(numberLength, numberLength);
+
+    InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+    imm.showSoftInput(input, InputMethodManager.SHOW_IMPLICIT);
+
+    if (!imm.isAcceptingText()) {
+      imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, InputMethodManager.HIDE_IMPLICIT_ONLY);
+    }
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java

@@ -14,6 +14,7 @@
 
 import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.thoughtcrime.securesms.R;
@@ -78,13 +79,15 @@ public void showReminder(final Reminder reminder) {
     }
 
     text.setText(reminder.getText());
+    text.setTextColor(ContextCompat.getColor(getContext(), R.color.signal_button_primary_text));
 
     switch (reminder.getImportance()) {
       case NORMAL:
         container.setBackgroundResource(R.drawable.reminder_background_normal);
         break;
       case ERROR:
         container.setBackgroundResource(R.drawable.reminder_background_error);
+        text.setTextColor(ContextCompat.getColor(getContext(), R.color.signal_text_primary));
         break;
       case TERMINAL:
         container.setBackgroundResource(R.drawable.reminder_background_terminal);

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantListUpdate.java

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.components.webrtc;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
@@ -21,19 +22,19 @@
  */
 public final class CallParticipantListUpdate {
 
-  private final Set<Holder> added;
-  private final Set<Holder> removed;
+  private final Set<Wrapper> added;
+  private final Set<Wrapper> removed;
 
-  CallParticipantListUpdate(@NonNull Set<Holder> added, @NonNull Set<Holder> removed) {
+  CallParticipantListUpdate(@NonNull Set<Wrapper> added, @NonNull Set<Wrapper> removed) {
     this.added   = added;
     this.removed = removed;
   }
 
-  public @NonNull Set<Holder> getAdded() {
+  public @NonNull Set<Wrapper> getAdded() {
     return added;
   }
 
-  public @NonNull Set<Holder> getRemoved() {
+  public @NonNull Set<Wrapper> getRemoved() {
     return removed;
   }
 
@@ -68,66 +69,47 @@ public int hashCode() {
   public static @NonNull CallParticipantListUpdate computeDeltaUpdate(@NonNull List<CallParticipant> oldList,
                                                                       @NonNull List<CallParticipant> newList)
   {
-    Set<CallParticipantId>                primaries       = getPrimaries(oldList, newList);
-    Set<CallParticipantListUpdate.Holder> oldParticipants = Stream.of(oldList)
+    Set<CallParticipantListUpdate.Wrapper> oldParticipants = Stream.of(oldList)
                                                                   .filter(p -> p.getCallParticipantId().getDemuxId() != CallParticipantId.DEFAULT_ID)
-                                                                  .map(p -> createHolder(p, primaries.contains(p.getCallParticipantId())))
+                                                                  .map(CallParticipantListUpdate::createWrapper)
                                                                   .collect(Collectors.toSet());
-    Set<CallParticipantListUpdate.Holder> newParticipants = Stream.of(newList)
+    Set<CallParticipantListUpdate.Wrapper> newParticipants = Stream.of(newList)
                                                                   .filter(p -> p.getCallParticipantId().getDemuxId() != CallParticipantId.DEFAULT_ID)
-                                                                  .map(p -> createHolder(p, primaries.contains(p.getCallParticipantId())))
+                                                                  .map(CallParticipantListUpdate::createWrapper)
                                                                   .collect(Collectors.toSet());
-    Set<CallParticipantListUpdate.Holder> added           = SetUtil.difference(newParticipants, oldParticipants);
-    Set<CallParticipantListUpdate.Holder> removed         = SetUtil.difference(oldParticipants, newParticipants);
+    Set<CallParticipantListUpdate.Wrapper> added           = SetUtil.difference(newParticipants, oldParticipants);
+    Set<CallParticipantListUpdate.Wrapper> removed         = SetUtil.difference(oldParticipants, newParticipants);
 
     return new CallParticipantListUpdate(added, removed);
   }
 
-  static Holder createHolder(@NonNull CallParticipant callParticipant, boolean isPrimary) {
-    return new Holder(callParticipant.getCallParticipantId(), callParticipant.getRecipient(), isPrimary);
+  @VisibleForTesting
+  static Wrapper createWrapper(@NonNull CallParticipant callParticipant) {
+    return new Wrapper(callParticipant);
   }
 
-  private static @NonNull Set<CallParticipantId> getPrimaries(@NonNull List<CallParticipant> oldList, @NonNull List<CallParticipant> newList) {
-    return Stream.concat(Stream.of(oldList), Stream.of(newList))
-                 .map(CallParticipant::getCallParticipantId)
-                 .distinctBy(CallParticipantId::getRecipientId)
-                 .collect(Collectors.toSet());
-  }
-
-  static final class Holder {
-    private final CallParticipantId callParticipantId;
-    private final Recipient         recipient;
-    private final boolean           isPrimary;
-
-    private Holder(@NonNull CallParticipantId callParticipantId, @NonNull Recipient recipient, boolean isPrimary) {
-      this.callParticipantId = callParticipantId;
-      this.recipient         = recipient;
-      this.isPrimary         = isPrimary;
-    }
+  static final class Wrapper {
+    private final CallParticipant callParticipant;
 
-    public @NonNull Recipient getRecipient() {
-      return recipient;
+    private Wrapper(@NonNull CallParticipant callParticipant) {
+      this.callParticipant = callParticipant;
     }
 
-    /**
-     * Denotes whether this was the first detected instance of this recipient when generating an update. See
-     * {@link CallParticipantListUpdate#computeDeltaUpdate(List, List)}
-     */
-    public boolean isPrimary() {
-      return isPrimary;
+    public @NonNull CallParticipant getCallParticipant() {
+      return callParticipant;
     }
 
     @Override
     public boolean equals(Object o) {
       if (this == o) return true;
       if (o == null || getClass() != o.getClass()) return false;
-      Holder holder = (Holder) o;
-      return callParticipantId.equals(holder.callParticipantId);
+      Wrapper wrapper = (Wrapper) o;
+      return callParticipant.getCallParticipantId().equals(wrapper.callParticipant.getCallParticipantId());
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(callParticipantId);
+      return Objects.hash(callParticipant.getCallParticipantId());
     }
   }
 }