From 292d655bc7dc3d22e5026bed0c3804d5ebbcc481 Mon Sep 17 00:00:00 2001 From: arm64v8a <48624112+arm64v8a@users.noreply.github.com> Date: Sat, 10 Jun 2023 14:03:43 +0900 Subject: [PATCH] fix scanner --- .../java/io/nekohasekai/sagernet/ui/ScannerActivity.kt | 7 +------ buildScript/init/action/go.sh | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/ScannerActivity.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/ScannerActivity.kt index c8477f5..34998aa 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/ui/ScannerActivity.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/ui/ScannerActivity.kt @@ -1,9 +1,7 @@ package io.nekohasekai.sagernet.ui import android.Manifest -import android.annotation.SuppressLint import android.content.Intent -import android.content.pm.ActivityInfo import android.content.pm.ShortcutManager import android.graphics.ImageDecoder import android.net.Uri @@ -39,12 +37,9 @@ class ScannerActivity : ThemedActivity(), lateinit var binding: LayoutScannerBinding lateinit var cameraScan: CameraScan - @SuppressLint("SourceLockedOrientationActivity") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O) { - requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT - } + if (Build.VERSION.SDK_INT >= 25) getSystemService()!!.reportShortcutUsed("scan") binding = LayoutScannerBinding.inflate(layoutInflater) setContentView(binding.root) diff --git a/buildScript/init/action/go.sh b/buildScript/init/action/go.sh index 338f29f..69453a4 100755 --- a/buildScript/init/action/go.sh +++ b/buildScript/init/action/go.sh @@ -6,8 +6,8 @@ mkdir -p $GOPATH cd $golang if [ ! -f "go/bin/go" ]; then - curl -Lso go.tar.gz https://go.dev/dl/go1.20.3.linux-amd64.tar.gz - echo "979694c2c25c735755bf26f4f45e19e64e4811d661dd07b8c010f7a8e18adfca go.tar.gz" | sha256sum -c - + curl -Lso go.tar.gz https://go.dev/dl/go1.20.5.linux-amd64.tar.gz + echo "d7ec48cde0d3d2be2c69203bc3e0a44de8660b9c09a6e85c4732a3f7dc442612 go.tar.gz" | sha256sum -c - tar xzf go.tar.gz fi