TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-24 13:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Share profile key when initiating a conversation

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-08-16 21:49:41 -07:00
parent c11f2eddf5
commit 5942e93a33
5 changed files with 55 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/org/thoughtcrime/securesms/jobs/PushSendJob.java
View File

@@ -70,18 +70,21 @@ public abstract class PushSendJob extends SendJob {
Optional<RecipientsPreferences> recipientsPreferences = DatabaseFactory.getRecipientPreferenceDatabase(context)
.getRecipientsPreferences(address);
if (recipientsPreferences.isPresent() && !TextUtils.isEmpty(recipientsPreferences.get().getSystemDisplayName())) {
String profileKey = TextSecurePreferences.getProfileKey(context);
if (!recipientsPreferences.isPresent()) return Optional.absent();
if (profileKey == null) {
profileKey = Util.getSecret(32);
TextSecurePreferences.setProfileKey(context, profileKey);
}
boolean isSystemContact = !TextUtils.isEmpty(recipientsPreferences.get().getSystemDisplayName());
boolean isApproved = recipientsPreferences.get().isProfileSharing();
return Optional.of(Base64.decode(profileKey));
if (!isSystemContact & !isApproved) return Optional.absent();
String profileKey = TextSecurePreferences.getProfileKey(context);
if (profileKey == null) {
profileKey = Util.getSecret(32);
TextSecurePreferences.setProfileKey(context, profileKey);
}
return Optional.absent();
return Optional.of(Base64.decode(profileKey));
} catch (IOException e) {
throw new AssertionError(e);
}