Merge remote-tracking branch 'origin/v1.8.38-2dust'

mahsanet · Aug 28, 2024 · 127c255 · 127c255
2 parents 7d6faee + b893976
commit 127c255
Show file tree

Hide file tree

Showing 113 changed files with 1,505 additions and 1,140 deletions.
diff --git a/V2rayNG/app/build.gradle.kts b/V2rayNG/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "com.MahsaNet.NikaNG"
         minSdk = 21
         targetSdk = 34
-        versionCode = 579
-        versionName = "1.8.35"
+        versionCode = 583
+        versionName = "1.8.38"
         multiDexEnabled = true
         splits {
             abi {
@@ -68,12 +68,9 @@ android {
                     "universal"
 
                 output.outputFileName = "NikaNG_${variant.versionName}_${abi}.apk"
-                if(versionCodes.containsKey(abi))
-                {
+                if (versionCodes.containsKey(abi)) {
                     output.versionCodeOverride = (1000000 * versionCodes[abi]!!).plus(variant.versionCode)
-                }
-                else
-                {
+                } else {
                     return@forEach
                 }
             }
@@ -92,7 +89,7 @@ android {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar","*.jar"))))
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar", "*.jar"))))
     testImplementation(libs.junit)
 
     implementation(libs.flexbox)
@@ -130,7 +127,6 @@ dependencies {
     implementation(libs.language.json)
     implementation(libs.quickie.bundled)
     implementation(libs.core)
-    // Updating these 2 dependencies may cause some errors. Be careful.
     implementation(libs.work.runtime.ktx)
     implementation(libs.work.multiprocess)
 }
diff --git a/V2rayNG/app/src/main/AndroidManifest.xml b/V2rayNG/app/src/main/AndroidManifest.xml
@@ -8,18 +8,29 @@
         android:smallScreens="true"
         android:normalScreens="true"
         android:largeScreens="true"
-        android:xlargeScreens="true"/>
+        android:xlargeScreens="true" />
 
-    <uses-sdk android:minSdkVersion="21" tools:overrideLibrary="com.blacksquircle.ui.editorkit"/>
+    <uses-sdk
+        android:minSdkVersion="21"
+        tools:overrideLibrary="com.blacksquircle.ui.editorkit" />
 
-    <uses-feature android:name="android.hardware.camera" android:required="false"/>
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
-    <uses-feature android:name="android.software.leanback" android:required="false" />
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
 
     <!-- https://developer.android.com/about/versions/11/privacy/package-visibility -->
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
-            tools:ignore="QueryAllPackagesPermission" />
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -31,7 +42,7 @@
         android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
         android:minSdkVersion="34" />
     <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
 
 
@@ -53,12 +64,14 @@
             android:theme="@style/AppThemeDayNight.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
+
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
@@ -119,12 +132,14 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:scheme="v2rayng"/>
-                <data android:host="install-config"/>
-                <data android:host="install-sub"/>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="v2rayng" />
+                <data android:host="install-config" />
+                <data android:host="install-sub" />
             </intent-filter>
         </activity>
         <activity
@@ -150,28 +165,29 @@
                 android:value="vpn" />
         </service>
 
-        <service android:name=".service.V2RayProxyOnlyService"
-                android:exported="false"
-                android:label="@string/app_name"
-                android:foregroundServiceType="specialUse"
-                android:process=":RunSoLibV2RayDaemon">
+        <service
+            android:name=".service.V2RayProxyOnlyService"
+            android:exported="false"
+            android:label="@string/app_name"
+            android:foregroundServiceType="specialUse"
+            android:process=":RunSoLibV2RayDaemon">
             <property
                 android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
                 android:value="proxy" />
         </service>
 
-        <service android:name=".service.V2RayTestService"
+        <service
+            android:name=".service.V2RayTestService"
             android:exported="false"
-            android:process=":RunSoLibV2RayDaemon">
-        </service>
+            android:process=":RunSoLibV2RayDaemon"></service>
 
         <receiver
-                android:exported="true"
-                android:name=".receiver.WidgetProvider"
-                android:process=":RunSoLibV2RayDaemon">
+            android:exported="true"
+            android:name=".receiver.WidgetProvider"
+            android:process=":RunSoLibV2RayDaemon">
             <meta-data
-                    android:name="android.appwidget.provider"
-                    android:resource="@xml/app_widget_provider" />
+                android:name="android.appwidget.provider"
+                android:resource="@xml/app_widget_provider" />
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="com.v2ray.ang.action.widget.click" />
@@ -180,13 +196,13 @@
         </receiver>
 
         <service
-                android:exported="true"
-                android:name=".service.QSTileService"
-                android:icon="@drawable/ic_stat_name"
-                android:label="@string/app_tile_name"
-                android:foregroundServiceType="specialUse"
-                android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-                android:process=":RunSoLibV2RayDaemon">
+            android:exported="true"
+            android:name=".service.QSTileService"
+            android:icon="@drawable/ic_stat_name"
+            android:label="@string/app_tile_name"
+            android:foregroundServiceType="specialUse"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:process=":RunSoLibV2RayDaemon">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
@@ -208,7 +224,7 @@
         <receiver
             android:exported="true"
             android:name=".receiver.TaskerReceiver"
-                android:process=":RunSoLibV2RayDaemon">
+            android:process=":RunSoLibV2RayDaemon">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
             </intent-filter>
@@ -234,7 +250,7 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/cache_paths"/>
+                android:resource="@xml/cache_paths" />
         </provider>
 
     </application>

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/ItemTouchHelperAdapter.java b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/ItemTouchHelperAdapter.java
@@ -16,8 +16,8 @@
 
 package com.v2ray.ang.helper;
 
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Interface to listen for a move or dismissal event from a {@link ItemTouchHelper.Callback}.
@@ -36,7 +36,6 @@ public interface ItemTouchHelperAdapter {
      * @param fromPosition The start position of the moved item.
      * @param toPosition   Then resolved position of the moved item.
      * @return True if the item was moved to the new adapter position.
-     *
      * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
      * @see RecyclerView.ViewHolder#getAdapterPosition()
      */
@@ -52,7 +51,6 @@ public interface ItemTouchHelperAdapter {
      * adjusting the underlying data to reflect this removal.
      *
      * @param position The position of the item dismissed.
-     *
      * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
      * @see RecyclerView.ViewHolder#getAdapterPosition()
      */

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.java b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.java
@@ -17,9 +17,10 @@
 package com.v2ray.ang.helper;
 
 import android.graphics.Canvas;
+
 import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AngApplication.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AngApplication.kt
@@ -3,10 +3,11 @@ package com.v2ray.ang
 import android.content.Context
 import androidx.multidex.MultiDexApplication
 import androidx.work.Configuration
+import androidx.work.WorkManager
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.util.Utils
 
-class AngApplication : MultiDexApplication(), Configuration.Provider {
+class AngApplication : MultiDexApplication() {
     companion object {
         //const val PREF_LAST_VERSION = "pref_last_version"
         lateinit var application: AngApplication
@@ -17,8 +18,9 @@ class AngApplication : MultiDexApplication(), Configuration.Provider {
         application = this
     }
 
-    //var firstRun = false
-     //   private set
+    private val workManagerConfiguration: Configuration = Configuration.Builder()
+        .setDefaultProcessName("${BuildConfig.APPLICATION_ID}:bg")
+        .build()
 
     override fun onCreate() {
         super.onCreate()
@@ -34,11 +36,7 @@ class AngApplication : MultiDexApplication(), Configuration.Provider {
         MMKV.initialize(this)
 
         Utils.setNightMode(application)
-    }
-
-    override fun getWorkManagerConfiguration(): Configuration {
-        return Configuration.Builder()
-            .setDefaultProcessName("${BuildConfig.APPLICATION_ID}:bg")
-            .build()
+        // Initialize WorkManager with the custom configuration
+        WorkManager.initialize(this, workManagerConfiguration)
     }
 }
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt
@@ -148,6 +148,7 @@ object AppConfig {
     const val RAY_NG_CHANNEL_NAME = "V2rayNG Background Service"
     const val SUBSCRIPTION_UPDATE_CHANNEL = "subscription_update_channel"
     const val SUBSCRIPTION_UPDATE_CHANNEL_NAME = "Subscription Update Service"
+
     /** Protocols Scheme **/
     const val VMESS = "vmess://"
     const val CUSTOM = ""

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/AppInfo.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/AppInfo.kt
@@ -2,8 +2,10 @@ package com.v2ray.ang.dto
 
 import android.graphics.drawable.Drawable
 
-data class AppInfo(val appName: String,
-                   val packageName: String,
-                   val appIcon: Drawable,
-                   val isSystemApp: Boolean,
-                   var isSelected: Int)
+data class AppInfo(
+    val appName: String,
+    val packageName: String,
+    val appIcon: Drawable,
+    val isSystemApp: Boolean,
+    var isSelected: Int
+)
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/EConfigType.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/EConfigType.kt
@@ -6,7 +6,7 @@ import com.v2ray.ang.AppConfig
 enum class EConfigType(val value: Int, val protocolScheme: String) {
     VMESS(1, AppConfig.VMESS),
     CUSTOM(2, AppConfig.CUSTOM),
-    SHADOWSOCKS(3,AppConfig.SHADOWSOCKS),
+    SHADOWSOCKS(3, AppConfig.SHADOWSOCKS),
     SOCKS(4, AppConfig.SOCKS),
     VLESS(5, AppConfig.VLESS),
     TROJAN(6, AppConfig.TROJAN),

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/ERoutingMode.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/ERoutingMode.kt
@@ -1,6 +1,6 @@
 package com.v2ray.ang.dto
 
-enum class ERoutingMode(val value: String  ) {
+enum class ERoutingMode(val value: String) {
     GLOBAL_PROXY("0"),
     BYPASS_LAN("1"),
     BYPASS_MAINLAND("2"),