diff options
| -rw-r--r-- | wear/src/main/java/dev/equestria/pluralwear/pluralkt/fulltypes/PkFullSystem.kt | 4 | ||||
| -rw-r--r-- | wear/src/main/java/dev/equestria/pluralwear/presentation/PluralKitSyncWorker.kt | 27 |
2 files changed, 8 insertions, 23 deletions
diff --git a/wear/src/main/java/dev/equestria/pluralwear/pluralkt/fulltypes/PkFullSystem.kt b/wear/src/main/java/dev/equestria/pluralwear/pluralkt/fulltypes/PkFullSystem.kt index 8958268..781e5c6 100644 --- a/wear/src/main/java/dev/equestria/pluralwear/pluralkt/fulltypes/PkFullSystem.kt +++ b/wear/src/main/java/dev/equestria/pluralwear/pluralkt/fulltypes/PkFullSystem.kt @@ -28,7 +28,7 @@ import kotlin.concurrent.thread */ class PkFullSystem( - system: PkSystem?, systemSettings: PkSystemSettings?, systemMembers: Array<PkMember>?, systemGroups: Array<PkGroup>?, systemFronter: PkFronter? + system: PkSystem?, systemMembers: Array<PkMember>?, systemGroups: Array<PkGroup>?, systemFronter: PkFronter? ) : PkType { // Basic system stuff val id: PkId @@ -47,7 +47,6 @@ class PkFullSystem( var webhookUrl: String? = null // Custom stuff - val settings: PkSystemSettings? var members: MutableList<PkFullMember>? = mutableListOf() var groups: MutableList<PkFullGroup>? = mutableListOf() var front: PkFullFronter? @@ -66,7 +65,6 @@ class PkFullSystem( privacy = system?.privacy webhookUrl = system?.webhookUrl - settings = systemSettings front = systemFronter?.let { PkFullFronter(it) } if (systemMembers != null) { diff --git a/wear/src/main/java/dev/equestria/pluralwear/presentation/PluralKitSyncWorker.kt b/wear/src/main/java/dev/equestria/pluralwear/presentation/PluralKitSyncWorker.kt index f15c2ef..843c049 100644 --- a/wear/src/main/java/dev/equestria/pluralwear/presentation/PluralKitSyncWorker.kt +++ b/wear/src/main/java/dev/equestria/pluralwear/presentation/PluralKitSyncWorker.kt @@ -27,7 +27,6 @@ class PluralKitSyncWorker(appContext: Context, workerParams: WorkerParameters) : if (PluralKt.tokenExists()) { var sys: PkSystem? = null - var settings: PkSystemSettings? = null var members: Array<PkMember>? = null var groups: Array<PkGroup>? = null var front: PkFronter? = null @@ -49,19 +48,7 @@ class PluralKitSyncWorker(appContext: Context, workerParams: WorkerParameters) : Log.d("PluralKit Sync", "Got system") sys = this.getSuccess() - checkForSync(startTime, sys, settings, members, groups, front) - } - } - PluralKt.System.getSystemSettings("@me") { - if (!this.isError() && !this.isSuccess()) { - throw NullPointerException("An internal error occurred with the PluralKt library.") - } else if (this.isError()) { - handleErrors(this.getError()) - } else { - Log.d("PluralKit Sync", "Got settings") - settings = this.getSuccess() - - checkForSync(startTime, sys, settings, members, groups, front) + checkForSync(startTime, sys, members, groups, front) } } PluralKt.Member.getMembers("@me") { @@ -73,7 +60,7 @@ class PluralKitSyncWorker(appContext: Context, workerParams: WorkerParameters) : Log.d("PluralKit Sync", "Got members") members = this.getSuccess() - checkForSync(startTime, sys, settings, members, groups, front) + checkForSync(startTime, sys, members, groups, front) } } PluralKt.Group.getGroups("@me") { @@ -85,7 +72,7 @@ class PluralKitSyncWorker(appContext: Context, workerParams: WorkerParameters) : Log.d("PluralKit Sync", "Got group") groups = this.getSuccess() - checkForSync(startTime, sys, settings, members, groups, front) + checkForSync(startTime, sys, members, groups, front) } } PluralKt.Switch.getFronters("@me") { @@ -97,7 +84,7 @@ class PluralKitSyncWorker(appContext: Context, workerParams: WorkerParameters) : Log.d("PluralKit Sync", "Got fronters") front = this.getSuccess() - checkForSync(startTime, sys, settings, members, groups, front) + checkForSync(startTime, sys, members, groups, front) } } } catch (ex: NullPointerException) { @@ -119,8 +106,8 @@ class PluralKitSyncWorker(appContext: Context, workerParams: WorkerParameters) : } } - private fun checkForSync(startTime: Instant, sys: PkSystem?, settings: PkSystemSettings?, members: Array<PkMember>?, groups: Array<PkGroup>?, front: PkFronter?) { - if (sys != null && settings != null && members != null && groups != null && front != null) { + private fun checkForSync(startTime: Instant, sys: PkSystem?, members: Array<PkMember>?, groups: Array<PkGroup>?, front: PkFronter?) { + if (sys != null && members != null && groups != null && front != null) { val apiTime = Clock.System.now() Log.i( "PluralKit Sync", @@ -130,7 +117,7 @@ class PluralKitSyncWorker(appContext: Context, workerParams: WorkerParameters) : "PluralKit Sync", "Creating full system object and getting images on a separate thread." ) - val system = PkFullSystem(sys, settings, members, groups, front) + val system = PkFullSystem(sys, members, groups, front) val fullTime = Clock.System.now() Log.i( "PluralKit Sync", |