Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
NerdNumber9 2017-03-05 12:41:34 -05:00
parent f36327ecc9
commit 3b129176d6
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
View File

@ -14,8 +14,6 @@ import java.io.File
fun <T> Preference<T>.getOrDefault(): T = get() ?: defaultValue()!! fun <T> Preference<T>.getOrDefault(): T = get() ?: defaultValue()!!
fun <T> Preference<T>.nullGetOrDefault(): T? = get() ?: defaultValue()
fun Preference<Boolean>.invert(): Boolean = getOrDefault().let { set(!it); !it } fun Preference<Boolean>.invert(): Boolean = getOrDefault().let { set(!it); !it }
class PreferencesHelper(val context: Context) { class PreferencesHelper(val context: Context) {

6
app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
View File

@ -257,9 +257,9 @@ class EHentai(override val id: Long,
val cookiesHeader by lazy { val cookiesHeader by lazy {
val cookies: MutableMap<String, String> = mutableMapOf() val cookies: MutableMap<String, String> = mutableMapOf()
if(prefs.enableExhentai().getOrDefault()) { if(prefs.enableExhentai().getOrDefault()) {
cookies.put(LoginActivity.MEMBER_ID_COOKIE, prefs.memberIdVal().getOrDefault()) cookies.put(LoginActivity.MEMBER_ID_COOKIE, prefs.memberIdVal().get()!!)
cookies.put(LoginActivity.PASS_HASH_COOKIE, prefs.passHashVal().getOrDefault()) cookies.put(LoginActivity.PASS_HASH_COOKIE, prefs.passHashVal().get()!!)
cookies.put(LoginActivity.IGNEOUS_COOKIE, prefs.igneousVal().getOrDefault()) cookies.put(LoginActivity.IGNEOUS_COOKIE, prefs.igneousVal().get()!!)
} }
//Setup settings //Setup settings

6
app/src/main/java/exh/ui/lock/LockActivity.kt
View File

@ -5,7 +5,7 @@ import com.afollestad.materialdialogs.MaterialDialog
import com.andrognito.pinlockview.PinLockListener import com.andrognito.pinlockview.PinLockListener
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.preference.nullGetOrDefault import eu.kanade.tachiyomi.data.preference.getOrDefault
import eu.kanade.tachiyomi.ui.base.activity.BaseActivity import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
import kotlinx.android.synthetic.main.activity_lock.* import kotlinx.android.synthetic.main.activity_lock.*
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@ -29,12 +29,12 @@ class LockActivity : BaseActivity() {
pin_lock_view.attachIndicatorDots(indicator_dots) pin_lock_view.attachIndicatorDots(indicator_dots)
pin_lock_view.pinLength = prefs.lockLength().nullGetOrDefault()!! pin_lock_view.pinLength = prefs.lockLength().getOrDefault()
pin_lock_view.setPinLockListener(object : PinLockListener { pin_lock_view.setPinLockListener(object : PinLockListener {
override fun onEmpty() {} override fun onEmpty() {}
override fun onComplete(pin: String) { override fun onComplete(pin: String) {
if(sha512(pin, prefs.lockSalt().nullGetOrDefault()!!) == prefs.lockHash().nullGetOrDefault()) { if(sha512(pin, prefs.lockSalt().get()!!) == prefs.lockHash().get()) {
//Yay! //Yay!
finish() finish()
} else { } else {

8
app/src/main/java/exh/ui/lock/LockUtils.kt
View File

@ -11,7 +11,7 @@ import android.provider.Settings
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.preference.nullGetOrDefault import eu.kanade.tachiyomi.data.preference.getOrDefault
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import java.security.MessageDigest import java.security.MessageDigest
@ -40,9 +40,9 @@ fun sha512(passwordToHash: String, salt: String): String {
* Check if lock is enabled * Check if lock is enabled
*/ */
fun lockEnabled(prefs: PreferencesHelper = Injekt.get()) fun lockEnabled(prefs: PreferencesHelper = Injekt.get())
= prefs.lockHash().nullGetOrDefault() != null = prefs.lockHash().get() != null
&& prefs.lockSalt().nullGetOrDefault() != null && prefs.lockSalt().get() != null
&& prefs.lockLength().nullGetOrDefault() != -1 && prefs.lockLength().getOrDefault() != -1
/** /**
* Lock the screen * Lock the screen