Upstream merge

Internal permission change
Fix url adder

app/src/main/java/exh/ui/intercept/InterceptActivity.kt

@@ -0,0 +1,82 @@
+package exh.ui.intercept
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.MenuItem
+import com.afollestad.materialdialogs.MaterialDialog
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
+import eu.kanade.tachiyomi.ui.manga.MangaActivity
+import exh.GalleryAdder
+import kotlinx.android.synthetic.main.toolbar.*
+import timber.log.Timber
+import kotlin.concurrent.thread
+
+class InterceptActivity : BaseActivity() {
+
+    private val galleryAdder = GalleryAdder()
+
+    var finished = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setAppTheme()
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.eh_activity_intercept)
+
+        setupToolbar(toolbar, backNavigation = false)
+
+        if(savedInstanceState == null)
+            thread { setup() }
+    }
+
+    fun setup() {
+        try {
+            processLink()
+        } catch(t: Throwable) {
+            Timber.e(t, "Could not intercept link!")
+            if(!finished)
+                runOnUiThread {
+                    MaterialDialog.Builder(this)
+                            .title("Error")
+                            .content("Could not load this gallery!")
+                            .cancelable(true)
+                            .canceledOnTouchOutside(true)
+                            .cancelListener { onBackPressed() }
+                            .positiveText("Ok")
+                            .onPositive { _, _ -> onBackPressed() }
+                            .dismissListener { onBackPressed() }
+                            .show()
+                }
+        }
+    }
+
+    fun processLink() {
+        if(Intent.ACTION_VIEW == intent.action) {
+            val manga = galleryAdder.addGallery(intent.dataString)
+
+            if(!finished)
+                startActivity(MangaActivity.newIntent(this, manga, true))
+            onBackPressed()
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> onBackPressed()
+            else -> return super.onOptionsItemSelected(item)
+        }
+        return true
+    }
+
+    override fun onBackPressed() {
+        if(!finished)
+            runOnUiThread {
+                super.onBackPressed()
+            }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        finished = true
+    }
+}