mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-22 18:00:02 +01:00
Update to libsignal 0.86.1
This commit is contained in:
@@ -8,7 +8,6 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.WorkerThread;
|
||||
|
||||
import org.signal.core.util.CursorUtil;
|
||||
import org.signal.libsignal.protocol.util.Pair;
|
||||
import org.thoughtcrime.securesms.contacts.paged.ContactSearchSortOrder;
|
||||
import org.thoughtcrime.securesms.database.RecipientTable;
|
||||
import org.thoughtcrime.securesms.database.SignalDatabase;
|
||||
@@ -20,6 +19,8 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import kotlin.Pair;
|
||||
|
||||
/**
|
||||
* Repository for all contacts. Allows you to filter them via queries.
|
||||
*
|
||||
@@ -140,8 +141,8 @@ public class ContactRepository {
|
||||
for (int i = 0; i < mappers.size(); i++) {
|
||||
Pair<String, ValueMapper> pair = mappers.get(i);
|
||||
|
||||
positions.put(pair.first(), i);
|
||||
columnNames[i] = pair.first();
|
||||
positions.put(pair.getFirst(), i);
|
||||
columnNames[i] = pair.getFirst();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -168,17 +169,17 @@ public class ContactRepository {
|
||||
|
||||
@Override
|
||||
public String getString(int columnIndex) {
|
||||
return String.valueOf(mappers.get(columnIndex).second().get(wrapped));
|
||||
return String.valueOf(mappers.get(columnIndex).getSecond().get(wrapped));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getInt(int columnIndex) {
|
||||
return (int) mappers.get(columnIndex).second().get(wrapped);
|
||||
return (int) mappers.get(columnIndex).getSecond().get(wrapped);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getLong(int columnIndex) {
|
||||
return (long) mappers.get(columnIndex).second().get(wrapped);
|
||||
return (long) mappers.get(columnIndex).getSecond().get(wrapped);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user