From 271b0dc1363dc3a4b43faa63b800b45a4f7f42a0 Mon Sep 17 00:00:00 2001 From: luvletter2333 Date: Wed, 13 Jul 2022 16:47:45 +0800 Subject: [PATCH] fix LoginActivity NPE --- .../src/main/java/org/telegram/ui/LoginActivity.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java index 9886f7a3e..de9ec576f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java @@ -659,10 +659,12 @@ public class LoginActivity extends BaseFragment implements NotificationCenter.No regenerateLoginToken(false); } else if (id == menu_custom_dc) { PhoneView phoneView = (PhoneView)views[VIEW_PHONE_INPUT]; - if (phoneView.testBackendCheckBox.getVisibility() == View.GONE) - phoneView.testBackendCheckBox.setVisibility(View.VISIBLE); - else - phoneView.testBackendCheckBox.setVisibility(View.GONE); + if (phoneView.testBackendCheckBox != null) { + if (phoneView.testBackendCheckBox.getVisibility() == View.GONE) + phoneView.testBackendCheckBox.setVisibility(View.VISIBLE); + else + phoneView.testBackendCheckBox.setVisibility(View.GONE); + } } }); menu.setContentDescription(LocaleController.getString(R.string.items_other)); @@ -2033,7 +2035,7 @@ public class LoginActivity extends BaseFragment implements NotificationCenter.No }); } - if (BuildVars.DEBUG_PRIVATE_VERSION && activityMode == MODE_LOGIN) { + if (activityMode == MODE_LOGIN) { testBackendCheckBox = new CheckBoxCell(context, 2); testBackendCheckBox.setText("Test Backend", "", testBackend, false); addView(testBackendCheckBox, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.MATCH_PARENT, Gravity.LEFT | Gravity.TOP, 16, 0, 16 + (LocaleController.isRTL && AndroidUtilities.isSmallScreen() ? Build.VERSION.SDK_INT >= 21 ? 56 : 60 : 0), 0));