diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt index 0d1bb6eb0d..dcec88bdbc 100644 --- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt @@ -10,13 +10,11 @@ package im.vector.app.core.platform import android.annotation.SuppressLint import android.app.Activity import android.content.Context -import android.os.Build import android.os.Bundle import android.view.Menu import android.view.MenuInflater import android.view.MenuItem import android.view.View -import android.view.WindowInsetsController import android.view.WindowManager import android.widget.TextView import androidx.annotation.CallSuper @@ -25,7 +23,6 @@ import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.app.MultiWindowModeChangedInfo -import androidx.core.content.ContextCompat import androidx.core.util.Consumer import androidx.core.view.MenuProvider import androidx.core.view.isVisible @@ -336,7 +333,8 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver private fun handleCertificateError(certificateError: GlobalError.CertificateError) { singletonEntryPoint() .unrecognizedCertificateDialog() - .show(this, + .show( + this, certificateError.fingerprint, object : UnrecognizedCertificateDialog.Callback { override fun onAccept() { @@ -446,14 +444,6 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver mdmService.unregisterListener(this) } - override fun onWindowFocusChanged(hasFocus: Boolean) { - super.onWindowFocusChanged(hasFocus) - - if (hasFocus && displayInFullscreen()) { - setFullScreen() - } - } - private val onMultiWindowModeChangedListener = Consumer { Timber.w("onMultiWindowModeChanged. isInMultiWindowMode: ${it.isInMultiWindowMode}") bugReporter.inMultiWindowMode = it.isInMultiWindowMode @@ -463,33 +453,6 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver * PRIVATE METHODS * ========================================================================================== */ - /** - * Force to render the activity in fullscreen. - */ - private fun setFullScreen() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - // New API instead of SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN and SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - @Suppress("DEPRECATION") - window.setDecorFitsSystemWindows(false) - // New API instead of SYSTEM_UI_FLAG_IMMERSIVE - window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE - // New API instead of FLAG_TRANSLUCENT_STATUS - @Suppress("DEPRECATION") - window.statusBarColor = ContextCompat.getColor(this, im.vector.lib.ui.styles.R.color.half_transparent_status_bar) - // New API instead of FLAG_TRANSLUCENT_NAVIGATION - @Suppress("DEPRECATION") - window.navigationBarColor = ContextCompat.getColor(this, im.vector.lib.ui.styles.R.color.half_transparent_status_bar) - } else { - @Suppress("DEPRECATION") - window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE - or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - or View.SYSTEM_UI_FLAG_FULLSCREEN - or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) - } - } - private fun handleMenuItemHome(item: MenuItem): Boolean { return when (item.itemId) { android.R.id.home -> { @@ -591,8 +554,6 @@ abstract class VectorBaseActivity : AppCompatActivity(), Maver abstract fun getBinding(): VB - open fun displayInFullscreen() = false - open fun doBeforeSetContentView() = Unit open fun initUiAndData() = Unit