From 2984ee4ef3ffc6bdd49a3d3c5486446083597be2 Mon Sep 17 00:00:00 2001 From: luvletter2333 Date: Sat, 3 Dec 2022 02:03:38 +0800 Subject: [PATCH] fix NPE about LinearLayout --- .../java/org/telegram/ui/ActionBar/BottomSheet.java | 2 +- .../org/telegram/ui/Components/AudioPlayerAlert.java | 2 +- .../ui/Components/ChatAttachAlertPhotoLayout.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BottomSheet.java index cd827dc3a..c7bbc08e6 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BottomSheet.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BottomSheet.java @@ -522,7 +522,7 @@ public class BottomSheet extends Dialog { continue; } if (!onCustomLayout(child, left, top, right, bottom - (drawNavigationBar ? getBottomInset() : 0))) { - final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) child.getLayoutParams(); + final FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) child.getLayoutParams(); final int width = child.getMeasuredWidth(); final int height = child.getMeasuredHeight(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java index f1e46aa9b..a2ee8d741 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java @@ -290,7 +290,7 @@ public class AudioPlayerAlert extends BottomSheet implements NotificationCenter. layoutParams = (LayoutParams) actionBarShadow.getLayoutParams(); layoutParams.topMargin = ActionBar.getCurrentActionBarHeight() + AndroidUtilities.statusBarHeight; - LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) blurredView.getLayoutParams(); + FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) blurredView.getLayoutParams(); lp.topMargin = -getPaddingTop(); int contentSize = AndroidUtilities.dp(179); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java index d8dee8373..9e843f341 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java @@ -2257,7 +2257,7 @@ public class ChatAttachAlertPhotoLayout extends ChatAttachAlert.AttachAlertLayou int cameraViewW, cameraViewH; - LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) cameraView.getLayoutParams(); + FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) cameraView.getLayoutParams(); float textureStartHeight = cameraView.getTextureHeight(startWidth, startHeight); float textureEndHeight = cameraView.getTextureHeight(endWidth, endHeight); @@ -2442,16 +2442,16 @@ public class ChatAttachAlertPhotoLayout extends ChatAttachAlert.AttachAlertLayou int finalWidth = itemSize; int finalHeight = itemSize; - LinearLayout.LayoutParams layoutParams; + ViewGroup.LayoutParams layoutParams; if (!cameraOpened) { cameraView.setClipTop((int) cameraViewOffsetY); cameraView.setClipBottom((int) cameraViewOffsetBottomY); - layoutParams = (LinearLayout.LayoutParams) cameraView.getLayoutParams(); + layoutParams = cameraView.getLayoutParams(); if (layoutParams.height != finalHeight || layoutParams.width != finalWidth) { layoutParams.width = finalWidth; layoutParams.height = finalHeight; cameraView.setLayoutParams(layoutParams); - final LinearLayout.LayoutParams layoutParamsFinal = layoutParams; + final ViewGroup.LayoutParams layoutParamsFinal = layoutParams; AndroidUtilities.runOnUIThread(() -> { if (cameraView != null) { cameraView.setLayoutParams(layoutParamsFinal); @@ -2463,12 +2463,12 @@ public class ChatAttachAlertPhotoLayout extends ChatAttachAlert.AttachAlertLayou finalWidth = (int) (itemSize - cameraViewOffsetX); finalHeight = (int) (itemSize - cameraViewOffsetY - cameraViewOffsetBottomY); - layoutParams = (LinearLayout.LayoutParams) cameraIcon.getLayoutParams(); + layoutParams = cameraIcon.getLayoutParams(); if (layoutParams.height != finalHeight || layoutParams.width != finalWidth) { layoutParams.width = finalWidth; layoutParams.height = finalHeight; cameraIcon.setLayoutParams(layoutParams); - final LinearLayout.LayoutParams layoutParamsFinal = layoutParams; + final ViewGroup.LayoutParams layoutParamsFinal = layoutParams; AndroidUtilities.runOnUIThread(() -> { if (cameraIcon != null) { cameraIcon.setLayoutParams(layoutParamsFinal);