mirror of
https://github.com/afollestad/nock-nock.git
synced 2025-08-03 06:38:38 +00:00
0.8.2
This commit is contained in:
parent
69d9eb094e
commit
2585ed77b9
5 changed files with 18 additions and 17 deletions
|
@ -136,7 +136,6 @@ class AddSiteActivity : DarkModeSwitchActivity() {
|
||||||
viewModel.commit {
|
viewModel.commit {
|
||||||
setResult(RESULT_OK)
|
setResult(RESULT_OK)
|
||||||
finish()
|
finish()
|
||||||
overridePendingTransition(R.anim.fade_out, R.anim.fade_out)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,10 +28,12 @@ import com.afollestad.nocknock.data.AppDatabase
|
||||||
import com.afollestad.nocknock.data.RetryPolicy
|
import com.afollestad.nocknock.data.RetryPolicy
|
||||||
import com.afollestad.nocknock.data.model.Site
|
import com.afollestad.nocknock.data.model.Site
|
||||||
import com.afollestad.nocknock.data.model.SiteSettings
|
import com.afollestad.nocknock.data.model.SiteSettings
|
||||||
|
import com.afollestad.nocknock.data.model.Status.WAITING
|
||||||
import com.afollestad.nocknock.data.model.ValidationMode
|
import com.afollestad.nocknock.data.model.ValidationMode
|
||||||
import com.afollestad.nocknock.data.model.ValidationMode.JAVASCRIPT
|
import com.afollestad.nocknock.data.model.ValidationMode.JAVASCRIPT
|
||||||
import com.afollestad.nocknock.data.model.ValidationMode.STATUS_CODE
|
import com.afollestad.nocknock.data.model.ValidationMode.STATUS_CODE
|
||||||
import com.afollestad.nocknock.data.model.ValidationMode.TERM_SEARCH
|
import com.afollestad.nocknock.data.model.ValidationMode.TERM_SEARCH
|
||||||
|
import com.afollestad.nocknock.data.model.ValidationResult
|
||||||
import com.afollestad.nocknock.data.putSite
|
import com.afollestad.nocknock.data.putSite
|
||||||
import com.afollestad.nocknock.engine.validation.ValidationManager
|
import com.afollestad.nocknock.engine.validation.ValidationManager
|
||||||
import com.afollestad.nocknock.ui.ScopedViewModel
|
import com.afollestad.nocknock.ui.ScopedViewModel
|
||||||
|
@ -42,6 +44,7 @@ import kotlinx.coroutines.CoroutineDispatcher
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import okhttp3.HttpUrl
|
import okhttp3.HttpUrl
|
||||||
|
import java.lang.System.currentTimeMillis
|
||||||
|
|
||||||
/** @author Aidan Follestad (@afollestad) */
|
/** @author Aidan Follestad (@afollestad) */
|
||||||
class AddSiteViewModel(
|
class AddSiteViewModel(
|
||||||
|
@ -229,9 +232,15 @@ class AddSiteViewModel(
|
||||||
disabled = false
|
disabled = false
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val newLastResult = ValidationResult(
|
||||||
|
timestampMs = currentTimeMillis(),
|
||||||
|
status = WAITING,
|
||||||
|
reason = null
|
||||||
|
)
|
||||||
|
|
||||||
val retryPolicyTimes = retryPolicyTimes.value ?: 0
|
val retryPolicyTimes = retryPolicyTimes.value ?: 0
|
||||||
val retryPolicyMinutes = retryPolicyMinutes.value ?: 0
|
val retryPolicyMinutes = retryPolicyMinutes.value ?: 0
|
||||||
val retryPolicy: RetryPolicy? = if (retryPolicyTimes > 0 && retryPolicyMinutes > 0) {
|
val newRetryPolicy: RetryPolicy? = if (retryPolicyTimes > 0 && retryPolicyMinutes > 0) {
|
||||||
RetryPolicy(count = retryPolicyTimes, minutes = retryPolicyMinutes)
|
RetryPolicy(count = retryPolicyTimes, minutes = retryPolicyMinutes)
|
||||||
} else {
|
} else {
|
||||||
null
|
null
|
||||||
|
@ -242,8 +251,8 @@ class AddSiteViewModel(
|
||||||
name = name.value!!.trim(),
|
name = name.value!!.trim(),
|
||||||
url = url.value!!.trim(),
|
url = url.value!!.trim(),
|
||||||
settings = newSettings,
|
settings = newSettings,
|
||||||
lastResult = null,
|
lastResult = newLastResult,
|
||||||
retryPolicy = retryPolicy
|
retryPolicy = newRetryPolicy
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:fillAfter="true">
|
|
||||||
<alpha
|
|
||||||
android:duration="400"
|
|
||||||
android:fromAlpha="1.0"
|
|
||||||
android:interpolator="@android:anim/accelerate_interpolator"
|
|
||||||
android:toAlpha="0.0"/>
|
|
||||||
</set>
|
|
|
@ -98,10 +98,12 @@ fun AppDatabase.putSite(site: Site): Site {
|
||||||
val settings = site.settings ?: throw IllegalArgumentException("Settings cannot be null.")
|
val settings = site.settings ?: throw IllegalArgumentException("Settings cannot be null.")
|
||||||
val newId = siteDao().insert(site)
|
val newId = siteDao().insert(site)
|
||||||
val settingsWithSiteId = settings.copy(siteId = newId)
|
val settingsWithSiteId = settings.copy(siteId = newId)
|
||||||
|
val lastResultWithSiteId = site.lastResult?.copy(siteId = newId)
|
||||||
|
val retryPolicyWithSiteId = site.retryPolicy?.copy(siteId = newId)
|
||||||
siteSettingsDao().insert(settingsWithSiteId)
|
siteSettingsDao().insert(settingsWithSiteId)
|
||||||
|
|
||||||
site.lastResult?.let { validationResultsDao().insert(it) }
|
lastResultWithSiteId?.let { validationResultsDao().insert(it) }
|
||||||
site.retryPolicy?.let { retryPolicyDao().insert(it) }
|
retryPolicyWithSiteId?.let { retryPolicyDao().insert(it) }
|
||||||
|
|
||||||
return site.copy(
|
return site.copy(
|
||||||
id = newId,
|
id = newId,
|
||||||
|
|
|
@ -3,8 +3,8 @@ ext.versions = [
|
||||||
minSdk : 21,
|
minSdk : 21,
|
||||||
compileSdk : 28,
|
compileSdk : 28,
|
||||||
buildTools : '28.0.3',
|
buildTools : '28.0.3',
|
||||||
publishVersion : '0.8.1',
|
publishVersion : '0.8.2',
|
||||||
publishVersionCode : 30,
|
publishVersionCode : 32,
|
||||||
|
|
||||||
// Plugins
|
// Plugins
|
||||||
gradlePlugin : '3.2.1',
|
gradlePlugin : '3.2.1',
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue