Add Tsumino captcha display and merge branch 'master' of upstream

# Conflicts:
#	.github/readme-images/app-icon.png
#	.github/readme-images/screens.png
#	.travis.yml
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSourceMappings.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/DynamicConcurrentMergeOperator.java
This commit is contained in:
NerdNumber9
2018-02-24 11:13:43 -05:00
100 changed files with 3186 additions and 1658 deletions

View File

@ -0,0 +1,23 @@
package exh.captcha
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
class SolveCaptchaActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val sourceId = intent.getIntExtra(SOURCE_ID_EXTRA, -1)
val source = sourc
if(sourceId == -1) {
finish()
return
}
}
companion object {
const val SOURCE_ID_EXTRA = "source_id_extra"
}
}