From bfeaf99550e69b9cb34801ae7653d0952ab2c561 Mon Sep 17 00:00:00 2001
From: HMBSbige <admin@bige0.com>
Date: Tue, 16 Aug 2022 16:36:12 +0800
Subject: [PATCH] fix: some issue on android 12

---
 .idea/codeStyles/Project.xml                    |  4 ++++
 app/build.gradle                                | 15 +++++++++++----
 app/src/main/AndroidManifest.xml                |  4 +---
 .../com/bige0/shadowsocksr/GuardedProcess.kt    | 17 ++++++++++++++---
 .../shadowsocksr/ShadowsocksApplication.kt      |  7 +++----
 build.gradle                                    |  8 ++++----
 gradle/wrapper/gradle-wrapper.properties        |  2 +-
 7 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b4f7b2fc..417353c9 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -120,7 +120,11 @@
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="RIGHT_MARGIN" value="255" />
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
       <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
       <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
       <option name="PARAMETER_ANNOTATION_WRAP" value="2" />
diff --git a/app/build.gradle b/app/build.gradle
index a60bd745..b4f264e2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,8 +30,15 @@ android {
     }
 
     kotlinOptions.jvmTarget = javaVersion
+    packagingOptions {
+        jniLibs {
+            excludes += ['**/*.kotlin_*']
+        }
+        resources {
+            excludes += ['**/*.kotlin_*']
+        }
+    }
 
-    packagingOptions.exclude '**/*.kotlin_*'
 }
 
 dependencies {
@@ -40,11 +47,11 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'com.evernote:android-job:1.4.2'
-    implementation 'androidx.work:work-runtime:2.7.1'
+    implementation 'com.github.devv911:android-job:1.4.5'
+    implementation 'androidx.work:work-runtime-ktx:2.7.1'
     implementation "com.github.clans:fab:1.6.4"
     implementation "com.github.jorgecastilloprz:fabprogresscircle:1.01"
-    implementation "com.google.android.gms:play-services-analytics:17.0.1"
+    implementation 'com.google.android.gms:play-services-analytics:18.0.1'
     implementation 'com.j256.ormlite:ormlite-android:5.6'
     implementation 'com.mikepenz:iconics-core:5.3.0'
     implementation 'com.mikepenz:materialdrawer:8.4.3'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 81c42424..99e25936 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -226,7 +226,5 @@
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-    <uses-permission
-        android:name="android.permission.QUERY_ALL_PACKAGES"
-        tools:ignore="QueryAllPackagesPermission" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission" />
 </manifest>
diff --git a/app/src/main/java/com/bige0/shadowsocksr/GuardedProcess.kt b/app/src/main/java/com/bige0/shadowsocksr/GuardedProcess.kt
index 5b5b1755..f431a3fb 100644
--- a/app/src/main/java/com/bige0/shadowsocksr/GuardedProcess.kt
+++ b/app/src/main/java/com/bige0/shadowsocksr/GuardedProcess.kt
@@ -61,15 +61,26 @@ class GuardedProcess(private val cmd: List<String>)
 													 }
 												 }
 											 }
-
 										 }
 									 }
 									 catch (ignored: Exception)
 									 {
 										 VayLog.i(TAG, "thread interrupt, destroy process: $cmd")
-										 if (process != null)
+
+										 if (process == null)
+										 {
+											 return
+										 }
+
+										 if (process!!.javaClass.name.equals("java.lang.UNIXProcess"))
+										 {
+											 val fPid = process!!.javaClass.getDeclaredField("pid").apply { isAccessible = true }
+											 val pid = fPid.getInt(process)
+											 android.os.Process.killProcess(pid)
+										 }
+										 else
 										 {
-											 process!!.destroy()
+											 process!!.destroy() // wtf??? not work >= android S
 										 }
 									 }
 									 finally
diff --git a/app/src/main/java/com/bige0/shadowsocksr/ShadowsocksApplication.kt b/app/src/main/java/com/bige0/shadowsocksr/ShadowsocksApplication.kt
index 070f33b5..0b3f113d 100644
--- a/app/src/main/java/com/bige0/shadowsocksr/ShadowsocksApplication.kt
+++ b/app/src/main/java/com/bige0/shadowsocksr/ShadowsocksApplication.kt
@@ -15,7 +15,6 @@ import com.google.android.gms.analytics.*
 import com.google.android.gms.common.api.*
 import com.google.android.gms.tagmanager.*
 import com.j256.ormlite.logger.*
-import com.j256.ormlite.logger.Logger
 import java.io.*
 import java.util.*
 import java.util.concurrent.*
@@ -85,7 +84,7 @@ class ShadowsocksApplication : Application()
 	fun track(t: Throwable)
 	{
 		val builders = HitBuilders.ExceptionBuilder()
-			.setDescription(StandardExceptionParser(this, null).getDescription(Thread.currentThread().name, t))
+			.setDescription(StandardExceptionParser(this, emptyList()).getDescription(Thread.currentThread().name, t))
 			.setFatal(false)
 			.build()
 		tracker.send(builders)
@@ -221,11 +220,11 @@ class ShadowsocksApplication : Application()
 			container.registerFunctionCallMacroCallback(SIG_FUNC) { functionName, _ ->
 				if (SIG_FUNC == functionName)
 				{
-					Utils.getSignature(applicationContext)
+					Utils.getSignature(applicationContext) ?: ""
 				}
 				else
 				{
-					null
+					""
 				}
 			}
 		}
diff --git a/build.gradle b/build.gradle
index 32d15e78..05d1716c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         javaVersion = JavaVersion.VERSION_1_8
-        kotlinVersion = '1.6.10'
+        kotlinVersion = '1.7.10'
         minSdkVersion = 21
         sdkVersion = 31
         compileSdkVersion = 31
@@ -13,10 +13,9 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven  { url 'https://maven.aliyun.com/repository/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -28,7 +27,8 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven  { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://jitpack.io' }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3eb66b86..0260ef11 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip