Merge pull request #1218 from yuhan6665/fix-sniffing2

Fix sniffing default value again

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'

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 {
+    fun getUrlContentWithCustomUserAgent(urlStr: String?): String {
-        val conn = URL(url).openConnection()
+        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()

V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt

@@ -101,7 +101,7 @@ object V2rayConfigUtil {
             v2rayConfig.inbounds[0].port = 10808
             val fakedns = settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED)
                     ?: false
-            val sniffAllTlsAndHttp = settingsStorage?.decodeBool(AppConfig.PREF_SNIFFING_ENABLED)
+            val sniffAllTlsAndHttp = settingsStorage?.decodeBool(AppConfig.PREF_SNIFFING_ENABLED, true)
                     ?: true
             v2rayConfig.inbounds[0].sniffing?.enabled = fakedns || sniffAllTlsAndHttp
             if (!sniffAllTlsAndHttp) {