Skip to content

App disguise bug fixes #1149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 12, 2025
Merged

App disguise bug fixes #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f6651b
Make sure activity is finished after changing app disguise settings
SessionHero01 May 12, 2025
0243dc6
Fix styling issue
SessionHero01 May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class SwitchPreferenceCompat : TwoStatePreference {

constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs, androidx.preference.R.attr.switchPreferenceCompatStyle)
constructor(context: Context) : this(context, null, androidx.preference.R.attr.switchPreferenceCompatStyle)

private val checkState = MutableStateFlow(isChecked)
private val enableState = MutableStateFlow(isEnabled)
Expand Down
54 changes: 50 additions & 4 deletions app/src/main/java/org/thoughtcrime/securesms/disguise/AppDisguiseManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
package org.thoughtcrime.securesms.disguise

import android.app.Activity
import android.app.Application
import android.app.Application.ActivityLifecycleCallbacks
import android.content.ComponentName
import android.content.Intent
import android.content.pm.PackageManager
import android.os.Bundle
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.SharingStarted
Expand Down Expand Up @@ -39,6 +43,8 @@ class AppDisguiseManager @Inject constructor(
) {
private val scope: CoroutineScope = GlobalScope

private var currentActivity: Activity? = null

val allAppAliases: Flow<List<AppAlias>> = flow {
emit(
application.packageManager
Expand Down Expand Up @@ -108,28 +114,68 @@ class AppDisguiseManager @Inject constructor(
val state = if (alias === enabledAlias) PackageManager.COMPONENT_ENABLED_STATE_ENABLED
else PackageManager.COMPONENT_ENABLED_STATE_DISABLED

ComponentName(application, alias.activityAliasName) to state
Triple(
ComponentName(application, alias.activityAliasName),
state,
alias.defaultEnabled
)
}
}.collectLatest { all ->
val packageManager = application.packageManager
if (android.os.Build.VERSION.SDK_INT >= 33) {
application.packageManager.setComponentEnabledSettings(
packageManager.setComponentEnabledSettings(
all.map { (name, state) ->
PackageManager.ComponentEnabledSetting(
name, state, PackageManager.DONT_KILL_APP or PackageManager.SYNCHRONOUS
)
}
)
} else {
all.forEach { (name, state) ->
application.packageManager.setComponentEnabledSetting(
// Query current enable state for each component
val changed = all.filter { (name, desiredState, defaultEnabled) ->
val state = packageManager.getComponentEnabledSetting(name)
val wasEnabled = when (state) {
PackageManager.COMPONENT_ENABLED_STATE_ENABLED -> true
PackageManager.COMPONENT_ENABLED_STATE_DISABLED -> false
else -> defaultEnabled
}

val willBeEnabled = (desiredState == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) ||
(desiredState == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT && defaultEnabled)
wasEnabled != willBeEnabled
}

changed.forEach { (name, state) ->
packageManager.setComponentEnabledSetting(
name,
state,
PackageManager.DONT_KILL_APP
)
}

if (changed.isNotEmpty()) {
// Finish current activity if the disguise is on
currentActivity?.finishAffinity()
}
}
}
}

application.registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
override fun onActivityStarted(activity: Activity) {
currentActivity = activity
}
override fun onActivityResumed(activity: Activity) {}
override fun onActivityPaused(activity: Activity) {}
override fun onActivityStopped(activity: Activity) {
if (currentActivity === activity) {
currentActivity = null
}
}
override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
override fun onActivityDestroyed(activity: Activity) {}
})
}

fun setSelectedAliasName(name: String?) {
Expand Down