vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Automatically postpone prekey deletion

This commit is contained in:
Paul Schaub 2018-12-13 22:12:39 +01:00
parent c3ffeec6d3
commit f827bb08d3
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
View File

@ -107,6 +107,8 @@ public final class OmemoManager extends Manager {
private OmemoTrustCallback trustCallback; private OmemoTrustCallback trustCallback;
private ScheduledFuture<?> postponingPreKeyDeletion;
private BareJid ownJid; private BareJid ownJid;
private Integer deviceId; private Integer deviceId;
@ -249,6 +251,10 @@ public final class OmemoManager extends Manager {
throw new IllegalStateException("No TrustCallback set."); throw new IllegalStateException("No TrustCallback set.");
} }
if (!OmemoConfiguration.isDisablePostponePrekeyDeletion()) {
temporarilyPostponePreKeyDeletion(OmemoConfiguration.getPostponePrekeyDeletionPeriod());
}
getOmemoService().init(new LoggedInOmemoManager(this)); getOmemoService().init(new LoggedInOmemoManager(this));
ServiceDiscoveryManager.getInstanceFor(connection()).addFeature(PEP_NODE_DEVICE_LIST_NOTIFY); ServiceDiscoveryManager.getInstanceFor(connection()).addFeature(PEP_NODE_DEVICE_LIST_NOTIFY);
} }
@ -282,8 +288,9 @@ public final class OmemoManager extends Manager {
* Recommended values for {@code millis} are around 1000 * 60 * 3. * Recommended values for {@code millis} are around 1000 * 60 * 3.
* *
* @param millis period in milliseconds from now, in which preKeys are not deleted immediately. * @param millis period in milliseconds from now, in which preKeys are not deleted immediately.
* @return scheduled future
*/ */
public void temporarilyPostponePreKeyDeletion(long millis) { public ScheduledFuture<?> temporarilyPostponePreKeyDeletion(long millis) {
final OmemoStore<?,?,?,?,?,?,?,?,?> store = getOmemoService().getOmemoStoreBackend(); final OmemoStore<?,?,?,?,?,?,?,?,?> store = getOmemoService().getOmemoStoreBackend();
final OmemoDevice userDevice = getOwnDevice(); final OmemoDevice userDevice = getOwnDevice();
@ -291,8 +298,12 @@ public final class OmemoManager extends Manager {
throw new IllegalStateException("No OmemoDevice has been determined yet. OmemoManager needs to be initialized."); throw new IllegalStateException("No OmemoDevice has been determined yet. OmemoManager needs to be initialized.");
} }
if (postponingPreKeyDeletion != null) {
throw new IllegalStateException("PreKeyDeletion is already being postponed.");
}
store.postponePreKeyDeletion(userDevice); store.postponePreKeyDeletion(userDevice);
ScheduledFuture<?> result = schedule(new Runnable() { postponingPreKeyDeletion = schedule(new Runnable() {
@Override @Override
public void run() { public void run() {
Async.go(new Runnable() { Async.go(new Runnable() {
@ -320,6 +331,8 @@ public final class OmemoManager extends Manager {
}); });
} }
}, millis, TimeUnit.MILLISECONDS); }, millis, TimeUnit.MILLISECONDS);
return postponingPreKeyDeletion;
} }
/** /**