fixes #1413 OrbotBottomSheets only set height in their show function if they're attached - they are in onCreateDialog, but may not be when the setOnShowListener is invoked

Author: bitmold

app/src/main/java/org/torproject/android/ui/OrbotBottomSheetDialogFragment.kt

@@ -1,6 +1,7 @@
 package org.torproject.android.ui
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.app.Dialog
 import android.graphics.Color
 import android.os.Bundle
@@ -22,37 +23,37 @@ bottom sheets to come
  */
 open class OrbotBottomSheetDialogFragment : BottomSheetDialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-            val dialog = BottomSheetDialog(requireActivity(), theme)
-            dialog.setOnShowListener {
-                val bottomSheet = dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet) as? FrameLayout
-                bottomSheet?.let {
-                    it.setBackgroundResource(R.drawable.bottom_sheet_rounded)
-                    it.setBackgroundColor(Color.TRANSPARENT)
-                    val layoutParams = it.layoutParams
-                    layoutParams.height = getHeight()
-                    bottomSheet.layoutParams = layoutParams
-                    val behavior = BottomSheetBehavior.from<FrameLayout>(bottomSheet)
-                    behavior.state = BottomSheetBehavior.STATE_EXPANDED
-                }
+        val dialog = BottomSheetDialog(requireActivity(), theme)
+        dialog.setOnShowListener {
+            val bottomSheetView =
+                dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet) as? FrameLayout
+            bottomSheetView?.let {
+                it.setBackgroundResource(R.drawable.bottom_sheet_rounded)
+                it.setBackgroundColor(Color.TRANSPARENT)
+                setHeightIfAttached(activity, it)
+                val behavior = BottomSheetBehavior.from<FrameLayout>(it)
+                behavior.state = BottomSheetBehavior.STATE_EXPANDED
             }
+        }
 
-            return dialog
-    }
-
-    protected fun closeAllSheets() {
-        dismiss()
+        return dialog
     }
 
-    private fun getHeight() : Int{
-        val displayMetrics = DisplayMetrics()
-        requireActivity().windowManager.defaultDisplay.getMetrics(displayMetrics)
-        return displayMetrics.heightPixels * 80 / 100
+    private fun setHeightIfAttached(activity: Activity?, bottomSheet: View) {
+        activity?.let {
+            val displayMetrics = DisplayMetrics()
+            requireActivity().windowManager.defaultDisplay.getMetrics(displayMetrics)
+            val height = displayMetrics.heightPixels * 4 / 5
+            val layoutParams = bottomSheet.layoutParams
+            layoutParams.height = height
+            bottomSheet.layoutParams = layoutParams
+        }
     }
 
     @SuppressLint("ClickableViewAccessibility")
     protected fun configureMultilineEditTextScrollEvent(editText: EditText) {
         // need this for scrolling an edittext in a BSDF
-        editText.setOnTouchListener {v , event ->
+        editText.setOnTouchListener { v, event ->
             v.parent.requestDisallowInterceptTouchEvent(true)
             when (event.action and MotionEvent.ACTION_MASK) {
                 MotionEvent.ACTION_UP -> v.parent.requestDisallowInterceptTouchEvent(false)

app/src/main/java/org/torproject/android/ui/connect/ConfigConnectionBottomSheet.kt

@@ -176,7 +176,7 @@ class ConfigConnectionBottomSheet :
     }
 
     private fun closeAndConnect() {
-        closeAllSheets()
+        dismiss()
         val navHostFragment = requireActivity().supportFragmentManager.fragments[0] as NavHostFragment
         val connectFrag = navHostFragment.childFragmentManager.fragments.last() as ConnectFragment
         connectFrag.startTorAndVpn()
@@ -282,6 +282,6 @@ class ConfigConnectionBottomSheet :
     fun tryConnectingFromCustomBridge() {
         Prefs.transport = Transport.CUSTOM
         Prefs.smartConnect = false
-        closeAndConnect()
+        dismiss()
     }
 }

app/src/main/java/org/torproject/android/ui/connect/CustomBridgeBottomSheet.kt

@@ -102,7 +102,7 @@ class CustomBridgeBottomSheet() :
 
         binding.btnAction.setOnClickListener {
             Prefs.bridgesList = binding.etBridges.text?.split("\n") ?: emptyList()
-            closeAllSheets()
+            dismiss()
             val parent = requireActivity().supportFragmentManager.findFragmentByTag(
                 ConfigConnectionBottomSheet.TAG
             ) as ConfigConnectionBottomSheet

app/src/main/java/org/torproject/android/ui/kindness/KindnessConfigBottomSheet.kt

@@ -25,11 +25,9 @@ class KindnessConfigBottomSheet : OrbotBottomSheetDialogFragment() {
         val configCharging = v.findViewById<SwitchCompat>(R.id.swKindnessConfigCharging)
 
         btnAction.setOnClickListener {
-
             Prefs.setBeSnowflakeProxyLimitWifi(configWifi.isChecked)
             Prefs.setBeSnowflakeProxyLimitCharging(configCharging.isChecked)
-
-            closeAllSheets()
+            dismiss()
         }
 
         configWifi.isChecked = Prefs.limitSnowflakeProxyingWifi()