From 6798c1a2c2b157e3783e5b36ce1dbc162e2110e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Thu, 1 Oct 2020 12:34:06 +0800 Subject: [PATCH] Fix ask before call --- .../telegram/ui/Components/AlertsCreator.java | 2 +- .../ui/Components/voip/VoIPHelper.java | 21 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java index bd3edc897..1245eb94f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java @@ -1505,7 +1505,7 @@ public class AlertsCreator { AlertDialog dialog = new AlertDialog.Builder(context).setView(frameLayout) .setPositiveButton(LocaleController.getString("Call", R.string.Call), (dialogInterface, i) -> { final TLRPC.UserFull userFull = fragment.getMessagesController().getUserFull(user.id); - VoIPHelper.startCall(user, videoCall, userFull != null && userFull.video_calls_available, fragment.getParentActivity(), userFull); + VoIPHelper.startCall(user, videoCall, userFull != null && userFull.video_calls_available, fragment.getParentActivity(), userFull, true); }) .setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null) .create(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/voip/VoIPHelper.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/voip/VoIPHelper.java index fd04de4a2..e65833a2e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/voip/VoIPHelper.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/voip/VoIPHelper.java @@ -99,6 +99,17 @@ public class VoIPHelper { return; } + if (!confirmed && NekoConfig.askBeforeCall) { + new AlertDialog.Builder(activity) + .setTitle(LocaleController.getString("ConfirmCall", R.string.ConfirmCall)) + .setMessage(AndroidUtilities.replaceTags(LocaleController.formatString("CallTo", R.string.CallTo, + ContactsController.formatName(user.first_name, user.last_name)))) + .setPositiveButton(LocaleController.getString("OK", R.string.OK), (dialog, which) -> startCall(user, videoCall, canVideoCall, activity, userFull, true)) + .setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null) + .show(); + return; + } + if (Build.VERSION.SDK_INT >= 23) { int code; ArrayList permissions = new ArrayList<>(); @@ -114,16 +125,6 @@ public class VoIPHelper { activity.requestPermissions(permissions.toArray(new String[0]), videoCall ? 102 : 101); } } else { - if (!confirmed && NekoConfig.askBeforeCall) { - new AlertDialog.Builder(activity) - .setTitle(LocaleController.getString("ConfirmCall", R.string.ConfirmCall)) - .setMessage(AndroidUtilities.replaceTags(LocaleController.formatString("CallTo", R.string.CallTo, - ContactsController.formatName(user.first_name, user.last_name)))) - .setPositiveButton(LocaleController.getString("OK", R.string.OK), (dialog, which) -> startCall(user, videoCall, canVideoCall, activity, userFull, true)) - .setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null) - .show(); - return; - } initiateCall(user, null, videoCall, canVideoCall, false, activity); } }