Mirrors/SnapEnhance
1
0
Fork 0
mirror of https://github.com/rhunk/SnapEnhance.git synced 2025-05-29 21:10:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(account_switcher): crash after logging in

Browse Source
This commit is contained in:
rhunk 2024-05-26 14:47:49 +02:00
parent 577d2dca7a
commit fae26410ff
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/AccountSwitcher.kt
View File

@ -48,12 +48,11 @@ import java.util.zip.ZipOutputStream
import kotlin.random.Random import kotlin.random.Random
class AccountSwitcher: Feature("Account Switcher", loadParams = FeatureLoadParams.INIT_SYNC or FeatureLoadParams.ACTIVITY_CREATE_SYNC) { class AccountSwitcher: Feature("Account Switcher", loadParams = FeatureLoadParams.INIT_SYNC or FeatureLoadParams.ACTIVITY_CREATE_SYNC) {
private var activity: Activity? = null
private var exportCallback: Pair<Int, String>? = null // requestCode -> userId private var exportCallback: Pair<Int, String>? = null // requestCode -> userId
private var importRequestCode: Int? = null private var importRequestCode: Int? = null
private val accounts = mutableStateListOf<Pair<String, String>>() private val accounts = mutableStateListOf<Pair<String, String>>()
private val isLoginActivity get() = activity?.javaClass?.name?.endsWith("LoginSignupActivity") == true private val isLoginActivity get() = context.mainActivity?.javaClass?.name?.endsWith("LoginSignupActivity") == true
private fun updateUsers() { private fun updateUsers() {
accounts.clear() accounts.clear()
@ -139,7 +138,7 @@ class AccountSwitcher: Feature("Account Switcher", loadParams = FeatureLoadParam
val requestCode = Random.nextInt(100, 65535) val requestCode = Random.nextInt(100, 65535)
exportCallback = requestCode to user.first exportCallback = requestCode to user.first
activity?.startActivityForResult( context.mainActivity?.startActivityForResult(
Intent.createChooser( Intent.createChooser(
Intent(Intent.ACTION_CREATE_DOCUMENT).apply { Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
addCategory(Intent.CATEGORY_OPENABLE) addCategory(Intent.CATEGORY_OPENABLE)
@ -197,7 +196,7 @@ class AccountSwitcher: Feature("Account Switcher", loadParams = FeatureLoadParam
Button( Button(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
onClick = { onClick = {
activity?.startActivityForResult( context.mainActivity?.startActivityForResult(
Intent.createChooser( Intent.createChooser(
Intent(Intent.ACTION_OPEN_DOCUMENT).apply { Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
addCategory(Intent.CATEGORY_OPENABLE) addCategory(Intent.CATEGORY_OPENABLE)
@ -245,7 +244,7 @@ class AccountSwitcher: Feature("Account Switcher", loadParams = FeatureLoadParam
private fun showManagementPopup() { private fun showManagementPopup() {
context.runOnUiThread { context.runOnUiThread {
createComposeAlertDialog(activity!!) { createComposeAlertDialog(context.mainActivity!!) {
AppMaterialTheme(isDarkTheme = true) { AppMaterialTheme(isDarkTheme = true) {
Surface( Surface(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@ -352,7 +351,7 @@ class AccountSwitcher: Feature("Account Switcher", loadParams = FeatureLoadParam
runCatching { runCatching {
// copy zip file // copy zip file
activity!!.contentResolver.openInputStream(fileUri)?.use { input -> context.mainActivity!!.contentResolver.openInputStream(fileUri)?.use { input ->
val bufferedInputStream = input.buffered() val bufferedInputStream = input.buffered()
val fileType = MediaDownloaderHelper.getFileType(bufferedInputStream) val fileType = MediaDownloaderHelper.getFileType(bufferedInputStream)
@ -429,14 +428,13 @@ class AccountSwitcher: Feature("Account Switcher", loadParams = FeatureLoadParam
override fun onActivityCreate() { override fun onActivityCreate() {
if (context.config.experimental.accountSwitcher.globalState != true) return if (context.config.experimental.accountSwitcher.globalState != true) return
activity = context.mainActivity!! val hovaHeaderSearchIcon = context.mainActivity!!.resources.getId("hova_header_search_icon")
val hovaHeaderSearchIcon = activity!!.resources.getId("hova_header_search_icon")
context.event.subscribe(AddViewEvent::class) { event -> context.event.subscribe(AddViewEvent::class) { event ->
if (event.view.id != hovaHeaderSearchIcon) return@subscribe if (event.view.id != hovaHeaderSearchIcon) return@subscribe
event.view.setOnLongClickListener { event.view.setOnLongClickListener {
activity!!.vibrateLongPress() context.mainActivity!!.vibrateLongPress()
showManagementPopup() showManagementPopup()
false false
} }
@ -504,8 +502,7 @@ class AccountSwitcher: Feature("Account Switcher", loadParams = FeatureLoadParam
findClass("com.snap.identity.loginsignup.ui.LoginSignupActivity").apply { findClass("com.snap.identity.loginsignup.ui.LoginSignupActivity").apply {
hook("onPostCreate", HookStage.AFTER) { param -> hook("onPostCreate", HookStage.AFTER) { param ->
activity = param.thisObject() context.mainActivity!!.findViewById<FrameLayout>(android.R.id.content).addView(createComposeView(context.mainActivity!!) {
activity!!.findViewById<FrameLayout>(android.R.id.content).addView(createComposeView(activity!!) {
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) { ) {