Upstream merge

Internal permission change
Fix url adder

app/src/main/java/exh/util/UriFilter.kt

@@ -0,0 +1,10 @@
+package exh.util
+
+import android.net.Uri
+
+/**
+ * Uri filter
+ */
+interface UriFilter {
+    fun addToUri(builder: Uri.Builder)
+}

app/src/main/java/exh/util/UriGroup.kt

@@ -0,0 +1,15 @@
+package exh.util
+
+import android.net.Uri
+import eu.kanade.tachiyomi.source.model.Filter
+
+/**
+ * UriGroup
+ */
+open class UriGroup<V>(name: String, state: List<V>) : Filter.Group<V>(name, state), UriFilter {
+    override fun addToUri(builder: Uri.Builder) {
+        state.forEach {
+            if(it is UriFilter) it.addToUri(builder)
+        }
+    }
+}