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

Hopefully fix file loading crash

Browse Source
This commit is contained in:
nielsandriesse
2020-08-19 11:29:52 +10:00
parent 3a1a99b183
commit 15d7a073f9
12 changed files with 73 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.database.loaders;
import android.content.Context;
import androidx.annotation.NonNull;
import com.annimon.stream.Stream;
@@ -8,13 +9,10 @@ import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.devicelist.Device;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities;
import org.thoughtcrime.securesms.util.AsyncLoader;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.signalservice.loki.crypto.MnemonicCodec;
import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.MultiDeviceProtocol;
import java.io.File;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -23,11 +21,9 @@ import java.util.Set;
public class DeviceListLoader extends AsyncLoader<List<Device>> {
private static final String TAG = DeviceListLoader.class.getSimpleName();
private MnemonicCodec mnemonicCodec;
public DeviceListLoader(Context context, File languageFileDirectory) {
public DeviceListLoader(Context context) {
super(context);
this.mnemonicCodec = new MnemonicCodec(languageFileDirectory);
}
@Override
@@ -45,7 +41,7 @@ public class DeviceListLoader extends AsyncLoader<List<Device>> {
}
private Device mapToDevice(@NonNull String hexEncodedPublicKey) {
String shortId = MnemonicUtilities.getFirst3Words(mnemonicCodec, hexEncodedPublicKey);
String shortId = "";
String name = DatabaseFactory.getLokiUserDatabase(getContext()).getDisplayName(hexEncodedPublicKey);
return new Device(hexEncodedPublicKey, shortId, name);
}