Merge pull request #1208 from yuhan6665/fix-viewpager

Fix an issue with ViewPage2 and menu bar
Merge pull request #1204 from douo/master
2021-08-28 17:06:21 +08:00 · 2021-08-28 17:06:10 +08:00 · 2021-08-27 17:48:45 -04:00 · 2021-08-23 16:58:48 +08:00 · 2021-08-23 16:49:35 +08:00
2 changed files with 8 additions and 3 deletions
--- a/V2rayNG/app/build.gradle
+++ b/V2rayNG/app/build.gradle
@@ -83,7 +83,7 @@ dependencies {
    implementation "androidx.preference:preference:1.0.0"
    implementation "androidx.recyclerview:recyclerview:1.2.1"
    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.viewpager2:viewpager2:1.0.0'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'

    // Androidx ktx
    implementation 'androidx.activity:activity-ktx:1.2.4'
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
@@ -459,10 +459,15 @@ object Utils {
    }

    @Throws(IOException::class)
-    fun getUrlContentWithCustomUserAgent(url: String?): String {
-        val conn = URL(url).openConnection()
+    fun getUrlContentWithCustomUserAgent(urlStr: String?): String {
+        val url = URL(urlStr)
+        val conn = url.openConnection()
        conn.setRequestProperty("Connection", "close")
        conn.setRequestProperty("User-agent", "v2rayNG/${BuildConfig.VERSION_NAME}")
+        url.userInfo?.let {
+            conn.setRequestProperty("Authorization",
+                "Basic ${encode(urlDecode(it))}")
+        }
        conn.useCaches = false
        return conn.inputStream.use {
            it.bufferedReader().readText()
Author	SHA1	Message	Date
2dust	62d0951a24	Merge pull request #1208 from yuhan6665/fix-viewpager Fix an issue with ViewPage2 and menu bar	2021-08-28 17:06:21 +08:00
2dust	d6605cc866	Merge pull request #1204 from douo/master Add support in subscription url for http basic authentication.	2021-08-28 17:06:10 +08:00
yuhan6665	1fc493d879	Fix an issue with ViewPage2 and menu bar	2021-08-27 17:48:45 -04:00
tiou	bdc27dd180	Use built-in urlDecode.	2021-08-23 16:58:48 +08:00
tiou	e257c4cb56	Subscription support http basic authentication in url.	2021-08-23 16:49:35 +08:00