brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suppress boot config errors

Browse Source
This commit is contained in:
Mygod
2023-06-12 22:41:54 -04:00
parent 5766919216
commit bba6336b6c
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mobile/src/main/java/be/mygod/vpnhotspot/BootReceiver.kt
View File

@@ -29,12 +29,7 @@ class BootReceiver : BroadcastReceiver() {
else PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP) else PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
private val userEnabled get() = app.pref.getBoolean(KEY, false) private val userEnabled get() = app.pref.getBoolean(KEY, false)
fun onUserSettingUpdated(shouldStart: Boolean) { fun onUserSettingUpdated(shouldStart: Boolean) {
enabled = shouldStart && try { enabled = shouldStart && config?.startables?.isEmpty() == false
config
} catch (e: Exception) {
Timber.w(e)
null
}?.startables?.isEmpty() == false
} }
private fun onConfigUpdated(isNotEmpty: Boolean) { private fun onConfigUpdated(isNotEmpty: Boolean) {
enabled = isNotEmpty && userEnabled enabled = isNotEmpty && userEnabled
@@ -46,14 +41,12 @@ class BootReceiver : BroadcastReceiver() {
DataInputStream(configFile.inputStream()).use { it.readBytes().toParcelable() } DataInputStream(configFile.inputStream()).use { it.readBytes().toParcelable() }
} catch (_: FileNotFoundException) { } catch (_: FileNotFoundException) {
null null
} catch (e: Exception) {
Timber.d("Boot config corrupted", e)
null
} }
private fun updateConfig(work: Config.() -> Unit) = synchronized(BootReceiver) { private fun updateConfig(work: Config.() -> Unit) = synchronized(BootReceiver) {
val config = try { val config = config ?: Config()
config
} catch (e: Exception) {
Timber.i("Boot config corrupted", e)
null
} ?: Config()
config.work() config.work()
DataOutputStream(configFile.outputStream()).use { it.write(config.toByteArray()) } DataOutputStream(configFile.outputStream()).use { it.write(config.toByteArray()) }
config config
@@ -85,12 +78,7 @@ class BootReceiver : BroadcastReceiver() {
private var started = false private var started = false
private fun startIfNecessary() { private fun startIfNecessary() {
if (started) return if (started) return
val config = try { val config = synchronized(BootReceiver) { config }
synchronized(BootReceiver) { config }
} catch (e: Exception) {
Timber.w(e)
null
}
if (config == null || config.startables.isEmpty()) { if (config == null || config.startables.isEmpty()) {
enabled = false enabled = false
} else for (startable in config.startables.values) startable.start(app) } else for (startable in config.startables.values) startable.start(app)