TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 08:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show name and short id in linked device screen.

Browse Source
This commit is contained in:
Mikunj
2019-11-20 15:47:28 +11:00
parent e72d5502ce
commit c3bda57ac1
4 changed files with 50 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java
View File

@@ -7,8 +7,10 @@ import android.text.TextUtils;
import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
import org.thoughtcrime.securesms.database.Database;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.devicelist.Device;
import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.loki.MnemonicUtilities;
import org.thoughtcrime.securesms.util.AsyncLoader;
@@ -66,8 +68,9 @@ public class DeviceListLoader extends AsyncLoader<List<Device>> {
}
private Device mapToDevice(@NonNull String hexEncodedPublicKey) {
long now = System.currentTimeMillis();
return new Device(hexEncodedPublicKey, MnemonicUtilities.getFirst3Words(mnemonicCodec, hexEncodedPublicKey), now, now);
String shortId = MnemonicUtilities.getFirst3Words(mnemonicCodec, hexEncodedPublicKey);
String name = DatabaseFactory.getLokiUserDatabase(getContext()).getDisplayName(hexEncodedPublicKey);
return new Device(hexEncodedPublicKey, shortId, name);
}
private static class DeviceComparator implements Comparator<Device> {