Add a few checks to avoid crashing

Signed-off-by: DrDisagree <[email protected]>
Mahmud0808 · Sep 4, 2024 · 242a82d · 242a82d
1 parent 4d1fdf8
commit 242a82d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClockA14.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClockA14.kt
@@ -294,10 +294,9 @@ class HeaderClockA14(context: Context?) : ModPack(context!!) {
                     addView(mQsIconsContainer)
                 }
 
-                mQuickStatusBarHeader!!.addView(
-                    mQsHeaderContainer,
-                    -1
-                )
+
+                (mQsHeaderContainer.parent as? ViewGroup)?.removeView(mQsHeaderContainer)
+                mQuickStatusBarHeader!!.addView(mQsHeaderContainer, -1)
 
                 handleOldHeaderView(param)
 
@@ -395,7 +394,7 @@ class HeaderClockA14(context: Context?) : ModPack(context!!) {
                                 "switchToParent",
                                 view,
                                 parent,
-                                index,
+                                index.coerceAtMost(parent.childCount),
                                 tag
                             )
 
@@ -450,7 +449,10 @@ class HeaderClockA14(context: Context?) : ModPack(context!!) {
                                 mQsHeaderContainerShadeParent.indexOfChild(mQsHeaderContainerShade) != index
                             ) {
                                 mQsHeaderContainerShadeParent?.removeView(mQsHeaderContainerShade)
-                                parent.addView(mQsHeaderContainerShade, index)
+                                parent.addView(
+                                    mQsHeaderContainerShade,
+                                    index.coerceAtMost(parent.childCount)
+                                )
                             }
                         }
 

diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/OpQsHeader.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/OpQsHeader.kt
@@ -408,10 +408,8 @@ class OpQsHeader(context: Context?) : ModPack(context!!) {
                     orientation = LinearLayout.VERTICAL
                 }
 
-                mQuickStatusBarHeader!!.addView(
-                    mQsHeaderContainer,
-                    -1
-                )
+                (mQsHeaderContainer.parent as? ViewGroup)?.removeView(mQsHeaderContainer)
+                mQuickStatusBarHeader!!.addView(mQsHeaderContainer, -1)
 
                 val relativeLayout = RelativeLayout(mContext).apply {
                     layoutParams = RelativeLayout.LayoutParams(
@@ -562,7 +560,7 @@ class OpQsHeader(context: Context?) : ModPack(context!!) {
                                 "switchToParent",
                                 view,
                                 parent,
-                                index,
+                                index.coerceAtMost(parent.childCount),
                                 tag
                             )
 
@@ -621,7 +619,7 @@ class OpQsHeader(context: Context?) : ModPack(context!!) {
                             }
                         }
 
-                        param.args[2] = (param.args[2] as Int) + 1
+                        param.args[2] = ((param.args[2] as Int) + 1).coerceAtMost(parent.childCount)
                     }
                 }
             )