diff --git a/README.md b/README.md
index 2f20738..64b2964 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ locks a device and optionally runs wipe.
Also you can:
* fire when a device was not unlocked for X time
* fire when a USB data connection is made while a device is locked
+* fire when a fake messenger app is launched
* fire when a duress password is entered (companion app: [Duress](https://github.com/x13a/Duress))
The app works in `Work Profile` too. Use [Shelter](https://github.com/PeterCxy/Shelter) to install
diff --git a/app/build.gradle b/app/build.gradle
index 1fd2654..590fc68 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
applicationId "me.lucky.wasted"
minSdk 23
targetSdk 32
- versionCode 34
- versionName "1.5.5"
+ versionCode 35
+ versionName "1.5.6"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1531773..f2e2775 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -156,5 +156,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/me/lucky/wasted/MainActivity.kt b/app/src/main/java/me/lucky/wasted/MainActivity.kt
index 4959127..3c4d322 100644
--- a/app/src/main/java/me/lucky/wasted/MainActivity.kt
+++ b/app/src/main/java/me/lucky/wasted/MainActivity.kt
@@ -143,6 +143,7 @@ open class MainActivity : AppCompatActivity() {
R.id.nav_trigger_tile -> TileFragment()
R.id.nav_trigger_notification -> NotificationFragment()
R.id.nav_trigger_lock -> LockFragment()
+ R.id.nav_trigger_application -> ApplicationFragment()
R.id.top_settings -> SettingsFragment()
else -> MainFragment()
}
diff --git a/app/src/main/java/me/lucky/wasted/Preferences.kt b/app/src/main/java/me/lucky/wasted/Preferences.kt
index b8284e6..574e343 100644
--- a/app/src/main/java/me/lucky/wasted/Preferences.kt
+++ b/app/src/main/java/me/lucky/wasted/Preferences.kt
@@ -22,6 +22,7 @@ class Preferences(ctx: Context, encrypted: Boolean = true) {
private const val TRIGGERS = "triggers"
private const val TRIGGER_LOCK_COUNT = "trigger_lock_count"
private const val TRIGGER_TILE_DELAY = "trigger_tile_delay"
+ private const val TRIGGER_APPLICATION_OPTIONS = "trigger_application_options"
private const val FILE_NAME = "sec_shared_prefs"
@@ -85,6 +86,10 @@ class Preferences(ctx: Context, encrypted: Boolean = true) {
get() = prefs.getLong(TRIGGER_TILE_DELAY, DEFAULT_TRIGGER_TILE_DELAY)
set(value) = prefs.edit { putLong(TRIGGER_TILE_DELAY, value) }
+ var triggerApplicationOptions: Int
+ get() = prefs.getInt(TRIGGER_APPLICATION_OPTIONS, 0)
+ set(value) = prefs.edit { putInt(TRIGGER_APPLICATION_OPTIONS, value) }
+
fun registerListener(listener: SharedPreferences.OnSharedPreferenceChangeListener) =
prefs.registerOnSharedPreferenceChangeListener(listener)
@@ -114,4 +119,12 @@ enum class Trigger(val value: Int) {
NOTIFICATION(1 shl 4),
LOCK(1 shl 5),
USB(1 shl 6),
+ APPLICATION(1 shl 7),
+}
+
+enum class ApplicationOption(val value: Int) {
+ SIGNAL(1),
+ TELEGRAM(1 shl 1),
+ THREEMA(1 shl 2),
+ SESSION(1 shl 3),
}
\ No newline at end of file
diff --git a/app/src/main/java/me/lucky/wasted/Utils.kt b/app/src/main/java/me/lucky/wasted/Utils.kt
index 5a865b7..72a5700 100644
--- a/app/src/main/java/me/lucky/wasted/Utils.kt
+++ b/app/src/main/java/me/lucky/wasted/Utils.kt
@@ -36,6 +36,7 @@ class Utils(private val ctx: Context) {
setBroadcastEnabled(enabled && triggers.and(Trigger.BROADCAST.value) != 0)
setNotificationEnabled(enabled && triggers.and(Trigger.NOTIFICATION.value) != 0)
updateForegroundRequiredEnabled()
+ updateApplicationEnabled()
}
fun setPanicKitEnabled(enabled: Boolean) {
@@ -60,6 +61,29 @@ class Utils(private val ctx: Context) {
fun setNotificationEnabled(enabled: Boolean) =
setComponentEnabled(NotificationListenerService::class.java, enabled)
+ fun updateApplicationEnabled() {
+ val prefix = "${ctx.packageName}.trigger.application"
+ val prefs = Preferences(ctx)
+ val options = prefs.triggerApplicationOptions
+ val enabled = prefs.isEnabled && prefs.triggers.and(Trigger.APPLICATION.value) != 0
+ setComponentEnabled(
+ "$prefix.SignalActivity",
+ enabled && options.and(ApplicationOption.SIGNAL.value) != 0,
+ )
+ setComponentEnabled(
+ "$prefix.TelegramActivity",
+ enabled && options.and(ApplicationOption.TELEGRAM.value) != 0,
+ )
+ setComponentEnabled(
+ "$prefix.ThreemaActivity",
+ enabled && options.and(ApplicationOption.THREEMA.value) != 0,
+ )
+ setComponentEnabled(
+ "$prefix.SessionActivity",
+ enabled && options.and(ApplicationOption.SESSION.value) != 0,
+ )
+ }
+
fun updateForegroundRequiredEnabled() {
val prefs = Preferences(ctx)
val enabled = prefs.isEnabled
@@ -78,8 +102,14 @@ class Utils(private val ctx: Context) {
}
private fun setComponentEnabled(cls: Class<*>, enabled: Boolean) =
+ setComponentEnabled(ComponentName(ctx, cls), enabled)
+
+ private fun setComponentEnabled(cls: String, enabled: Boolean) =
+ setComponentEnabled(ComponentName(ctx, cls), enabled)
+
+ private fun setComponentEnabled(componentName: ComponentName, enabled: Boolean) =
ctx.packageManager.setComponentEnabledSetting(
- ComponentName(ctx, cls),
+ componentName,
if (enabled) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else
PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP,
diff --git a/app/src/main/java/me/lucky/wasted/fragment/ApplicationFragment.kt b/app/src/main/java/me/lucky/wasted/fragment/ApplicationFragment.kt
new file mode 100644
index 0000000..8aeb9db
--- /dev/null
+++ b/app/src/main/java/me/lucky/wasted/fragment/ApplicationFragment.kt
@@ -0,0 +1,95 @@
+package me.lucky.wasted.fragment
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+
+import me.lucky.wasted.ApplicationOption
+import me.lucky.wasted.Preferences
+import me.lucky.wasted.Utils
+import me.lucky.wasted.databinding.FragmentApplicationBinding
+
+class ApplicationFragment : Fragment() {
+ private lateinit var binding: FragmentApplicationBinding
+ private lateinit var ctx: Context
+ private lateinit var prefs: Preferences
+ private lateinit var prefsdb: Preferences
+ private val utils by lazy { Utils(ctx) }
+
+ private val prefsListener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
+ prefs.copyTo(prefsdb, key)
+ }
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?,
+ ): View {
+ binding = FragmentApplicationBinding.inflate(inflater, container, false)
+ init()
+ setup()
+ return binding.root
+ }
+
+ override fun onStart() {
+ super.onStart()
+ prefs.registerListener(prefsListener)
+ }
+
+ override fun onStop() {
+ super.onStop()
+ prefs.unregisterListener(prefsListener)
+ }
+
+ private fun init() {
+ ctx = requireContext()
+ prefs = Preferences(ctx)
+ prefsdb = Preferences(ctx, encrypted = false)
+ binding.apply {
+ val options = prefs.triggerApplicationOptions
+ signal.isChecked = options.and(ApplicationOption.SIGNAL.value) != 0
+ telegram.isChecked = options.and(ApplicationOption.TELEGRAM.value) != 0
+ threema.isChecked = options.and(ApplicationOption.THREEMA.value) != 0
+ session.isChecked = options.and(ApplicationOption.SESSION.value) != 0
+ }
+ }
+
+ private fun setup() = binding.apply {
+ signal.setOnCheckedChangeListener { _, isChecked ->
+ prefs.triggerApplicationOptions = Utils.setFlag(
+ prefs.triggerApplicationOptions,
+ ApplicationOption.SIGNAL.value,
+ isChecked,
+ )
+ utils.updateApplicationEnabled()
+ }
+ telegram.setOnCheckedChangeListener { _, isChecked ->
+ prefs.triggerApplicationOptions = Utils.setFlag(
+ prefs.triggerApplicationOptions,
+ ApplicationOption.TELEGRAM.value,
+ isChecked,
+ )
+ utils.updateApplicationEnabled()
+ }
+ threema.setOnCheckedChangeListener { _, isChecked ->
+ prefs.triggerApplicationOptions = Utils.setFlag(
+ prefs.triggerApplicationOptions,
+ ApplicationOption.THREEMA.value,
+ isChecked,
+ )
+ utils.updateApplicationEnabled()
+ }
+ session.setOnCheckedChangeListener { _, isChecked ->
+ prefs.triggerApplicationOptions = Utils.setFlag(
+ prefs.triggerApplicationOptions,
+ ApplicationOption.SESSION.value,
+ isChecked,
+ )
+ utils.updateApplicationEnabled()
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/me/lucky/wasted/fragment/SettingsFragment.kt b/app/src/main/java/me/lucky/wasted/fragment/SettingsFragment.kt
index 8334b61..44a96f2 100644
--- a/app/src/main/java/me/lucky/wasted/fragment/SettingsFragment.kt
+++ b/app/src/main/java/me/lucky/wasted/fragment/SettingsFragment.kt
@@ -60,6 +60,7 @@ class SettingsFragment : Fragment() {
notification.isChecked = triggers.and(Trigger.NOTIFICATION.value) != 0
lock.isChecked = triggers.and(Trigger.LOCK.value) != 0
usb.isChecked = triggers.and(Trigger.USB.value) != 0
+ application.isChecked = triggers.and(Trigger.APPLICATION.value) != 0
}
}
@@ -93,5 +94,9 @@ class SettingsFragment : Fragment() {
prefs.triggers = Utils.setFlag(prefs.triggers, Trigger.USB.value, isChecked)
utils.updateForegroundRequiredEnabled()
}
+ application.setOnCheckedChangeListener { _, isChecked ->
+ prefs.triggers = Utils.setFlag(prefs.triggers, Trigger.APPLICATION.value, isChecked)
+ utils.updateApplicationEnabled()
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/me/lucky/wasted/trigger/application/ApplicationActivity.kt b/app/src/main/java/me/lucky/wasted/trigger/application/ApplicationActivity.kt
new file mode 100644
index 0000000..61858d2
--- /dev/null
+++ b/app/src/main/java/me/lucky/wasted/trigger/application/ApplicationActivity.kt
@@ -0,0 +1,26 @@
+package me.lucky.wasted.trigger.application
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+import me.lucky.wasted.Preferences
+import me.lucky.wasted.Trigger
+import me.lucky.wasted.admin.DeviceAdminManager
+
+class ApplicationActivity : AppCompatActivity() {
+ private val prefs by lazy { Preferences(this) }
+ private val admin by lazy { DeviceAdminManager(this) }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ if (!prefs.isEnabled || prefs.triggers.and(Trigger.APPLICATION.value) == 0) {
+ finishAndRemoveTask()
+ return
+ }
+ try {
+ admin.lockNow()
+ if (prefs.isWipeData) admin.wipeData()
+ } catch (exc: SecurityException) {}
+ finishAndRemoveTask()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/me/lucky/wasted/trigger/shortcut/ShortcutActivity.kt b/app/src/main/java/me/lucky/wasted/trigger/shortcut/ShortcutActivity.kt
index 2208e25..5ef3433 100644
--- a/app/src/main/java/me/lucky/wasted/trigger/shortcut/ShortcutActivity.kt
+++ b/app/src/main/java/me/lucky/wasted/trigger/shortcut/ShortcutActivity.kt
@@ -10,11 +10,8 @@ import me.lucky.wasted.trigger.broadcast.BroadcastReceiver
class ShortcutActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- if (Preferences(this).triggers.and(Trigger.SHORTCUT.value) == 0) {
- finishAndRemoveTask()
- return
- }
- BroadcastReceiver.panic(this, intent)
+ if (Preferences(this).triggers.and(Trigger.SHORTCUT.value) != 0)
+ BroadcastReceiver.panic(this, intent)
finishAndRemoveTask()
}
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/ic_telegram_foreground.xml b/app/src/main/res/drawable-v24/ic_telegram_foreground.xml
new file mode 100644
index 0000000..715ef17
--- /dev/null
+++ b/app/src/main/res/drawable-v24/ic_telegram_foreground.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+