TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-29 04:55:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: profile avatar fixes for local user now that we aren't setting local user profile key"

Browse Source 
This reverts commit 3f569e3403.
This commit is contained in:
0x330a 2023-04-06 10:53:21 +10:00
parent 3f569e3403
commit e059fdaa19
No known key found for this signature in database
GPG Key ID: 267811D6E6A2698C
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
View File

@ -14,7 +14,6 @@ import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.recipients.Recipient;
import org.session.libsignal.exceptions.PushNetworkException; import org.session.libsignal.exceptions.PushNetworkException;
import org.session.libsignal.streams.ProfileCipherInputStream; import org.session.libsignal.streams.ProfileCipherInputStream;
import org.session.libsignal.utilities.Base64;
import org.session.libsignal.utilities.Log; import org.session.libsignal.utilities.Log;
import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.dependencies.DatabaseComponent; import org.thoughtcrime.securesms.dependencies.DatabaseComponent;
@ -79,19 +78,7 @@ public class RetrieveProfileAvatarJob extends BaseJob {
@Override @Override
public void onRun() throws IOException { public void onRun() throws IOException {
RecipientDatabase database = DatabaseComponent.get(context).recipientDatabase(); RecipientDatabase database = DatabaseComponent.get(context).recipientDatabase();
byte[] profileKey = null; byte[] profileKey = recipient.resolve().getProfileKey();
if (recipient.resolve().isLocalNumber()) {
try {
String encodedProfileKey = TextSecurePreferences.getProfileKey(context);
if (encodedProfileKey != null) {
profileKey = Base64.decode(encodedProfileKey);
}
} catch (Exception e) {
Log.e(TAG, "Failed to decode local user profile key", e);
}
} else {
profileKey = recipient.resolve().getProfileKey();
}
if (profileKey == null || (profileKey.length != 32 && profileKey.length != 16)) { if (profileKey == null || (profileKey.length != 32 && profileKey.length != 16)) {
Log.w(TAG, "Recipient profile key is gone!"); Log.w(TAG, "Recipient profile key is gone!");