clean
parent
82b8883bb1
commit
1a6da88ce3
@ -1,107 +0,0 @@
|
|||||||
package org.thoughtcrime.securesms.jobs;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
|
|
||||||
import org.session.libsession.messaging.jobs.Data;
|
|
||||||
import org.session.libsession.messaging.threads.recipients.Recipient;
|
|
||||||
import org.session.libsession.messaging.threads.Address;
|
|
||||||
import org.session.libsession.utilities.GroupUtil;
|
|
||||||
|
|
||||||
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
|
|
||||||
import org.thoughtcrime.securesms.dependencies.InjectableType;
|
|
||||||
import org.thoughtcrime.securesms.jobmanager.Job;
|
|
||||||
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
|
|
||||||
import org.session.libsignal.service.api.SignalServiceMessageSender;
|
|
||||||
import org.session.libsignal.service.api.messages.SignalServiceDataMessage;
|
|
||||||
import org.session.libsignal.service.api.messages.SignalServiceGroup;
|
|
||||||
import org.session.libsignal.service.api.messages.SignalServiceGroup.Type;
|
|
||||||
import org.session.libsignal.service.api.push.SignalServiceAddress;
|
|
||||||
import org.session.libsignal.service.api.push.exceptions.PushNetworkException;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
public class RequestGroupInfoJob extends BaseJob implements InjectableType {
|
|
||||||
|
|
||||||
public static final String KEY = "RequestGroupInfoJob";
|
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
|
||||||
private static final String TAG = RequestGroupInfoJob.class.getSimpleName();
|
|
||||||
|
|
||||||
private static final String KEY_SOURCE = "source";
|
|
||||||
private static final String KEY_GROUP_ID = "group_id";
|
|
||||||
|
|
||||||
@Inject SignalServiceMessageSender messageSender;
|
|
||||||
|
|
||||||
private String source;
|
|
||||||
private byte[] groupId;
|
|
||||||
|
|
||||||
public RequestGroupInfoJob(@NonNull String source, @NonNull byte[] groupId) {
|
|
||||||
this(new Job.Parameters.Builder()
|
|
||||||
.addConstraint(NetworkConstraint.KEY)
|
|
||||||
.setLifespan(TimeUnit.DAYS.toMillis(1))
|
|
||||||
.setMaxAttempts(Parameters.UNLIMITED)
|
|
||||||
.build(),
|
|
||||||
source,
|
|
||||||
groupId);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private RequestGroupInfoJob(@NonNull Job.Parameters parameters, @NonNull String source, @NonNull byte[] groupId) {
|
|
||||||
super(parameters);
|
|
||||||
|
|
||||||
this.source = source;
|
|
||||||
this.groupId = groupId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public @NonNull
|
|
||||||
Data serialize() {
|
|
||||||
return new Data.Builder().putString(KEY_SOURCE, source)
|
|
||||||
.putString(KEY_GROUP_ID, GroupUtil.getEncodedClosedGroupID(groupId))
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public @NonNull String getFactoryKey() {
|
|
||||||
return KEY;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRun() throws IOException {
|
|
||||||
SignalServiceGroup group = SignalServiceGroup.newBuilder(Type.REQUEST_INFO)
|
|
||||||
.withId(groupId, SignalServiceGroup.GroupType.SIGNAL)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
SignalServiceDataMessage message = SignalServiceDataMessage.newBuilder()
|
|
||||||
.asGroupMessage(group)
|
|
||||||
.withTimestamp(System.currentTimeMillis())
|
|
||||||
.build();
|
|
||||||
|
|
||||||
messageSender.sendMessage(0, new SignalServiceAddress(source),
|
|
||||||
UnidentifiedAccessUtil.getAccessFor(context, Recipient.from(context, Address.fromExternal(context, source), false)),
|
|
||||||
message, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onShouldRetry(@NonNull Exception e) {
|
|
||||||
return e instanceof PushNetworkException;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCanceled() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static final class Factory implements Job.Factory<RequestGroupInfoJob> {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public @NonNull RequestGroupInfoJob create(@NonNull Parameters parameters, @NonNull Data data) {
|
|
||||||
return new RequestGroupInfoJob(parameters,
|
|
||||||
data.getString(KEY_SOURCE),
|
|
||||||
GroupUtil.getDecodedGroupIDAsData(data.getString(KEY_GROUP_ID)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,112 +0,0 @@
|
|||||||
package org.thoughtcrime.securesms.jobs;
|
|
||||||
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
|
|
||||||
import org.session.libsession.messaging.jobs.Data;
|
|
||||||
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
|
|
||||||
import org.session.libsession.messaging.threads.Address;
|
|
||||||
import org.thoughtcrime.securesms.dependencies.InjectableType;
|
|
||||||
import org.thoughtcrime.securesms.jobmanager.Job;
|
|
||||||
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
|
|
||||||
import org.session.libsignal.utilities.logging.Log;
|
|
||||||
import org.session.libsession.messaging.threads.recipients.Recipient;
|
|
||||||
import org.session.libsignal.service.api.SignalServiceMessageSender;
|
|
||||||
import org.session.libsignal.service.api.messages.SignalServiceReceiptMessage;
|
|
||||||
import org.session.libsignal.service.api.push.SignalServiceAddress;
|
|
||||||
import org.session.libsignal.service.api.push.exceptions.PushNetworkException;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
public class SendDeliveryReceiptJob extends BaseJob implements InjectableType {
|
|
||||||
|
|
||||||
public static final String KEY = "SendDeliveryReceiptJob";
|
|
||||||
|
|
||||||
private static final String KEY_ADDRESS = "address";
|
|
||||||
private static final String KEY_MESSAGE_ID = "message_id";
|
|
||||||
private static final String KEY_TIMESTAMP = "timestamp";
|
|
||||||
|
|
||||||
private static final String TAG = "SendReadReceiptJob";
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
transient SignalServiceMessageSender messageSender;
|
|
||||||
|
|
||||||
private String address;
|
|
||||||
private long messageId;
|
|
||||||
private long timestamp;
|
|
||||||
|
|
||||||
public SendDeliveryReceiptJob(@NonNull Address address, long messageId) {
|
|
||||||
this(new Job.Parameters.Builder()
|
|
||||||
.addConstraint(NetworkConstraint.KEY)
|
|
||||||
.setLifespan(TimeUnit.DAYS.toMillis(1))
|
|
||||||
.setMaxAttempts(Parameters.UNLIMITED)
|
|
||||||
.build(),
|
|
||||||
address,
|
|
||||||
messageId,
|
|
||||||
System.currentTimeMillis());
|
|
||||||
}
|
|
||||||
|
|
||||||
private SendDeliveryReceiptJob(@NonNull Job.Parameters parameters,
|
|
||||||
@NonNull Address address,
|
|
||||||
long messageId,
|
|
||||||
long timestamp)
|
|
||||||
{
|
|
||||||
super(parameters);
|
|
||||||
|
|
||||||
this.address = address.serialize();
|
|
||||||
this.messageId = messageId;
|
|
||||||
this.timestamp = timestamp;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public @NonNull
|
|
||||||
Data serialize() {
|
|
||||||
return new Data.Builder().putString(KEY_ADDRESS, address)
|
|
||||||
.putLong(KEY_MESSAGE_ID, messageId)
|
|
||||||
.putLong(KEY_TIMESTAMP, timestamp)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public @NonNull String getFactoryKey() {
|
|
||||||
return KEY;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRun() throws IOException {
|
|
||||||
Log.d("Loki", "Sending delivery receipt.");
|
|
||||||
SignalServiceAddress remoteAddress = new SignalServiceAddress(address);
|
|
||||||
SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.DELIVERY,
|
|
||||||
Collections.singletonList(messageId),
|
|
||||||
timestamp);
|
|
||||||
|
|
||||||
messageSender.sendReceipt(remoteAddress,
|
|
||||||
UnidentifiedAccessUtil.getAccessFor(context, Recipient.from(context, Address.fromSerialized(address), false)),
|
|
||||||
receiptMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onShouldRetry(@NonNull Exception e) {
|
|
||||||
if (e instanceof PushNetworkException) return true;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCanceled() {
|
|
||||||
Log.w(TAG, "Failed to send delivery receipt to: " + address);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static final class Factory implements Job.Factory<SendDeliveryReceiptJob> {
|
|
||||||
@Override
|
|
||||||
public @NonNull SendDeliveryReceiptJob create(@NonNull Parameters parameters, @NonNull Data data) {
|
|
||||||
return new SendDeliveryReceiptJob(parameters,
|
|
||||||
Address.fromSerialized(data.getString(KEY_ADDRESS)),
|
|
||||||
data.getLong(KEY_MESSAGE_ID),
|
|
||||||
data.getLong(KEY_TIMESTAMP));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue