Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to libsignal 0.86.1

Browse Source
This commit is contained in:
Jordan Rose
2025-11-07 13:34:31 -08:00
committed by GitHub
parent 945453cb81
commit b2e547f9f2
37 changed files with 119 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyViewModel.java
View File

@@ -10,7 +10,6 @@ import androidx.lifecycle.ViewModelProvider;
import com.annimon.stream.Stream;
import org.signal.core.util.logging.Log;
import org.signal.libsignal.protocol.util.Pair;
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.settings.SettingHeader;
@@ -32,6 +31,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Objects;
import kotlin.Pair;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
@@ -95,11 +96,11 @@ public final class SetCurrencyViewModel extends ViewModel {
private int findSelectedIndex(MappingModelList items) {
return Stream.of(items)
.mapIndexed(Pair::new)
.filter(p -> p.second() instanceof SingleSelectSetting.Item)
.map(p -> new Pair<>(p.first(), (SingleSelectSetting.Item) p.second()))
.filter(pair -> pair.second().isSelected())
.filter(p -> p.getSecond() instanceof SingleSelectSetting.Item)
.map(p -> new Pair<>(p.getFirst(), (SingleSelectSetting.Item) p.getSecond()))
.filter(pair -> pair.getSecond().isSelected())
.findFirst()
.map(Pair::first)
.map(Pair::getFirst)
.orElse(-1);
}