Refine stuffs

nekohasekai · nekohasekai · commit bc9baa522652 · 2021-05-29T18:26:04.000+08:00
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -311,20 +311,4 @@ jobs:
           echo "sdk.dir=${ANDROID_HOME}" > local.properties
           echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
           ./run update_assets
-          ./gradlew app:assembleOssDebug
-      - uses: actions/upload-artifact@v2
-        with:
-          name: "SHA256-ARM ${{ env.SHA256_ARM }}"
-          path: ${{ env.SUM_ARM }}
-      - uses: actions/upload-artifact@v2
-        with:
-          name: "SHA256-ARM64 ${{ env.SHA256_ARM64 }}"
-          path: ${{ env.SUM_ARM64 }}
-      - uses: actions/upload-artifact@v2
-        with:
-          name: "SHA256-X64 ${{ env.SHA256_X64 }}"
-          path: ${{ env.SUM_X64 }}
-      - uses: actions/upload-artifact@v2
-        with:
-          name: "SHA256-X86 ${{ env.SHA256_X86 }}"
-          path: ${{ env.SUM_X86 }}
+          ./gradlew app:assembleOssDebug
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -4,7 +4,5 @@
 
 # SnakeYaml
 -keep class org.yaml.snakeyaml.** { *; }
--keep class org.yaml.snakeyaml.** { *; }
 
--keepattributes SourceFile, LineNumberTable
--dontobfuscate
+-keepattributes SourceFile, LineNumberTable
diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/ScannerActivity.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/ScannerActivity.kt
@@ -103,6 +103,7 @@ class ScannerActivity : ThemedActivity(), BarcodeCallback {
                             decoder.isMutableRequired = true
                         }
                     } else {
+                        @Suppress("DEPRECATION")
                         MediaStore.Images.Media.getBitmap(contentResolver, uri)
                     }
                     val intArray = IntArray(bitmap.width * bitmap.height)
diff --git a/bin/init/action/naive.sh b/bin/init/action/naive.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-sudo apt install ninja-build pkg-config qemu-user ccache
+sudo apt install ninja-build pkg-config
 sudo apt remove libc6-i386 --autoremove
diff --git a/bin/update_assets.sh b/bin/update_assets.sh
@@ -6,7 +6,7 @@ mkdir -p app/src/main/assets/v2ray
 curl -L -o app/src/main/assets/v2ray/geoip.dat "https://github.com/v2fly/geoip/raw/release/geoip.dat"
 curl -L -o app/src/main/assets/v2ray/geosite.dat "https://github.com/v2fly/domain-list-community/raw/release/dlc.dat"
 
-curl -L -o v2ray-extra.zip https://github.com/v2fly/v2ray-core/releases/download/v4.39.1/v2ray-extra.zip
+curl -L -o v2ray-extra.zip https://github.com/v2fly/v2ray-core/releases/download/v4.39.2/v2ray-extra.zip
 unzip -o v2ray-extra.zip -d app/src/main/assets
 rm v2ray-extra.zip
 mv app/src/main/assets/browserforwarder/* app/src/main/assets/v2ray
diff --git a/buildSrc/src/main/kotlin/Helpers.kt b/buildSrc/src/main/kotlin/Helpers.kt
@@ -244,8 +244,9 @@ fun Project.setupAppCommon() {
                 dependsOn("package${requireFlavor()}")
             }
             val assemble = "assemble${requireFlavor()}"
+            val install = "install${requireFlavor()}"
             tasks.whenTaskAdded {
-                if (name == assemble) dependsOn("calculateAPKsSha256")
+                if (name == assemble || name == install) dependsOn("calculateAPKsSha256")
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ class ScannerActivity : ThemedActivity(), BarcodeCallback {`
`103`	`103`	`decoder.isMutableRequired = true`
`104`	`104`	`}`
`105`	`105`	`} else {`
	`106`	`+ @Suppress("DEPRECATION")`
`106`	`107`	`MediaStore.Images.Media.getBitmap(contentResolver, uri)`
`107`	`108`	`}`
`108`	`109`	`val intArray = IntArray(bitmap.width * bitmap.height)`
Original file line number	Diff line number	Diff line change
`@@ -244,8 +244,9 @@ fun Project.setupAppCommon() {`
`244`	`244`	`dependsOn("package${requireFlavor()}")`
`245`	`245`	`}`
`246`	`246`	`val assemble = "assemble${requireFlavor()}"`
	`247`	`+ val install = "install${requireFlavor()}"`
`247`	`248`	`tasks.whenTaskAdded {`
`248`		`- if (name == assemble) dependsOn("calculateAPKsSha256")`
	`249`	`+ if (name == assemble \|\| name == install) dependsOn("calculateAPKsSha256")`
`249`	`250`	`}`
`250`	`251`	`}`
`251`	`252`	`}`