mirror of
https://github.com/szkolny-eu/szkolny-android.git
synced 2024-11-24 10:54:36 -06:00
adapt code to updated dependencies + align lessons (based by szkolny-eu/szkolny-android#196)
This commit is contained in:
parent
04350acb03
commit
2a0cd2f0dc
@ -124,7 +124,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
|
|||||||
private val job = Job()
|
private val job = Job()
|
||||||
override val coroutineContext: CoroutineContext
|
override val coroutineContext: CoroutineContext
|
||||||
get() = job + Dispatchers.Main
|
get() = job + Dispatchers.Main
|
||||||
override fun getWorkManagerConfiguration() = Configuration.Builder()
|
|
||||||
|
override val workManagerConfiguration: Configuration = Configuration.Builder()
|
||||||
.setMinimumLoggingLevel(Log.VERBOSE)
|
.setMinimumLoggingLevel(Log.VERBOSE)
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
|
@ -144,7 +144,7 @@ class ConfigDelegate<T>(
|
|||||||
java.lang.Float::class.java -> value.toFloatOrNull()
|
java.lang.Float::class.java -> value.toFloatOrNull()
|
||||||
// enums, maps & collections
|
// enums, maps & collections
|
||||||
else -> when {
|
else -> when {
|
||||||
Enum::class.java.isAssignableFrom(type) -> value.toIntOrNull()?.toEnum(type) as Enum<*>
|
Enum::class.java.isAssignableFrom(type) -> value.toIntOrNull()?.toEnum(type) as Enum
|
||||||
Collection::class.java.isAssignableFrom(type) -> {
|
Collection::class.java.isAssignableFrom(type) -> {
|
||||||
val array = value.toJsonArray()
|
val array = value.toJsonArray()
|
||||||
val genericType = getGenericType()
|
val genericType = getGenericType()
|
||||||
|
@ -391,7 +391,7 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
|
|||||||
fun apiGetList(
|
fun apiGetList(
|
||||||
tag: String,
|
tag: String,
|
||||||
endpoint: String,
|
endpoint: String,
|
||||||
filterType: HebeFilterType? = null,
|
filterType: HebeFilterType = HebeFilterType.BY_PUPIL,
|
||||||
dateFrom: Date? = null,
|
dateFrom: Date? = null,
|
||||||
dateTo: Date? = null,
|
dateTo: Date? = null,
|
||||||
lastSync: Long? = null,
|
lastSync: Long? = null,
|
||||||
@ -424,8 +424,6 @@ open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) {
|
|||||||
HebeFilterType.BY_MESSAGEBOX -> {
|
HebeFilterType.BY_MESSAGEBOX -> {
|
||||||
query["box"] = messageBox ?: data.messageBoxKey ?: ""
|
query["box"] = messageBox ?: data.messageBoxKey ?: ""
|
||||||
}
|
}
|
||||||
|
|
||||||
null -> TODO()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dateFrom != null)
|
if (dateFrom != null)
|
||||||
|
@ -23,20 +23,24 @@ object WorkerUtils {
|
|||||||
inline fun scheduleNext(app: App, rescheduleIfFailedFound: Boolean = true, crossinline onReschedule: () -> Unit) {
|
inline fun scheduleNext(app: App, rescheduleIfFailedFound: Boolean = true, crossinline onReschedule: () -> Unit) {
|
||||||
AsyncTask.execute {
|
AsyncTask.execute {
|
||||||
val workManager = WorkManager.getInstance(app) as WorkManagerImpl
|
val workManager = WorkManager.getInstance(app) as WorkManagerImpl
|
||||||
val scheduledWork = workManager.workDatabase.workSpecDao().scheduledWork
|
val scheduledWork = workManager.workDatabase.workSpecDao().getScheduledWork() as MutableList;
|
||||||
|
|
||||||
scheduledWork.forEach {
|
scheduledWork.forEach {
|
||||||
Utils.d("WorkerUtils", "Work: ${it.id} at ${(it.periodStartTime + it.initialDelay).formatDate()}. State = ${it.state} (finished = ${it.state.isFinished})")
|
Utils.d("WorkerUtils", "Work: ${it.id} at ${it.calculateNextRunTime().formatDate()}. State = ${it.state} (finished = ${it.state.isFinished})")
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove finished work and other than SyncWorker
|
// remove finished work and other than SyncWorker
|
||||||
scheduledWork.removeAll { it.workerClassName != SyncWorker::class.java.canonicalName || it.isPeriodic || it.state.isFinished }
|
scheduledWork.removeAll { it.workerClassName != SyncWorker::class.java.canonicalName || it.isPeriodic || it.state.isFinished }
|
||||||
Utils.d("WorkerUtils", "Found ${scheduledWork.size} unfinished work")
|
Utils.d("WorkerUtils", "Found ${scheduledWork.size} unfinished work")
|
||||||
|
|
||||||
// remove all enqueued work that had to (but didn't) run at some point in the past (at least 1min ago)
|
// remove all enqueued work that had to (but didn't) run at some point in the past (at least 1min ago)
|
||||||
val failedWork = scheduledWork.filter { it.state == WorkInfo.State.ENQUEUED && it.periodStartTime + it.initialDelay < System.currentTimeMillis() - 1 * MINUTE * 1000 }
|
val failedWork = scheduledWork.filter { it.state == WorkInfo.State.ENQUEUED && it.calculateNextRunTime() < System.currentTimeMillis() - 1 * MINUTE * 1000 }
|
||||||
Utils.d("WorkerUtils", "${failedWork.size} work requests failed to start (out of ${scheduledWork.size} requests)")
|
Utils.d("WorkerUtils", "${failedWork.size} work requests failed to start (out of ${scheduledWork.size} requests)")
|
||||||
|
|
||||||
if (rescheduleIfFailedFound) {
|
if (rescheduleIfFailedFound) {
|
||||||
if (failedWork.isNotEmpty()) {
|
if (failedWork.isNotEmpty()) {
|
||||||
Utils.d("WorkerUtils", "App Manager detected!")
|
Utils.d("WorkerUtils", "App Manager detected!")
|
||||||
EventBus.getDefault().postSticky(AppManagerDetectedEvent(failedWork.map { it.periodStartTime + it.initialDelay }))
|
EventBus.getDefault().postSticky(AppManagerDetectedEvent(failedWork.map { it.calculateNextRunTime() }))
|
||||||
}
|
}
|
||||||
if (scheduledWork.size - failedWork.size < 1) {
|
if (scheduledWork.size - failedWork.size < 1) {
|
||||||
Utils.d("WorkerUtils", "No pending work found, scheduling next:")
|
Utils.d("WorkerUtils", "No pending work found, scheduling next:")
|
||||||
|
@ -129,7 +129,7 @@ class LabProfileFragment : LazyFragment(), CoroutineScope {
|
|||||||
is String -> input
|
is String -> input
|
||||||
is Long -> input.toLong()
|
is Long -> input.toLong()
|
||||||
is Double -> input.toDouble()
|
is Double -> input.toDouble()
|
||||||
is Enum<*> -> input.toInt().toEnum(objVal::class.java)
|
is Enum<*> -> input.toInt().toEnum(objVal::class.java) as Enum
|
||||||
else -> input
|
else -> input
|
||||||
}
|
}
|
||||||
field.set(parent, newVal)
|
field.set(parent, newVal)
|
||||||
|
@ -328,7 +328,7 @@ class HomeTimetableCard(
|
|||||||
|
|
||||||
for (lesson in nextLessons) {
|
for (lesson in nextLessons) {
|
||||||
text += listOf(
|
text += listOf(
|
||||||
lesson.displayStartTime?.stringHM,
|
adjustTimeWidth(lesson.displayStartTime?.stringHM),
|
||||||
lesson.subjectSpannable
|
lesson.subjectSpannable
|
||||||
).concat(" ")
|
).concat(" ")
|
||||||
}
|
}
|
||||||
@ -337,6 +337,12 @@ class HomeTimetableCard(
|
|||||||
b.nextLessons.text = text.concat("\n")
|
b.nextLessons.text = text.concat("\n")
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
private fun adjustTimeWidth(time: String?) = when {
|
||||||
|
time == null -> ""
|
||||||
|
time.length == 4 -> " $time "
|
||||||
|
else -> "$time "
|
||||||
|
}
|
||||||
|
|
||||||
private val LessonFull?.subjectSpannable: CharSequence
|
private val LessonFull?.subjectSpannable: CharSequence
|
||||||
get() = if (this == null) "?" else when {
|
get() = if (this == null) "?" else when {
|
||||||
hasReplacingNotes() -> getNoteSubstituteText(showNotes = true) ?: "?"
|
hasReplacingNotes() -> getNoteSubstituteText(showNotes = true) ?: "?"
|
||||||
|
@ -4,11 +4,13 @@
|
|||||||
|
|
||||||
package pl.szczodrzynski.edziennik.ui.timetable
|
package pl.szczodrzynski.edziennik.ui.timetable
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint
|
||||||
import android.content.BroadcastReceiver
|
import android.content.BroadcastReceiver
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.IntentFilter
|
import android.content.IntentFilter
|
||||||
import android.os.AsyncTask
|
import android.os.AsyncTask
|
||||||
|
import android.os.Build
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
@ -90,9 +92,17 @@ class TimetableFragment : Fragment(), CoroutineScope {
|
|||||||
}
|
}
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
|
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
activity.registerReceiver(broadcastReceiver, IntentFilter(ACTION_SCROLL_TO_DATE ),
|
||||||
|
Context.RECEIVER_NOT_EXPORTED)
|
||||||
|
activity.registerReceiver(broadcastReceiver, IntentFilter(ACTION_RELOAD_PAGES),
|
||||||
|
Context.RECEIVER_NOT_EXPORTED)
|
||||||
|
} else @Suppress("UnspecifiedRegisterReceiverFlag") {
|
||||||
activity.registerReceiver(broadcastReceiver, IntentFilter(ACTION_SCROLL_TO_DATE))
|
activity.registerReceiver(broadcastReceiver, IntentFilter(ACTION_SCROLL_TO_DATE))
|
||||||
activity.registerReceiver(broadcastReceiver, IntentFilter(ACTION_RELOAD_PAGES))
|
activity.registerReceiver(broadcastReceiver, IntentFilter(ACTION_RELOAD_PAGES))
|
||||||
}
|
}
|
||||||
|
}
|
||||||
override fun onPause() {
|
override fun onPause() {
|
||||||
super.onPause()
|
super.onPause()
|
||||||
activity.unregisterReceiver(broadcastReceiver)
|
activity.unregisterReceiver(broadcastReceiver)
|
||||||
|
Loading…
Reference in New Issue
Block a user