forked from github/szkolny
Merge pull request #75 from szkolny-eu/feature/availability-refactor
[API] Refactor register availability checking module.
This commit is contained in:
commit
3700a71c39
@ -71,6 +71,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
|
|||||||
val permissionManager by lazy { PermissionManager(this) }
|
val permissionManager by lazy { PermissionManager(this) }
|
||||||
val attendanceManager by lazy { AttendanceManager(this) }
|
val attendanceManager by lazy { AttendanceManager(this) }
|
||||||
val buildManager by lazy { BuildManager(this) }
|
val buildManager by lazy { BuildManager(this) }
|
||||||
|
val availabilityManager by lazy { AvailabilityManager(this) }
|
||||||
|
|
||||||
val db
|
val db
|
||||||
get() = App.db
|
get() = App.db
|
||||||
@ -174,8 +175,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
|
|||||||
App.config = Config(App.db)
|
App.config = Config(App.db)
|
||||||
App.profile = Profile(0, 0, 0, "")
|
App.profile = Profile(0, 0, 0, "")
|
||||||
debugMode = BuildConfig.DEBUG
|
debugMode = BuildConfig.DEBUG
|
||||||
devMode = config.debugMode || debugMode
|
devMode = config.devMode ?: debugMode
|
||||||
enableChucker = config.enableChucker || devMode
|
enableChucker = config.enableChucker ?: devMode
|
||||||
|
|
||||||
if (!profileLoadById(config.lastProfileId)) {
|
if (!profileLoadById(config.lastProfileId)) {
|
||||||
db.profileDao().firstId?.let { profileLoadById(it) }
|
db.profileDao().firstId?.let { profileLoadById(it) }
|
||||||
|
@ -85,6 +85,8 @@ import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushFragment
|
|||||||
import pl.szczodrzynski.edziennik.utils.*
|
import pl.szczodrzynski.edziennik.utils.*
|
||||||
import pl.szczodrzynski.edziennik.utils.Utils.d
|
import pl.szczodrzynski.edziennik.utils.Utils.d
|
||||||
import pl.szczodrzynski.edziennik.utils.Utils.dpToPx
|
import pl.szczodrzynski.edziennik.utils.Utils.dpToPx
|
||||||
|
import pl.szczodrzynski.edziennik.utils.managers.AvailabilityManager
|
||||||
|
import pl.szczodrzynski.edziennik.utils.managers.AvailabilityManager.Error.Type
|
||||||
import pl.szczodrzynski.edziennik.utils.models.Date
|
import pl.szczodrzynski.edziennik.utils.models.Date
|
||||||
import pl.szczodrzynski.edziennik.utils.models.NavTarget
|
import pl.szczodrzynski.edziennik.utils.models.NavTarget
|
||||||
import pl.szczodrzynski.navlib.*
|
import pl.szczodrzynski.navlib.*
|
||||||
@ -634,45 +636,23 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
app.profile.registerName?.let { registerName ->
|
val error = withContext(Dispatchers.IO) {
|
||||||
var status = app.config.sync.registerAvailability[registerName]
|
app.availabilityManager.check(app.profile)
|
||||||
if (status == null || status.nextCheckAt < currentTimeUnix()) {
|
}
|
||||||
val api = SzkolnyApi(app)
|
when (error?.type) {
|
||||||
val result = withContext(Dispatchers.IO) {
|
Type.NOT_AVAILABLE -> {
|
||||||
return@withContext api.runCatching({
|
|
||||||
val availability = getRegisterAvailability()
|
|
||||||
app.config.sync.registerAvailability = availability
|
|
||||||
availability[registerName]
|
|
||||||
}, onError = {
|
|
||||||
if (it.toErrorCode() == ERROR_API_INVALID_SIGNATURE) {
|
|
||||||
return@withContext false
|
|
||||||
}
|
|
||||||
return@withContext it
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
when (result) {
|
|
||||||
false -> {
|
|
||||||
Toast.makeText(this@MainActivity, R.string.error_no_api_access, Toast.LENGTH_SHORT).show()
|
|
||||||
return@let
|
|
||||||
}
|
|
||||||
is Throwable -> {
|
|
||||||
errorSnackbar.addError(result.toApiError(TAG)).show()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
is RegisterAvailabilityStatus -> {
|
|
||||||
status = result
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (status?.available != true || status.minVersionCode > BuildConfig.VERSION_CODE) {
|
|
||||||
swipeRefreshLayout.isRefreshing = false
|
swipeRefreshLayout.isRefreshing = false
|
||||||
loadTarget(DRAWER_ITEM_HOME)
|
loadTarget(DRAWER_ITEM_HOME)
|
||||||
if (status != null)
|
RegisterUnavailableDialog(this, error.status!!)
|
||||||
RegisterUnavailableDialog(this, status)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Type.API_ERROR -> {
|
||||||
|
errorSnackbar.addError(error.apiError!!).show()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
Type.NO_API_ACCESS -> {
|
||||||
|
Toast.makeText(this, R.string.error_no_api_access, Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
swipeRefreshLayout.isRefreshing = true
|
swipeRefreshLayout.isRefreshing = true
|
||||||
@ -699,10 +679,9 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
|
|||||||
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
|
||||||
fun onRegisterAvailabilityEvent(event: RegisterAvailabilityEvent) {
|
fun onRegisterAvailabilityEvent(event: RegisterAvailabilityEvent) {
|
||||||
EventBus.getDefault().removeStickyEvent(event)
|
EventBus.getDefault().removeStickyEvent(event)
|
||||||
app.profile.registerName?.let { registerName ->
|
val error = app.availabilityManager.check(app.profile, cacheOnly = true)
|
||||||
event.data[registerName]?.let {
|
if (error != null) {
|
||||||
RegisterUnavailableDialog(this, it)
|
RegisterUnavailableDialog(this, error.status!!)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||||
|
@ -12,10 +12,7 @@ import kotlinx.coroutines.launch
|
|||||||
import pl.szczodrzynski.edziennik.App
|
import pl.szczodrzynski.edziennik.App
|
||||||
import pl.szczodrzynski.edziennik.BuildConfig
|
import pl.szczodrzynski.edziennik.BuildConfig
|
||||||
import pl.szczodrzynski.edziennik.config.db.ConfigEntry
|
import pl.szczodrzynski.edziennik.config.db.ConfigEntry
|
||||||
import pl.szczodrzynski.edziennik.config.utils.ConfigMigration
|
import pl.szczodrzynski.edziennik.config.utils.*
|
||||||
import pl.szczodrzynski.edziennik.config.utils.get
|
|
||||||
import pl.szczodrzynski.edziennik.config.utils.set
|
|
||||||
import pl.szczodrzynski.edziennik.config.utils.toHashMap
|
|
||||||
import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
|
import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
|
||||||
import pl.szczodrzynski.edziennik.data.db.AppDb
|
import pl.szczodrzynski.edziennik.data.db.AppDb
|
||||||
import kotlin.coroutines.CoroutineContext
|
import kotlin.coroutines.CoroutineContext
|
||||||
@ -75,15 +72,15 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
|
|||||||
get() { mPrivacyPolicyAccepted = mPrivacyPolicyAccepted ?: values.get("privacyPolicyAccepted", false); return mPrivacyPolicyAccepted ?: false }
|
get() { mPrivacyPolicyAccepted = mPrivacyPolicyAccepted ?: values.get("privacyPolicyAccepted", false); return mPrivacyPolicyAccepted ?: false }
|
||||||
set(value) { set("privacyPolicyAccepted", value); mPrivacyPolicyAccepted = value }
|
set(value) { set("privacyPolicyAccepted", value); mPrivacyPolicyAccepted = value }
|
||||||
|
|
||||||
private var mDebugMode: Boolean? = null
|
private var mDevMode: Boolean? = null
|
||||||
var debugMode: Boolean
|
var devMode: Boolean?
|
||||||
get() { mDebugMode = mDebugMode ?: values.get("debugMode", false); return mDebugMode ?: false }
|
get() { mDevMode = mDevMode ?: values.getBooleanOrNull("debugMode"); return mDevMode }
|
||||||
set(value) { set("debugMode", value); mDebugMode = value }
|
set(value) { set("debugMode", value?.toString()); mDevMode = value }
|
||||||
|
|
||||||
private var mEnableChucker: Boolean? = null
|
private var mEnableChucker: Boolean? = null
|
||||||
var enableChucker: Boolean
|
var enableChucker: Boolean?
|
||||||
get() { mEnableChucker = mEnableChucker ?: values.get("enableChucker", false); return mEnableChucker ?: false }
|
get() { mEnableChucker = mEnableChucker ?: values.getBooleanOrNull("enableChucker"); return mEnableChucker }
|
||||||
set(value) { set("enableChucker", value); mEnableChucker = value }
|
set(value) { set("enableChucker", value?.toString()); mEnableChucker = value }
|
||||||
|
|
||||||
private var mDevModePassword: String? = null
|
private var mDevModePassword: String? = null
|
||||||
var devModePassword: String?
|
var devModePassword: String?
|
||||||
@ -125,6 +122,11 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
|
|||||||
get() { mApiInvalidCert = mApiInvalidCert ?: values["apiInvalidCert"]; return mApiInvalidCert }
|
get() { mApiInvalidCert = mApiInvalidCert ?: values["apiInvalidCert"]; return mApiInvalidCert }
|
||||||
set(value) { set("apiInvalidCert", value); mApiInvalidCert = value }
|
set(value) { set("apiInvalidCert", value); mApiInvalidCert = value }
|
||||||
|
|
||||||
|
private var mApiAvailabilityCheck: Boolean? = null
|
||||||
|
var apiAvailabilityCheck: Boolean
|
||||||
|
get() { mApiAvailabilityCheck = mApiAvailabilityCheck ?: values.get("apiAvailabilityCheck", true); return mApiAvailabilityCheck ?: true }
|
||||||
|
set(value) { set("apiAvailabilityCheck", value); mApiAvailabilityCheck = value }
|
||||||
|
|
||||||
private var rawEntries: List<ConfigEntry> = db.configDao().getAllNow()
|
private var rawEntries: List<ConfigEntry> = db.configDao().getAllNow()
|
||||||
private val profileConfigs: HashMap<Int, ProfileConfig> = hashMapOf()
|
private val profileConfigs: HashMap<Int, ProfileConfig> = hashMapOf()
|
||||||
init {
|
init {
|
||||||
|
@ -59,6 +59,9 @@ fun HashMap<String, String?>.get(key: String, default: String?): String? {
|
|||||||
fun HashMap<String, String?>.get(key: String, default: Boolean): Boolean {
|
fun HashMap<String, String?>.get(key: String, default: Boolean): Boolean {
|
||||||
return this[key]?.toBoolean() ?: default
|
return this[key]?.toBoolean() ?: default
|
||||||
}
|
}
|
||||||
|
fun HashMap<String, String?>.getBooleanOrNull(key: String): Boolean? {
|
||||||
|
return this[key]?.toBooleanStrictOrNull()
|
||||||
|
}
|
||||||
fun HashMap<String, String?>.get(key: String, default: Int): Int {
|
fun HashMap<String, String?>.get(key: String, default: Int): Int {
|
||||||
return this[key]?.toIntOrNull() ?: default
|
return this[key]?.toIntOrNull() ?: default
|
||||||
}
|
}
|
||||||
|
@ -67,7 +67,7 @@ class ConfigMigration(app: App, config: Config) {
|
|||||||
if (dataVersion < 3) {
|
if (dataVersion < 3) {
|
||||||
update = null
|
update = null
|
||||||
privacyPolicyAccepted = false
|
privacyPolicyAccepted = false
|
||||||
debugMode = false
|
devMode = null
|
||||||
devModePassword = null
|
devModePassword = null
|
||||||
appInstalledTime = 0L
|
appInstalledTime = 0L
|
||||||
appRateSnackbarTime = 0L
|
appRateSnackbarTime = 0L
|
||||||
|
@ -18,7 +18,6 @@ import pl.szczodrzynski.edziennik.data.api.events.RegisterAvailabilityEvent
|
|||||||
import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
|
import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
|
||||||
import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
|
import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
|
||||||
import pl.szczodrzynski.edziennik.data.api.models.ApiError
|
import pl.szczodrzynski.edziennik.data.api.models.ApiError
|
||||||
import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
|
|
||||||
import pl.szczodrzynski.edziennik.data.api.task.IApiTask
|
import pl.szczodrzynski.edziennik.data.api.task.IApiTask
|
||||||
import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
|
import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
|
||||||
import pl.szczodrzynski.edziennik.data.db.entity.Profile
|
import pl.szczodrzynski.edziennik.data.db.entity.Profile
|
||||||
@ -27,6 +26,7 @@ import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
|
|||||||
import pl.szczodrzynski.edziennik.data.db.full.EventFull
|
import pl.szczodrzynski.edziennik.data.db.full.EventFull
|
||||||
import pl.szczodrzynski.edziennik.data.db.full.MessageFull
|
import pl.szczodrzynski.edziennik.data.db.full.MessageFull
|
||||||
import pl.szczodrzynski.edziennik.utils.Utils.d
|
import pl.szczodrzynski.edziennik.utils.Utils.d
|
||||||
|
import pl.szczodrzynski.edziennik.utils.managers.AvailabilityManager.Error.Type
|
||||||
|
|
||||||
open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
|
open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
|
||||||
companion object {
|
companion object {
|
||||||
@ -90,35 +90,21 @@ open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTa
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
profile.registerName?.also { registerName ->
|
val error = app.availabilityManager.check(profile)
|
||||||
var status = app.config.sync.registerAvailability[registerName]
|
when (error?.type) {
|
||||||
if (status == null || status.nextCheckAt < currentTimeUnix()) {
|
Type.NOT_AVAILABLE -> {
|
||||||
val api = SzkolnyApi(app)
|
|
||||||
api.runCatching({
|
|
||||||
val availability = getRegisterAvailability()
|
|
||||||
app.config.sync.registerAvailability = availability
|
|
||||||
status = availability[registerName]
|
|
||||||
}, onError = {
|
|
||||||
val apiError = it.toApiError(TAG)
|
|
||||||
if (apiError.errorCode == ERROR_API_INVALID_SIGNATURE) {
|
|
||||||
return@also
|
|
||||||
}
|
|
||||||
taskCallback.onError(apiError)
|
|
||||||
return
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
if (status?.available != true
|
|
||||||
|| status?.minVersionCode ?: BuildConfig.VERSION_CODE > BuildConfig.VERSION_CODE) {
|
|
||||||
if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
|
if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
|
||||||
EventBus.getDefault().postSticky(
|
EventBus.getDefault().postSticky(RegisterAvailabilityEvent())
|
||||||
RegisterAvailabilityEvent(app.config.sync.registerAvailability)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
cancel()
|
cancel()
|
||||||
taskCallback.onCompleted()
|
taskCallback.onCompleted()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Type.API_ERROR -> {
|
||||||
|
taskCallback.onError(error.apiError!!)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
else -> return@let
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,8 +4,4 @@
|
|||||||
|
|
||||||
package pl.szczodrzynski.edziennik.data.api.events
|
package pl.szczodrzynski.edziennik.data.api.events
|
||||||
|
|
||||||
import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
|
class RegisterAvailabilityEvent()
|
||||||
|
|
||||||
data class RegisterAvailabilityEvent(
|
|
||||||
val data: Map< String, RegisterAvailabilityStatus>
|
|
||||||
)
|
|
||||||
|
@ -140,7 +140,7 @@ open class Profile(
|
|||||||
LOGIN_TYPE_MOBIDZIENNIK -> "mobidziennik"
|
LOGIN_TYPE_MOBIDZIENNIK -> "mobidziennik"
|
||||||
LOGIN_TYPE_PODLASIE -> "podlasie"
|
LOGIN_TYPE_PODLASIE -> "podlasie"
|
||||||
LOGIN_TYPE_EDUDZIENNIK -> "edudziennik"
|
LOGIN_TYPE_EDUDZIENNIK -> "edudziennik"
|
||||||
else -> null
|
else -> "unknown"
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getImageDrawable(context: Context): Drawable {
|
override fun getImageDrawable(context: Context): Drawable {
|
||||||
|
@ -60,7 +60,7 @@ class SzkolnyAppFirebase(val app: App, val profiles: List<Profile>, val message:
|
|||||||
) ?: return@launch
|
) ?: return@launch
|
||||||
app.config.sync.registerAvailability = data
|
app.config.sync.registerAvailability = data
|
||||||
if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
|
if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) {
|
||||||
EventBus.getDefault().postSticky(RegisterAvailabilityEvent(data))
|
EventBus.getDefault().postSticky(RegisterAvailabilityEvent())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -42,8 +42,6 @@ class RegisterUnavailableDialog(
|
|||||||
init { run {
|
init { run {
|
||||||
if (activity.isFinishing)
|
if (activity.isFinishing)
|
||||||
return@run
|
return@run
|
||||||
if (status.available && status.minVersionCode <= BuildConfig.VERSION_CODE)
|
|
||||||
return@run
|
|
||||||
onShowListener?.invoke(TAG)
|
onShowListener?.invoke(TAG)
|
||||||
app = activity.applicationContext as App
|
app = activity.applicationContext as App
|
||||||
|
|
||||||
|
@ -41,6 +41,7 @@ class LabFragment : Fragment(), CoroutineScope {
|
|||||||
app = activity.application as App
|
app = activity.application as App
|
||||||
b = TemplateFragmentBinding.inflate(inflater)
|
b = TemplateFragmentBinding.inflate(inflater)
|
||||||
b.refreshLayout.setParent(activity.swipeRefreshLayout)
|
b.refreshLayout.setParent(activity.swipeRefreshLayout)
|
||||||
|
b.refreshLayout.isEnabled = false
|
||||||
return b.root
|
return b.root
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@ import kotlinx.coroutines.Dispatchers
|
|||||||
import kotlinx.coroutines.Job
|
import kotlinx.coroutines.Job
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import pl.szczodrzynski.edziennik.*
|
import pl.szczodrzynski.edziennik.*
|
||||||
|
import pl.szczodrzynski.edziennik.config.Config
|
||||||
import pl.szczodrzynski.edziennik.data.db.entity.Event
|
import pl.szczodrzynski.edziennik.data.db.entity.Event
|
||||||
import pl.szczodrzynski.edziennik.databinding.LabFragmentBinding
|
import pl.szczodrzynski.edziennik.databinding.LabFragmentBinding
|
||||||
import pl.szczodrzynski.edziennik.ui.dialogs.profile.ProfileRemoveDialog
|
import pl.szczodrzynski.edziennik.ui.dialogs.profile.ProfileRemoveDialog
|
||||||
@ -78,10 +79,10 @@ class LabPageFragment : LazyFragment(), CoroutineScope {
|
|||||||
app.db.eventDao().getRawNow("UPDATE events SET homeworkBody = NULL WHERE profileId = ${App.profileId}")
|
app.db.eventDao().getRawNow("UPDATE events SET homeworkBody = NULL WHERE profileId = ${App.profileId}")
|
||||||
}
|
}
|
||||||
|
|
||||||
b.chucker.isChecked = app.config.enableChucker
|
b.chucker.isChecked = App.enableChucker
|
||||||
|
|
||||||
b.chucker.onChange { _, isChecked ->
|
b.chucker.onChange { _, isChecked ->
|
||||||
app.config.enableChucker = isChecked
|
app.config.enableChucker = isChecked
|
||||||
|
App.enableChucker = isChecked
|
||||||
MaterialAlertDialogBuilder(activity)
|
MaterialAlertDialogBuilder(activity)
|
||||||
.setTitle("Restart")
|
.setTitle("Restart")
|
||||||
.setMessage("Wymagany restart aplikacji")
|
.setMessage("Wymagany restart aplikacji")
|
||||||
@ -94,9 +95,9 @@ class LabPageFragment : LazyFragment(), CoroutineScope {
|
|||||||
.show()
|
.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
b.disableDebug.onClick {
|
b.disableDebug.onClick {
|
||||||
app.config.debugMode = false
|
app.config.devMode = false
|
||||||
|
App.devMode = false
|
||||||
MaterialAlertDialogBuilder(activity)
|
MaterialAlertDialogBuilder(activity)
|
||||||
.setTitle("Restart")
|
.setTitle("Restart")
|
||||||
.setMessage("Wymagany restart aplikacji")
|
.setMessage("Wymagany restart aplikacji")
|
||||||
@ -115,6 +116,14 @@ class LabPageFragment : LazyFragment(), CoroutineScope {
|
|||||||
app.profileSave()
|
app.profileSave()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
b.resetCert.onClick {
|
||||||
|
app.config.apiInvalidCert = null
|
||||||
|
}
|
||||||
|
|
||||||
|
b.rebuildConfig.onClick {
|
||||||
|
App.config = Config(App.db)
|
||||||
|
}
|
||||||
|
|
||||||
val profiles = app.db.profileDao().allNow
|
val profiles = app.db.profileDao().allNow
|
||||||
b.profile.clear()
|
b.profile.clear()
|
||||||
b.profile += profiles.map { TextInputDropDown.Item(it.id.toLong(), "${it.id} ${it.name} archived ${it.archived}", tag = it) }
|
b.profile += profiles.map { TextInputDropDown.Item(it.id.toLong(), "${it.id} ${it.name} archived ${it.archived}", tag = it) }
|
||||||
|
@ -163,10 +163,9 @@ class HomeFragment : Fragment(), CoroutineScope {
|
|||||||
if (app.profile.archived)
|
if (app.profile.archived)
|
||||||
items.add(0, HomeArchiveCard(101, app, activity, this, app.profile))
|
items.add(0, HomeArchiveCard(101, app, activity, this, app.profile))
|
||||||
|
|
||||||
val status = app.config.sync.registerAvailability[app.profile.registerName]
|
val status = app.availabilityManager.check(app.profile, cacheOnly = true)?.status
|
||||||
val update = app.config.update
|
val update = app.config.update
|
||||||
if (update != null && update.versionCode > BuildConfig.VERSION_CODE
|
if (update != null && update.versionCode > BuildConfig.VERSION_CODE || status?.userMessage != null) {
|
||||||
|| status != null && (!status.available || status.minVersionCode > BuildConfig.VERSION_CODE)) {
|
|
||||||
items.add(0, HomeAvailabilityCard(102, app, activity, this, app.profile))
|
items.add(0, HomeAvailabilityCard(102, app, activity, this, app.profile))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,7 +50,8 @@ class HomeAvailabilityCard(
|
|||||||
}
|
}
|
||||||
holder.root += b.root
|
holder.root += b.root
|
||||||
|
|
||||||
val status = app.config.sync.registerAvailability[profile.registerName]
|
val error = app.availabilityManager.check(profile, cacheOnly = true)
|
||||||
|
val status = error?.status
|
||||||
val update = app.config.update
|
val update = app.config.update
|
||||||
|
|
||||||
if (update == null && status == null)
|
if (update == null && status == null)
|
||||||
@ -58,7 +59,8 @@ class HomeAvailabilityCard(
|
|||||||
|
|
||||||
var onInfoClick = { _: View -> }
|
var onInfoClick = { _: View -> }
|
||||||
|
|
||||||
if (status != null && !status.available && status.userMessage != null) {
|
// show "register unavailable" only when disabled
|
||||||
|
if (status?.userMessage != null) {
|
||||||
b.homeAvailabilityTitle.text = HtmlCompat.fromHtml(status.userMessage.title, HtmlCompat.FROM_HTML_MODE_LEGACY)
|
b.homeAvailabilityTitle.text = HtmlCompat.fromHtml(status.userMessage.title, HtmlCompat.FROM_HTML_MODE_LEGACY)
|
||||||
b.homeAvailabilityText.text = HtmlCompat.fromHtml(status.userMessage.contentShort, HtmlCompat.FROM_HTML_MODE_LEGACY)
|
b.homeAvailabilityText.text = HtmlCompat.fromHtml(status.userMessage.contentShort, HtmlCompat.FROM_HTML_MODE_LEGACY)
|
||||||
b.homeAvailabilityUpdate.isVisible = false
|
b.homeAvailabilityUpdate.isVisible = false
|
||||||
@ -69,6 +71,7 @@ class HomeAvailabilityCard(
|
|||||||
RegisterUnavailableDialog(activity, status)
|
RegisterUnavailableDialog(activity, status)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// show "update available" when available OR version too old for the register
|
||||||
else if (update != null && update.versionCode > BuildConfig.VERSION_CODE) {
|
else if (update != null && update.versionCode > BuildConfig.VERSION_CODE) {
|
||||||
b.homeAvailabilityTitle.setText(R.string.home_availability_title)
|
b.homeAvailabilityTitle.setText(R.string.home_availability_title)
|
||||||
b.homeAvailabilityText.setText(R.string.home_availability_text, update.versionName)
|
b.homeAvailabilityText.setText(R.string.home_availability_text, update.versionName)
|
||||||
@ -78,6 +81,9 @@ class HomeAvailabilityCard(
|
|||||||
UpdateAvailableDialog(activity, update)
|
UpdateAvailableDialog(activity, update)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
b.root.isVisible = false
|
||||||
|
}
|
||||||
|
|
||||||
b.homeAvailabilityUpdate.onClick {
|
b.homeAvailabilityUpdate.onClick {
|
||||||
if (update == null)
|
if (update == null)
|
||||||
|
@ -26,13 +26,12 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
|||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
import pl.szczodrzynski.edziennik.*
|
import pl.szczodrzynski.edziennik.*
|
||||||
import pl.szczodrzynski.edziennik.data.api.*
|
import pl.szczodrzynski.edziennik.data.api.*
|
||||||
import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
|
|
||||||
import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
|
|
||||||
import pl.szczodrzynski.edziennik.databinding.LoginChooserFragmentBinding
|
import pl.szczodrzynski.edziennik.databinding.LoginChooserFragmentBinding
|
||||||
import pl.szczodrzynski.edziennik.ui.dialogs.RegisterUnavailableDialog
|
import pl.szczodrzynski.edziennik.ui.dialogs.RegisterUnavailableDialog
|
||||||
import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackActivity
|
import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackActivity
|
||||||
import pl.szczodrzynski.edziennik.utils.BetterLinkMovementMethod
|
import pl.szczodrzynski.edziennik.utils.BetterLinkMovementMethod
|
||||||
import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
|
import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration
|
||||||
|
import pl.szczodrzynski.edziennik.utils.managers.AvailabilityManager.Error.Type
|
||||||
import pl.szczodrzynski.edziennik.utils.models.Date
|
import pl.szczodrzynski.edziennik.utils.models.Date
|
||||||
import kotlin.coroutines.CoroutineContext
|
import kotlin.coroutines.CoroutineContext
|
||||||
|
|
||||||
@ -269,52 +268,23 @@ class LoginChooserFragment : Fragment(), CoroutineScope {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun checkAvailability(loginType: Int): Boolean {
|
private suspend fun checkAvailability(loginType: Int): Boolean {
|
||||||
when (loginType) {
|
val error = withContext(Dispatchers.IO) {
|
||||||
LOGIN_TYPE_LIBRUS -> "librus"
|
app.availabilityManager.check(loginType)
|
||||||
LOGIN_TYPE_VULCAN -> "vulcan"
|
} ?: return true
|
||||||
LOGIN_TYPE_IDZIENNIK -> "idziennik"
|
|
||||||
LOGIN_TYPE_MOBIDZIENNIK -> "mobidziennik"
|
|
||||||
LOGIN_TYPE_PODLASIE -> "podlasie"
|
|
||||||
LOGIN_TYPE_EDUDZIENNIK -> "edudziennik"
|
|
||||||
else -> null
|
|
||||||
}?.let { registerName ->
|
|
||||||
var status = app.config.sync.registerAvailability[registerName]
|
|
||||||
if (status == null || status.nextCheckAt < currentTimeUnix()) {
|
|
||||||
val api = SzkolnyApi(app)
|
|
||||||
val result = withContext(Dispatchers.IO) {
|
|
||||||
return@withContext api.runCatching({
|
|
||||||
val availability = getRegisterAvailability()
|
|
||||||
app.config.sync.registerAvailability = availability
|
|
||||||
availability[registerName]
|
|
||||||
}, onError = {
|
|
||||||
if (it.toErrorCode() == ERROR_API_INVALID_SIGNATURE) {
|
|
||||||
return@withContext false
|
|
||||||
}
|
|
||||||
return@withContext it
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
when (result) {
|
return when (error.type) {
|
||||||
false -> {
|
Type.NOT_AVAILABLE -> {
|
||||||
Toast.makeText(activity, R.string.error_no_api_access, Toast.LENGTH_SHORT).show()
|
RegisterUnavailableDialog(activity, error.status!!)
|
||||||
return@let
|
false
|
||||||
}
|
|
||||||
is Throwable -> {
|
|
||||||
activity.errorSnackbar.addError(result.toApiError(TAG)).show()
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
is RegisterAvailabilityStatus -> {
|
|
||||||
status = result
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Type.API_ERROR -> {
|
||||||
if (status?.available != true || status.minVersionCode > BuildConfig.VERSION_CODE) {
|
activity.errorSnackbar.addError(error.apiError!!).show()
|
||||||
if (status != null)
|
false
|
||||||
RegisterUnavailableDialog(activity, status)
|
}
|
||||||
return false
|
Type.NO_API_ACCESS -> {
|
||||||
|
Toast.makeText(activity, R.string.error_no_api_access, Toast.LENGTH_SHORT).show()
|
||||||
|
true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ class LoginPrizeFragment : Fragment(), CoroutineScope {
|
|||||||
.setTitle(R.string.are_you_sure)
|
.setTitle(R.string.are_you_sure)
|
||||||
.setMessage(R.string.dev_mode_enable_warning)
|
.setMessage(R.string.dev_mode_enable_warning)
|
||||||
.setPositiveButton(R.string.yes) { _, _ ->
|
.setPositiveButton(R.string.yes) { _, _ ->
|
||||||
app.config.debugMode = true
|
app.config.devMode = true
|
||||||
App.devMode = true
|
App.devMode = true
|
||||||
MaterialAlertDialogBuilder(activity)
|
MaterialAlertDialogBuilder(activity)
|
||||||
.setTitle("Restart")
|
.setTitle("Restart")
|
||||||
@ -67,8 +67,8 @@ class LoginPrizeFragment : Fragment(), CoroutineScope {
|
|||||||
.show()
|
.show()
|
||||||
}
|
}
|
||||||
.setNegativeButton(R.string.no) { _, _ ->
|
.setNegativeButton(R.string.no) { _, _ ->
|
||||||
app.config.debugMode = false
|
app.config.devMode = App.debugMode
|
||||||
App.devMode = false
|
App.devMode = App.debugMode
|
||||||
activity.finish()
|
activity.finish()
|
||||||
}
|
}
|
||||||
.show()
|
.show()
|
||||||
|
@ -0,0 +1,100 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Kuba Szczodrzyński 2021-9-18.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package pl.szczodrzynski.edziennik.utils.managers
|
||||||
|
|
||||||
|
import pl.szczodrzynski.edziennik.App
|
||||||
|
import pl.szczodrzynski.edziennik.BuildConfig
|
||||||
|
import pl.szczodrzynski.edziennik.currentTimeUnix
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.*
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.models.ApiError
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
|
||||||
|
import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
|
||||||
|
import pl.szczodrzynski.edziennik.data.db.entity.Profile
|
||||||
|
import pl.szczodrzynski.edziennik.toApiError
|
||||||
|
|
||||||
|
class AvailabilityManager(val app: App) {
|
||||||
|
companion object {
|
||||||
|
private const val TAG = "AvailabilityManager"
|
||||||
|
}
|
||||||
|
|
||||||
|
private val api = SzkolnyApi(app)
|
||||||
|
|
||||||
|
data class Error(
|
||||||
|
val type: Type,
|
||||||
|
val status: RegisterAvailabilityStatus?,
|
||||||
|
val apiError: ApiError?
|
||||||
|
) {
|
||||||
|
companion object {
|
||||||
|
fun notAvailable(status: RegisterAvailabilityStatus) =
|
||||||
|
Error(Type.NOT_AVAILABLE, status, null)
|
||||||
|
|
||||||
|
fun apiError(apiError: ApiError) =
|
||||||
|
Error(Type.API_ERROR, null, apiError)
|
||||||
|
|
||||||
|
fun noApiAccess() =
|
||||||
|
Error(Type.NO_API_ACCESS, null, null)
|
||||||
|
}
|
||||||
|
|
||||||
|
enum class Type {
|
||||||
|
NOT_AVAILABLE,
|
||||||
|
API_ERROR,
|
||||||
|
NO_API_ACCESS,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun check(profile: Profile, cacheOnly: Boolean = false): Error? {
|
||||||
|
return check(profile.registerName, cacheOnly)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun check(loginType: Int, cacheOnly: Boolean = false): Error? {
|
||||||
|
val registerName = when (loginType) {
|
||||||
|
LOGIN_TYPE_LIBRUS -> "librus"
|
||||||
|
LOGIN_TYPE_VULCAN -> "vulcan"
|
||||||
|
LOGIN_TYPE_IDZIENNIK -> "idziennik"
|
||||||
|
LOGIN_TYPE_MOBIDZIENNIK -> "mobidziennik"
|
||||||
|
LOGIN_TYPE_PODLASIE -> "podlasie"
|
||||||
|
LOGIN_TYPE_EDUDZIENNIK -> "edudziennik"
|
||||||
|
else -> "unknown"
|
||||||
|
}
|
||||||
|
return check(registerName, cacheOnly)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun check(registerName: String, cacheOnly: Boolean = false): Error? {
|
||||||
|
if (!app.config.apiAvailabilityCheck)
|
||||||
|
return null
|
||||||
|
val status = app.config.sync.registerAvailability[registerName]
|
||||||
|
if (status != null && status.nextCheckAt > currentTimeUnix()) {
|
||||||
|
return reportStatus(status)
|
||||||
|
}
|
||||||
|
if (cacheOnly) {
|
||||||
|
return reportStatus(status)
|
||||||
|
}
|
||||||
|
|
||||||
|
return try {
|
||||||
|
val availability = api.getRegisterAvailability()
|
||||||
|
app.config.sync.registerAvailability = availability
|
||||||
|
reportStatus(availability[registerName])
|
||||||
|
} catch (e: Throwable) {
|
||||||
|
reportApiError(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun reportStatus(status: RegisterAvailabilityStatus?): Error? {
|
||||||
|
if (status == null)
|
||||||
|
return null
|
||||||
|
if (!status.available || status.minVersionCode > BuildConfig.VERSION_CODE)
|
||||||
|
return Error.notAvailable(status)
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun reportApiError(throwable: Throwable): Error {
|
||||||
|
val apiError = throwable.toApiError(TAG)
|
||||||
|
if (apiError.errorCode == ERROR_API_INVALID_SIGNATURE) {
|
||||||
|
app.config.sync.registerAvailability = mapOf()
|
||||||
|
return Error.noApiAccess()
|
||||||
|
}
|
||||||
|
return Error.apiError(apiError)
|
||||||
|
}
|
||||||
|
}
|
@ -1,15 +1,17 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
<!--
|
|
||||||
~ Copyright (c) Kuba Szczodrzyński 2020-4-3.
|
~ Copyright (c) Kuba Szczodrzyński 2020-4-3.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<layout xmlns:app="http://schemas.android.com/apk/res-auto"
|
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
tools:ignore="HardcodedText">
|
tools:ignore="HardcodedText">
|
||||||
|
|
||||||
<data>
|
<data>
|
||||||
<variable name="app" type="pl.szczodrzynski.edziennik.App"/>
|
|
||||||
|
<variable
|
||||||
|
name="app"
|
||||||
|
type="pl.szczodrzynski.edziennik.App" />
|
||||||
</data>
|
</data>
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
@ -39,7 +41,7 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" />-->
|
app:layout_behavior="@string/appbar_scrolling_view_behavior" />-->
|
||||||
|
|
||||||
<Switch
|
<com.google.android.material.checkbox.MaterialCheckBox
|
||||||
android:id="@+id/chucker"
|
android:id="@+id/chucker"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@ -87,7 +89,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:fontFamily="monospace"
|
android:fontFamily="monospace"
|
||||||
tools:text="Cookies:\n\nsynergia.librus.pl\n DZIENNIKSID=L01~1234567890abcdef"/>
|
tools:text="Cookies:\n\nsynergia.librus.pl\n DZIENNIKSID=L01~1234567890abcdef" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/unarchive"
|
android:id="@+id/unarchive"
|
||||||
@ -99,9 +101,9 @@
|
|||||||
|
|
||||||
<pl.szczodrzynski.edziennik.utils.TextInputDropDown
|
<pl.szczodrzynski.edziennik.utils.TextInputDropDown
|
||||||
android:id="@+id/profile"
|
android:id="@+id/profile"
|
||||||
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content" />
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
|
|
||||||
|
|
||||||
<com.google.android.material.checkbox.MaterialCheckBox
|
<com.google.android.material.checkbox.MaterialCheckBox
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@ -109,13 +111,36 @@
|
|||||||
android:checked="@={app.config.archiverEnabled}"
|
android:checked="@={app.config.archiverEnabled}"
|
||||||
android:text="Archiver enabled" />
|
android:text="Archiver enabled" />
|
||||||
|
|
||||||
|
<com.google.android.material.checkbox.MaterialCheckBox
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:checked="@={app.config.apiAvailabilityCheck}"
|
||||||
|
android:text="Availability check enabled" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/resetCert"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Reset API signature"
|
||||||
|
android:textAllCaps="false" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/disableDebug"
|
android:id="@+id/disableDebug"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
android:text="Disable Dev Mode"
|
android:text="Disable Dev Mode"
|
||||||
android:textAllCaps="false"
|
android:textAllCaps="false"
|
||||||
app:backgroundTint="@color/windowBackgroundRed" />
|
app:backgroundTint="@color/windowBackgroundRed" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/rebuildConfig"
|
||||||
|
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="16dp"
|
||||||
|
android:text="Rebuild App.config"
|
||||||
|
android:textAllCaps="false" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
</layout>
|
</layout>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user