Horis 2 лет назад
Родитель
Сommit
ec8d3ea73e

+ 8 - 7
app/src/main/java/io/legado/app/base/BaseService.kt

@@ -33,7 +33,7 @@ abstract class BaseService : LifecycleService() {
     override fun onCreate() {
     override fun onCreate() {
         super.onCreate()
         super.onCreate()
         LifecycleHelp.onServiceCreate(this)
         LifecycleHelp.onServiceCreate(this)
-        checkNotificationPermission()
+        checkPermission()
     }
     }
 
 
     @CallSuper
     @CallSuper
@@ -73,18 +73,19 @@ abstract class BaseService : LifecycleService() {
     /**
     /**
      * 检测通知权限和后台权限
      * 检测通知权限和后台权限
      */
      */
-    private fun checkNotificationPermission() {
+    private fun checkPermission() {
         PermissionsCompat.Builder()
         PermissionsCompat.Builder()
-            .addPermissions(
-                Permissions.POST_NOTIFICATIONS,
-                Permissions.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-            )
-            .rationale(R.string.service_permission_rationale)
+            .addPermissions(Permissions.POST_NOTIFICATIONS)
+            .rationale(R.string.notification_permission_rationale)
             .onGranted {
             .onGranted {
                 if (lifecycleScope.isActive) {
                 if (lifecycleScope.isActive) {
                     startForegroundNotification()
                     startForegroundNotification()
                 }
                 }
             }
             }
             .request()
             .request()
+        PermissionsCompat.Builder()
+            .addPermissions(Permissions.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
+            .rationale(R.string.ignore_battery_permission_rationale)
+            .request()
     }
     }
 }
 }

+ 1 - 1
app/src/main/res/values-es-rES/strings.xml

@@ -1147,5 +1147,5 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="service_permission_rationale">阅读需要发送通知来显示朗读控制和下载进度、请求后台权限以保持服务正常运行</string>
+    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>
 </resources>

+ 1 - 1
app/src/main/res/values-ja-rJP/strings.xml

@@ -1150,5 +1150,5 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="service_permission_rationale">阅读需要发送通知来显示朗读控制和下载进度、请求后台权限以保持服务正常运行</string>
+    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>
 </resources>

+ 1 - 1
app/src/main/res/values-pt-rBR/strings.xml

@@ -1150,5 +1150,5 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="service_permission_rationale">阅读需要发送通知来显示朗读控制和下载进度、请求后台权限以保持服务正常运行</string>
+    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>
 </resources>

+ 1 - 1
app/src/main/res/values-vi/strings.xml

@@ -1146,5 +1146,5 @@ Còn </string>
     <string name="font_weight_text">中/粗/细</string>
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="service_permission_rationale">阅读需要发送通知来显示朗读控制和下载进度、请求后台权限以保持服务正常运行</string>
+    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>
 </resources>

+ 1 - 1
app/src/main/res/values-zh-rHK/strings.xml

@@ -1147,5 +1147,5 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="service_permission_rationale">阅读需要发送通知来显示朗读控制和下载进度、请求后台权限以保持服务正常运行</string>
+    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>
 </resources>

+ 1 - 1
app/src/main/res/values-zh-rTW/strings.xml

@@ -1149,5 +1149,5 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="service_permission_rationale">阅读需要发送通知来显示朗读控制和下载进度、请求后台权限以保持服务正常运行</string>
+    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>
 </resources>

+ 1 - 1
app/src/main/res/values-zh/strings.xml

@@ -1149,5 +1149,5 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="service_permission_rationale">阅读需要发送通知来显示朗读控制和下载进度、请求后台权限以保持服务正常运行</string>
+    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>
 </resources>

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1150,5 +1150,5 @@
     <string name="font_weight_text">N/B/L</string>
     <string name="font_weight_text">N/B/L</string>
     <string name="keep_swipe_tip">Keep swiping to load the next chapter…</string>
     <string name="keep_swipe_tip">Keep swiping to load the next chapter…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="service_permission_rationale">阅读需要发送通知来显示朗读控制和下载进度、请求后台权限以保持服务正常运行</string>
+    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>
 </resources>