From ca3f5761ae07e9756282d2e5ea8f32b832ebbfb3 Mon Sep 17 00:00:00 2001
From: vivabelarus <74508922+vivabelarus@users.noreply.github.com>
Date: Thu, 10 Nov 2022 18:24:28 +0400
Subject: [PATCH] fix DialogButtonWithTimer

---
 .../DialogBuilder/DialogButtonWithTimer.java  | 10 ++++---
 .../ui/OldTelegramWarningActivity.java        | 29 -------------------
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/DialogBuilder/DialogButtonWithTimer.java b/TMessagesProj/src/main/java/org/telegram/ui/DialogBuilder/DialogButtonWithTimer.java
index 7ff221e62..6e3468351 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/DialogBuilder/DialogButtonWithTimer.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/DialogBuilder/DialogButtonWithTimer.java
@@ -22,13 +22,15 @@ public class DialogButtonWithTimer {
         info.text = text;
         info.timeout = timeout;
 
-        dialog.setButton(buttonType,text + "(" + timeout + ")", (dlg, which) -> {
+        dialog.setButton(buttonType, text, (dlg, which) -> {
             if (info.timeout == 0) {
                 listener.onClick(dlg, which);
             }
         });
         dialog.setOnShowListener(dlg -> {
             TextView button = (TextView)dialog.getButton(buttonType);
+            info.text = button.getText().toString();
+            button.setText(info.text + " (" + timeout + ")");
             button.setTextColor(Theme.getColor(Theme.key_dialogTextGray3));
             button.setEnabled(false);
             TimeoutRunnable timeoutRunnable = new TimeoutRunnable(button, info);
@@ -51,10 +53,10 @@ public class DialogButtonWithTimer {
                 info.timeout--;
                 AndroidUtilities.runOnUIThread(() -> {
                     if (info.timeout > 0) {
-                        cancelButton.setText((info.text + " (" + info.timeout + ")").toUpperCase(Locale.ROOT));
+                        cancelButton.setText(info.text + " (" + info.timeout + ")");
                     } else {
-                        cancelButton.setText(info.text.toUpperCase(Locale.ROOT));
-                        cancelButton.setTextColor(Theme.getColor(Theme.key_dialogTextGray));
+                        cancelButton.setText(info.text);
+                        cancelButton.setTextColor(Theme.getColor(Theme.key_dialogButton));
                         cancelButton.setEnabled(true);
                     }
                 });
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/OldTelegramWarningActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/OldTelegramWarningActivity.java
index 9fa4ab0ee..d77c3583a 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/OldTelegramWarningActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/OldTelegramWarningActivity.java
@@ -423,33 +423,4 @@ public class OldTelegramWarningActivity extends BaseFragment implements Notifica
         public boolean isDismissed = false;
         public int timeout = 5;
     }
-
-    private static class TimeoutRunnable implements Runnable {
-        TextView cancelButton;
-        public DialogDismissedInfo dialogInfo;
-
-        public TimeoutRunnable(TextView cancelButton, DialogDismissedInfo dialogInfo) {
-            this.cancelButton = cancelButton;
-            this.dialogInfo = dialogInfo;
-        }
-
-        @Override
-        public void run() {
-            if (!dialogInfo.isDismissed) {
-                dialogInfo.timeout--;
-                AndroidUtilities.runOnUIThread(() -> {
-                    if (dialogInfo.timeout > 0) {
-                        cancelButton.setText((getString("Continue") + " (" + dialogInfo.timeout + ")").toUpperCase(Locale.ROOT));
-                    } else {
-                        cancelButton.setText(getString("Continue").toUpperCase(Locale.ROOT));
-                        cancelButton.setTextColor(Theme.getColor(Theme.key_dialogTextGray));
-                        cancelButton.setEnabled(true);
-                    }
-                });
-                if (dialogInfo.timeout > 0) {
-                    Utilities.globalQueue.postRunnable(this, 1000);
-                }
-            }
-        }
-    }
 }