Mirrors/grayjay
1
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-04-30 14:44:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed polycentric disable fallback.

Browse Source
This commit is contained in:
Koen 2023-12-05 16:10:51 +01:00
parent e45c8617df
commit 11b8914615
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/futo/platformplayer/states/StatePolycentric.kt
View File

@ -34,13 +34,11 @@ import kotlinx.coroutines.Deferred
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import userpackage.Protocol import userpackage.Protocol
import java.lang.Exception
import java.lang.Thread.State
import java.time.Instant import java.time.Instant
import java.time.OffsetDateTime import java.time.OffsetDateTime
import java.time.ZoneOffset import java.time.ZoneOffset
import kotlin.Exception
class StatePolycentric { class StatePolycentric {
private data class LikeDislikeEntry(val unixMilliseconds: Long, val hasLiked: Boolean, val hasDisliked: Boolean); private data class LikeDislikeEntry(val unixMilliseconds: Long, val hasLiked: Boolean, val hasDisliked: Boolean);
@ -49,7 +47,7 @@ class StatePolycentric {
private var _likeDislikeMap = hashMapOf<String, LikeDislikeEntry>() private var _likeDislikeMap = hashMapOf<String, LikeDislikeEntry>()
private val _activeProcessHandle = FragmentedStorage.get<StringStorage>("activeProcessHandle"); private val _activeProcessHandle = FragmentedStorage.get<StringStorage>("activeProcessHandle");
private var _transientEnabled = true private var _transientEnabled = true
val enabled = _transientEnabled && Settings.instance.other.polycentricEnabled val enabled get() = _transientEnabled && Settings.instance.other.polycentricEnabled
fun load(context: Context) { fun load(context: Context) {
if (!enabled) { if (!enabled) {
@ -62,12 +60,21 @@ class StatePolycentric {
val activeProcessHandleString = _activeProcessHandle.value; val activeProcessHandleString = _activeProcessHandle.value;
if (activeProcessHandleString.isNotEmpty()) { if (activeProcessHandleString.isNotEmpty()) {
val system = PublicKey.fromProto(Protocol.PublicKey.parseFrom(activeProcessHandleString.base64ToByteArray())); try {
setProcessHandle(Store.instance.getProcessSecret(system)?.toProcessHandle()); val system = PublicKey.fromProto(Protocol.PublicKey.parseFrom(activeProcessHandleString.base64ToByteArray()));
setProcessHandle(Store.instance.getProcessSecret(system)?.toProcessHandle());
} catch (e: Throwable) {
db.upgradeOldSecrets(db.writableDatabase);
val system = PublicKey.fromProto(Protocol.PublicKey.parseFrom(activeProcessHandleString.base64ToByteArray()));
setProcessHandle(Store.instance.getProcessSecret(system)?.toProcessHandle());
Log.i(TAG, "Failed to initialize Polycentric.", e)
}
} }
} catch (e: Throwable) { } catch (e: Throwable) {
_transientEnabled = false _transientEnabled = false
UIDialogs.toast(context, "Polycentric failed to initialize due to an error.") UIDialogs.showGeneralErrorDialog(context, "Failed to initialize Polycentric.", e);
Log.i(TAG, "Failed to initialize Polycentric.", e) Log.i(TAG, "Failed to initialize Polycentric.", e)
} }
} }

2
dep/polycentricandroid

@ -1 +1 @@
Subproject commit faaa7a6d8efb3f92fc239e7d77ec2f9a46c3a958 Subproject commit 62328514ec1dae52b8cc966561f73b81d7ebed80