Mirrors/SnapEnhance
1
0
Fork 0
mirror of https://github.com/rhunk/SnapEnhance.git synced 2025-05-09 19:04:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(core/bridge): friend sync crash

Browse Source 
- add missing explicit types
This commit is contained in:
rhunk 2023-10-31 14:58:46 +01:00
parent be5a61e17d
commit a7ab2ffced
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/BridgeClient.kt
View File

@ -13,6 +13,7 @@ import de.robv.android.xposed.XposedHelpers
import me.rhunk.snapenhance.bridge.BridgeInterface import me.rhunk.snapenhance.bridge.BridgeInterface
import me.rhunk.snapenhance.bridge.ConfigStateListener import me.rhunk.snapenhance.bridge.ConfigStateListener
import me.rhunk.snapenhance.bridge.DownloadCallback import me.rhunk.snapenhance.bridge.DownloadCallback
import me.rhunk.snapenhance.bridge.MessageLoggerInterface
import me.rhunk.snapenhance.bridge.SyncCallback import me.rhunk.snapenhance.bridge.SyncCallback
import me.rhunk.snapenhance.bridge.e2ee.E2eeInterface import me.rhunk.snapenhance.bridge.e2ee.E2eeInterface
import me.rhunk.snapenhance.bridge.scripting.IScripting import me.rhunk.snapenhance.bridge.scripting.IScripting
@ -103,6 +104,7 @@ class BridgeClient(
fun broadcastLog(tag: String, level: String, message: String) = service.broadcastLog(tag, level, message) fun broadcastLog(tag: String, level: String, message: String) = service.broadcastLog(tag, level, message)
//TODO: use interfaces instead of direct file access
fun createAndReadFile( fun createAndReadFile(
fileType: BridgeFileType, fileType: BridgeFileType,
defaultContent: ByteArray defaultContent: ByteArray
@ -123,11 +125,14 @@ class BridgeClient(
LocalePair(it.key, it.value) LocalePair(it.key, it.value)
} }
fun getApplicationApkPath() = service.getApplicationApkPath() fun getApplicationApkPath(): String = service.getApplicationApkPath()
fun enqueueDownload(intent: Intent, callback: DownloadCallback) = service.enqueueDownload(intent, callback) fun enqueueDownload(intent: Intent, callback: DownloadCallback) = service.enqueueDownload(intent, callback)
fun sync(callback: SyncCallback) = service.sync(callback) fun sync(callback: SyncCallback) {
if (!context.database.hasMain()) return
service.sync(callback)
}
fun triggerSync(scope: SocialScope, id: String) = service.triggerSync(scope.key, id) fun triggerSync(scope: SocialScope, id: String) = service.triggerSync(scope.key, id)
@ -148,7 +153,7 @@ class BridgeClient(
fun getE2eeInterface(): E2eeInterface = service.getE2eeInterface() fun getE2eeInterface(): E2eeInterface = service.getE2eeInterface()
fun getMessageLogger() = service.messageLogger fun getMessageLogger(): MessageLoggerInterface = service.messageLogger
fun registerMessagingBridge(bridge: MessagingBridge) = service.registerMessagingBridge(bridge) fun registerMessagingBridge(bridge: MessagingBridge) = service.registerMessagingBridge(bridge)

2
core/src/main/kotlin/me/rhunk/snapenhance/core/database/DatabaseAccess.kt
View File

@ -68,13 +68,13 @@ class DatabaseAccess(
} }
}.onFailure { }.onFailure {
context.log.error("Failed to open database $fileName, restarting!", it) context.log.error("Failed to open database $fileName, restarting!", it)
context.softRestartApp()
}.getOrNull() ?: throw IllegalStateException("Failed to open database $fileName") }.getOrNull() ?: throw IllegalStateException("Failed to open database $fileName")
} }
private fun openMain() = openLocalDatabase("main.db") private fun openMain() = openLocalDatabase("main.db")
private fun openArroyo() = openLocalDatabase("arroyo.db") private fun openArroyo() = openLocalDatabase("arroyo.db")
fun hasMain(): Boolean = context.androidContext.getDatabasePath("main.db").exists()
fun hasArroyo(): Boolean = context.androidContext.getDatabasePath("arroyo.db").exists() fun hasArroyo(): Boolean = context.androidContext.getDatabasePath("arroyo.db").exists()
private fun <T : DatabaseObject> readDatabaseObject( private fun <T : DatabaseObject> readDatabaseObject(