Don't ring on incoming calls from blocked numbers

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-09-30 12:31:47 -07:00
parent 3bec127020
commit e46caa024d

View File

@ -16,6 +16,8 @@ import org.thoughtcrime.redphone.signaling.signals.CompressedInitiateSignalProto
import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.jobs.PushContentReceiveJob; import org.thoughtcrime.securesms.jobs.PushContentReceiveJob;
import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob; import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
import org.thoughtcrime.securesms.recipients.RecipientFactory;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import java.io.IOException; import java.io.IOException;
@ -65,15 +67,20 @@ public class GcmBroadcastReceiver extends WakefulBroadcastReceiver {
String signalingKey = TextSecurePreferences.getSignalingKey(context); String signalingKey = TextSecurePreferences.getSignalingKey(context);
EncryptedSignalMessage encryptedSignalMessage = new EncryptedSignalMessage(data, signalingKey); EncryptedSignalMessage encryptedSignalMessage = new EncryptedSignalMessage(data, signalingKey);
CompressedInitiateSignal signal = CompressedInitiateSignal.parseFrom(encryptedSignalMessage.getPlaintext()); CompressedInitiateSignal signal = CompressedInitiateSignal.parseFrom(encryptedSignalMessage.getPlaintext());
Recipients recipients = RecipientFactory.getRecipientsFromString(context, signal.getInitiator(), false);
Intent intent = new Intent(context, RedPhoneService.class); if (!recipients.isBlocked()) {
intent.setAction(RedPhoneService.ACTION_INCOMING_CALL); Intent intent = new Intent(context, RedPhoneService.class);
intent.putExtra(RedPhoneService.EXTRA_REMOTE_NUMBER, signal.getInitiator()); intent.setAction(RedPhoneService.ACTION_INCOMING_CALL);
intent.putExtra(RedPhoneService.EXTRA_SESSION_DESCRIPTOR, new SessionDescriptor(signal.getServerName(), intent.putExtra(RedPhoneService.EXTRA_REMOTE_NUMBER, signal.getInitiator());
signal.getPort(), intent.putExtra(RedPhoneService.EXTRA_SESSION_DESCRIPTOR, new SessionDescriptor(signal.getServerName(),
signal.getSessionId(), signal.getPort(),
signal.getVersion())); signal.getSessionId(),
context.startService(intent); signal.getVersion()));
context.startService(intent);
} else {
Log.w(TAG, "*** Received incoming call from blocked number, ignoring...");
}
} catch (InvalidEncryptedSignalException | IOException e) { } catch (InvalidEncryptedSignalException | IOException e) {
Log.w(TAG, e); Log.w(TAG, e);
} }