R3.15.5

ryuunoakaihitomi · Mar 18, 2022 · d144e50 · d144e50
1 parent 8f058be
commit d144e50
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/build_floss_rel.yml b/.github/workflows/build_floss_rel.yml
@@ -65,7 +65,7 @@ jobs:
         # gradle/wrapper/gradle-wrapper.properties
       - name: Install gradle wrapper
         env:
-          GRADLE_VERSION: 7.4 # 尝试下最新版本，gradle-wrapper.properties的不要更新，AS依赖
+          GRADLE_VERSION: 7.4.1 # 尝试下最新版本，gradle-wrapper.properties的不要更新，AS依赖
         run: gradle wrapper --gradle-version $GRADLE_VERSION
 
       - name: Check dependency updates

diff --git a/app/build.gradle b/app/build.gradle
@@ -21,10 +21,10 @@ android {
         //targetSdkVersion compileSdkVersion
         targetSdkVersion 32
         // 版本号：发布日期
-        versionCode 20220313
+        versionCode 20220319
         // 版本名说明： R3.x.y.z (R3:Refactoring 第三次重构，z:Quick Fix序号)
         // 不要包含非ASCII可打印字符，会导致Github release文件名异常
-        versionName 'R3.15.5'
+        versionName 'R3.15.6'
         resConfigs "en", "zh-rCN"
 
         buildConfigField 'String', 'BUILD_TIME', '\"' + new Date() + '\"'
@@ -132,7 +132,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // https://github.com/firebase/firebase-android-sdk
-    normalImplementation platform('com.google.firebase:firebase-bom:29.1.0')
+    normalImplementation platform('com.google.firebase:firebase-bom:29.2.1')
     normalImplementation 'com.google.firebase:firebase-analytics-ktx'
     normalImplementation 'com.google.firebase:firebase-crashlytics-ktx'
 

diff --git a/app/src/main/java/github/ryuunoakaihitomi/powerpanel/ui/main/PowerViewModel.kt b/app/src/main/java/github/ryuunoakaihitomi/powerpanel/ui/main/PowerViewModel.kt
@@ -61,11 +61,9 @@ class PowerViewModel : ViewModel() {
     fun prepare() {
         viewModelScope.launch(Dispatchers.IO) {
             // 在这里提供root状态
-            // 由于libsu 4.0.0的变更，Shell.rootAccess()在返回true的情况下不再准确；尝试执行命令进一步判断
+            // 由于libsu 4.0.0的变更，Shell.rootAccess()在返回true的情况下不再准确；需要进一步判断
             val isRoot = if (Shell.rootAccess()) {
-                val result = Shell.cmd("su -c id").exec()
-                Timber.d("c=${result.code}, e=${result.err}, o=${result.out}")
-                result.isSuccess
+                Shell.getShell().isRoot
             } else false
 
             viewModelScope.launch {