mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-21 09:20:19 +01:00
Update to libsignal 0.86.1
This commit is contained in:
@@ -38,7 +38,6 @@ import com.bumptech.glide.RequestManager;
|
||||
import com.codewaves.stickyheadergrid.StickyHeaderGridAdapter;
|
||||
|
||||
import org.signal.core.util.ByteSize;
|
||||
import org.signal.libsignal.protocol.util.Pair;
|
||||
import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.attachments.AttachmentId;
|
||||
import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
|
||||
@@ -69,6 +68,8 @@ import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import kotlin.Pair;
|
||||
|
||||
final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
|
||||
|
||||
private static final long SELECTION_ANIMATION_DURATION = TimeUnit.MILLISECONDS.toMillis(150);
|
||||
@@ -461,7 +462,7 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
|
||||
|
||||
@Override
|
||||
public void onChanged(Pair<Recipient, Recipient> fromToPair) {
|
||||
line1.setText(describe(fromToPair.first(), fromToPair.second()));
|
||||
line1.setText(describe(fromToPair.getFirst(), fromToPair.getSecond()));
|
||||
}
|
||||
|
||||
protected @Nullable String getMediaTitle() {
|
||||
|
||||
@@ -36,7 +36,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
import com.google.android.material.tabs.TabLayout;
|
||||
import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback;
|
||||
|
||||
import org.signal.libsignal.protocol.util.Pair;
|
||||
import org.thoughtcrime.securesms.PassphraseRequiredActivity;
|
||||
import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.components.AnimatingToggle;
|
||||
@@ -53,6 +52,8 @@ import org.signal.core.util.concurrent.SimpleTask;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import kotlin.Pair;
|
||||
|
||||
/**
|
||||
* Activity for displaying media attachments in-app
|
||||
*/
|
||||
@@ -276,7 +277,7 @@ public final class MediaOverviewActivity extends PassphraseRequiredActivity {
|
||||
? MediaOverviewPageFragment.GridMode.FOLLOW_MODEL
|
||||
: MediaOverviewPageFragment.GridMode.FIXED_DETAIL;
|
||||
|
||||
return MediaOverviewPageFragment.newInstance(threadId, pages.get(position).first(), gridMode);
|
||||
return MediaOverviewPageFragment.newInstance(threadId, pages.get(position).getFirst(), gridMode);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -286,7 +287,7 @@ public final class MediaOverviewActivity extends PassphraseRequiredActivity {
|
||||
|
||||
@Override
|
||||
public CharSequence getPageTitle(int position) {
|
||||
return pages.get(position).second();
|
||||
return pages.get(position).getSecond();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user