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

Update CDS enclave.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-09-09 15:36:38 -04:00
parent fa30c759d7
commit cdc7033a51
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -122,7 +122,7 @@ android {
buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\"" buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
buildConfigField "int", "CONTENT_PROXY_PORT", "443" buildConfigField "int", "CONTENT_PROXY_PORT", "443"
buildConfigField "String", "SIGNAL_AGENT", "\"OWA\"" buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
buildConfigField "String", "CDS_MRENCLAVE", "\"a3bfdf9717e35ce4f6fd3888133d65a71a880cd6a26c41d1e47647ed3e7704fa\"" buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
buildConfigField "String", "KBS_ENCLAVE_NAME", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\"" buildConfigField "String", "KBS_ENCLAVE_NAME", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\""
buildConfigField "String", "KBS_SERVICE_ID", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\"" buildConfigField "String", "KBS_SERVICE_ID", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\""
buildConfigField "String", "KBS_MRENCLAVE", "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\"" buildConfigField "String", "KBS_MRENCLAVE", "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\""

12
app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java
View File

@ -216,6 +216,8 @@ public class DirectoryHelper {
return; return;
} }
Stopwatch stopwatch = new Stopwatch("refresh");
DirectoryResult result; DirectoryResult result;
if (FeatureFlags.cds()) { if (FeatureFlags.cds()) {
@ -224,6 +226,8 @@ public class DirectoryHelper {
result = ContactDiscoveryV1.getDirectoryResult(databaseNumbers, systemNumbers); result = ContactDiscoveryV1.getDirectoryResult(databaseNumbers, systemNumbers);
} }
stopwatch.split("network");
if (result.getNumberRewrites().size() > 0) { if (result.getNumberRewrites().size() > 0) {
Log.i(TAG, "[getDirectoryResult] Need to rewrite some numbers."); Log.i(TAG, "[getDirectoryResult] Need to rewrite some numbers.");
recipientDatabase.updatePhoneNumbers(result.getNumberRewrites()); recipientDatabase.updatePhoneNumbers(result.getNumberRewrites());
@ -238,10 +242,16 @@ public class DirectoryHelper {
.map(recipientDatabase::getOrInsertFromE164) .map(recipientDatabase::getOrInsertFromE164)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
stopwatch.split("process-cds");
recipientDatabase.bulkUpdatedRegisteredStatus(uuidMap, inactiveIds); recipientDatabase.bulkUpdatedRegisteredStatus(uuidMap, inactiveIds);
stopwatch.split("update-registered");
updateContactsDatabase(context, activeIds, true, result.getNumberRewrites()); updateContactsDatabase(context, activeIds, true, result.getNumberRewrites());
stopwatch.split("contacts-db");
if (TextSecurePreferences.isMultiDevice(context)) { if (TextSecurePreferences.isMultiDevice(context)) {
ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob()); ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob());
} }
@ -258,6 +268,8 @@ public class DirectoryHelper {
} else { } else {
TextSecurePreferences.setHasSuccessfullyRetrievedDirectory(context, true); TextSecurePreferences.setHasSuccessfullyRetrievedDirectory(context, true);
} }
stopwatch.stop(TAG);
} }