Fix bug when calling non-Signal contacts from Settings.

Fixes #11450
fork-5.53.8
Cody Henthorne 2021-07-08 16:13:51 -04:00
rodzic 5ec9c1cd90
commit cb79f75ac1
1 zmienionych plików z 18 dodań i 14 usunięć

Wyświetl plik

@ -51,21 +51,25 @@ public class CommunicationActions {
return; return;
} }
ApplicationDependencies.getSignalCallManager().isCallActive(new ResultReceiver(new Handler(Looper.getMainLooper())) { if (recipient.isRegistered()) {
@Override ApplicationDependencies.getSignalCallManager().isCallActive(new ResultReceiver(new Handler(Looper.getMainLooper())) {
protected void onReceiveResult(int resultCode, Bundle resultData) { @Override
if (resultCode == 1) { protected void onReceiveResult(int resultCode, Bundle resultData) {
startCallInternal(activity, recipient, false); if (resultCode == 1) {
} else { startCallInternal(activity, recipient, false);
new AlertDialog.Builder(activity) } else {
.setMessage(R.string.CommunicationActions_start_voice_call) new AlertDialog.Builder(activity)
.setPositiveButton(R.string.CommunicationActions_call, (d, w) -> startCallInternal(activity, recipient, false)) .setMessage(R.string.CommunicationActions_start_voice_call)
.setNegativeButton(R.string.CommunicationActions_cancel, (d, w) -> d.dismiss()) .setPositiveButton(R.string.CommunicationActions_call, (d, w) -> startCallInternal(activity, recipient, false))
.setCancelable(true) .setNegativeButton(R.string.CommunicationActions_cancel, (d, w) -> d.dismiss())
.show(); .setCancelable(true)
.show();
}
} }
} });
}); } else {
startInsecureCall(activity, recipient);
}
} }
public static void startVideoCall(@NonNull FragmentActivity activity, @NonNull Recipient recipient) { public static void startVideoCall(@NonNull FragmentActivity activity, @NonNull Recipient recipient) {