Merge d4afcbe8fd into 4c6ec35d95

app/src/main/java/io/legado/app/base/BaseService.kt

@@ -1,7 +1,6 @@
 package io.legado.app.base
 
 import android.content.Intent
-import android.os.Build
 import android.os.IBinder
 import androidx.annotation.CallSuper
 import androidx.lifecycle.LifecycleService
@@ -34,7 +33,7 @@ abstract class BaseService : LifecycleService() {
     override fun onCreate() {
         super.onCreate()
         LifecycleHelp.onServiceCreate(this)
-        checkPermission()
+        checkNotificationPermission()
     }
 
     @CallSuper
@@ -72,9 +71,9 @@ abstract class BaseService : LifecycleService() {
     }
 
     /**
-     * 检测通知权限和后台权限
+     * 检测通知权限
      */
-    private fun checkPermission() {
+    private fun checkNotificationPermission() {
         PermissionsCompat.Builder()
             .addPermissions(Permissions.POST_NOTIFICATIONS)
             .rationale(R.string.notification_permission_rationale)
@@ -84,11 +83,5 @@ abstract class BaseService : LifecycleService() {
                 }
             }
             .request()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            PermissionsCompat.Builder()
-                .addPermissions(Permissions.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
-                .rationale(R.string.ignore_battery_permission_rationale)
-                .request()
-        }
     }
-}
+}

app/src/main/java/io/legado/app/lib/permission/PermissionActivity.kt

@@ -1,6 +1,5 @@
 package io.legado.app.lib.permission
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
@@ -25,7 +24,6 @@ class PermissionActivity : AppCompatActivity() {
             finish()
         }
 
-    @SuppressLint("BatteryLife")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val rationale = intent.getStringExtra(KEY_RATIONALE)
@@ -74,16 +72,6 @@ class PermissionActivity : AppCompatActivity() {
                     }
                 }
             }
-
-            Request.TYPE_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS -> showSettingDialog(
-                permissions, rationale
-            ) {
-                kotlin.runCatching {
-                    val intent = Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
-                    intent.setData(Uri.parse("package:$packageName"))
-                    settingActivityResult.launch(intent)
-                }
-            }
         }
         onBackPressedDispatcher.addCallback(this) {
 

app/src/main/java/io/legado/app/lib/permission/Permissions.kt

@@ -43,9 +43,6 @@ object Permissions {
 
     const val ACCESS_MEDIA_LOCATION = "android.permission.ACCESS_MEDIA_LOCATION"
 
-    const val REQUEST_IGNORE_BATTERY_OPTIMIZATIONS =
-        "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"
-
     object Group {
         val STORAGE = if (isManageExternalStorage()) {
             arrayOf(MANAGE_EXTERNAL_STORAGE)

app/src/main/java/io/legado/app/lib/permission/Request.kt

@@ -9,7 +9,6 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import io.legado.app.utils.startActivity
 import splitties.init.appCtx
-import splitties.systemservices.powerManager
 
 @Suppress("MemberVisibilityCanBePrivate")
 internal class Request : OnRequestPermissionsResultCallback {
@@ -74,10 +73,6 @@ internal class Request : OnRequestPermissionsResultCallback {
                 }
             } else if (deniedPermissions.contains(Permissions.POST_NOTIFICATIONS)) {
                 toNotificationSetting()
-            } else if (deniedPermissions.contains(Permissions.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    toIgnoreBatterySetting()
-                }
             } else if (deniedPermissions.size > 1) {
                 appCtx.startActivity<PermissionActivity> {
                     putExtra(PermissionActivity.KEY_RATIONALE, rationale)
@@ -103,7 +98,6 @@ internal class Request : OnRequestPermissionsResultCallback {
                         deniedPermissionList.add(permission)
                     }
                 }
-
                 Permissions.MANAGE_EXTERNAL_STORAGE -> {
                     if (Permissions.isManageExternalStorage()) {
                         if (!Environment.isExternalStorageManager()) {
@@ -111,15 +105,6 @@ internal class Request : OnRequestPermissionsResultCallback {
                         }
                     }
                 }
-
-                Permissions.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS -> {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        if (!powerManager.isIgnoringBatteryOptimizations(appCtx.packageName)) {
-                            deniedPermissionList.add(permission)
-                        }
-                    }
-                }
-
                 else -> {
                     if (
                         ContextCompat.checkSelfPermission(appCtx, permission)
@@ -180,18 +165,6 @@ internal class Request : OnRequestPermissionsResultCallback {
         }
     }
 
-    private fun toIgnoreBatterySetting() {
-        appCtx.startActivity<PermissionActivity> {
-            putExtra(PermissionActivity.KEY_RATIONALE, rationale)
-            putExtra(
-                PermissionActivity.KEY_INPUT_REQUEST_TYPE,
-                TYPE_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-            )
-            putExtra(PermissionActivity.KEY_INPUT_PERMISSIONS_CODE, requestCode)
-            putExtra(PermissionActivity.KEY_INPUT_PERMISSIONS, deniedPermissions)
-        }
-    }
-
     override fun onRequestPermissionsResult(
         permissions: Array<String>,
         grantResults: IntArray
@@ -223,6 +196,5 @@ internal class Request : OnRequestPermissionsResultCallback {
         const val TYPE_REQUEST_SETTING = 2
         const val TYPE_MANAGE_ALL_FILES_ACCESS = 3
         const val TYPE_REQUEST_NOTIFICATIONS = 4
-        const val TYPE_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = 5
     }
 }

app/src/main/java/io/legado/app/model/ReadAloud.kt

@@ -3,6 +3,7 @@ package io.legado.app.model
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.core.content.ContextCompat
 import io.legado.app.constant.AppLog
 import io.legado.app.constant.EventBus
 import io.legado.app.constant.IntentAction
@@ -15,7 +16,6 @@ import io.legado.app.service.TTSReadAloudService
 import io.legado.app.utils.LogUtils
 import io.legado.app.utils.StringUtils
 import io.legado.app.utils.postEvent
-import io.legado.app.utils.startForegroundServiceCompat
 import io.legado.app.utils.toastOnUi
 import splitties.init.appCtx
 
@@ -56,7 +56,7 @@ object ReadAloud {
         intent.putExtra("startPos", startPos)
         LogUtils.d("ReadAloud", intent.toString())
         try {
-            context.startForegroundServiceCompat(intent)
+            ContextCompat.startForegroundService(context, intent)
         } catch (e: Exception) {
             val msg = "启动朗读服务出错\n${e.localizedMessage}"
             AppLog.put(msg, e)
@@ -81,7 +81,7 @@ object ReadAloud {
         if (BaseReadAloudService.isRun) {
             val intent = Intent(context, aloudClass)
             intent.action = IntentAction.pause
-            context.startForegroundServiceCompat(intent)
+            ContextCompat.startForegroundService(context, intent)
         }
     }
 
@@ -89,7 +89,7 @@ object ReadAloud {
         if (BaseReadAloudService.isRun) {
             val intent = Intent(context, aloudClass)
             intent.action = IntentAction.resume
-            context.startForegroundServiceCompat(intent)
+            ContextCompat.startForegroundService(context, intent)
         }
     }
 
@@ -97,7 +97,7 @@ object ReadAloud {
         if (BaseReadAloudService.isRun) {
             val intent = Intent(context, aloudClass)
             intent.action = IntentAction.stop
-            context.startForegroundServiceCompat(intent)
+            ContextCompat.startForegroundService(context, intent)
         }
     }
 
@@ -105,7 +105,7 @@ object ReadAloud {
         if (BaseReadAloudService.isRun) {
             val intent = Intent(context, aloudClass)
             intent.action = IntentAction.prevParagraph
-            context.startForegroundServiceCompat(intent)
+            ContextCompat.startForegroundService(context, intent)
         }
     }
 
@@ -113,7 +113,7 @@ object ReadAloud {
         if (BaseReadAloudService.isRun) {
             val intent = Intent(context, aloudClass)
             intent.action = IntentAction.nextParagraph
-            context.startForegroundServiceCompat(intent)
+            ContextCompat.startForegroundService(context, intent)
         }
     }
 
@@ -121,7 +121,7 @@ object ReadAloud {
         if (BaseReadAloudService.isRun) {
             val intent = Intent(context, aloudClass)
             intent.action = IntentAction.upTtsSpeechRate
-            context.startForegroundServiceCompat(intent)
+            ContextCompat.startForegroundService(context, intent)
         }
     }
 
@@ -130,7 +130,7 @@ object ReadAloud {
             val intent = Intent(context, aloudClass)
             intent.action = IntentAction.setTimer
             intent.putExtra("minute", minute)
-            context.startForegroundServiceCompat(intent)
+            ContextCompat.startForegroundService(context, intent)
         }
     }
 

app/src/main/java/io/legado/app/service/BaseReadAloudService.kt

@@ -168,7 +168,6 @@ abstract class BaseReadAloudService : BaseService(),
         abandonFocus()
         unregisterReceiver(broadcastReceiver)
         postEvent(EventBus.ALOUD_STATE, Status.STOP)
-        notificationManager.cancel(NotificationId.ReadAloudService)
         upMediaSessionPlaybackState(PlaybackStateCompat.STATE_STOPPED)
         mediaSessionCompat.release()
         ReadBook.uploadProgress()
@@ -497,8 +496,6 @@ abstract class BaseReadAloudService : BaseService(),
             nSubtitle = getString(R.string.read_aloud_s)
         val builder = NotificationCompat
             .Builder(this@BaseReadAloudService, AppConst.channelIdReadAloud)
-            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-            .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
             .setSmallIcon(R.drawable.ic_volume_up)
             .setSubText(getString(R.string.read_aloud))
             .setOngoing(true)
@@ -538,7 +535,7 @@ abstract class BaseReadAloudService : BaseService(),
             androidx.media.app.NotificationCompat.MediaStyle()
                 .setShowActionsInCompactView(0, 1, 2)
         )
-        return builder
+        return builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
     }
 
     /**

app/src/main/java/io/legado/app/service/ExportBookService.kt

@@ -27,7 +27,6 @@ import io.legado.app.help.book.BookHelp
 import io.legado.app.help.book.ContentProcessor
 import io.legado.app.help.book.getExportFileName
 import io.legado.app.help.book.isLocal
-import io.legado.app.help.book.isLocalModified
 import io.legado.app.help.config.AppConfig
 import io.legado.app.model.localBook.LocalBook
 import io.legado.app.ui.book.cache.CacheActivity
@@ -58,7 +57,6 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.collectIndexed
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import me.ag2s.epublib.domain.Author
 import me.ag2s.epublib.domain.Date
@@ -123,10 +121,7 @@ class ExportBookService : BaseService() {
                 toastOnUi(it.localizedMessage)
             }
 
-            IntentAction.stop -> {
-                notificationManager.cancel(NotificationId.ExportBook)
-                stopSelf()
-            }
+            IntentAction.stop -> stopSelf()
         }
         return super.onStartCommand(intent, flags, startId)
     }
@@ -135,9 +130,6 @@ class ExportBookService : BaseService() {
         super.onDestroy()
         exportProgress.clear()
         exportMsg.clear()
-        waitExportBooks.keys.forEach {
-            postEvent(EventBus.EXPORT_BOOK, it)
-        }
     }
 
     @SuppressLint("MissingPermission")
@@ -176,7 +168,7 @@ class ExportBookService : BaseService() {
             return
         }
         exportJob = lifecycleScope.launch(IO) {
-            while (isActive) {
+            while (true) {
                 val (bookUrl, exportConfig) = waitExportBooks.entries.firstOrNull() ?: let {
                     notificationContentText = "导出完成"
                     upExportNotification(true)
@@ -208,7 +200,6 @@ class ExportBookService : BaseService() {
                     }
                     exportMsg[book.bookUrl] = getString(R.string.export_success)
                 } catch (e: Throwable) {
-                    ensureActive()
                     exportMsg[bookUrl] = e.localizedMessage ?: "ERROR"
                     AppLog.put("导出书籍<${book?.name ?: bookUrl}>出错", e)
                 } finally {
@@ -220,7 +211,10 @@ class ExportBookService : BaseService() {
     }
 
     private fun refreshChapterList(book: Book) {
-        if (!book.isLocal || !book.isLocalModified()) {
+        if (!book.isLocal) {
+            return
+        }
+        if (LocalBook.getLastModified(book).getOrDefault(0L) < book.latestChapterTime) {
             return
         }
         kotlin.runCatching {

app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt

@@ -538,7 +538,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
 
     override fun onCleared() {
         super.onCleared()
-        if (BaseReadAloudService.isRun && BaseReadAloudService.pause) {
+        if (BaseReadAloudService.pause) {
             ReadAloud.stop(context)
         }
     }

app/src/main/java/io/legado/app/utils/ContextExtensions.kt

@@ -123,14 +123,6 @@ inline fun <reified T : BroadcastReceiver> Context.broadcastPendingIntent(
     return getBroadcast(this, 0, intent, flags)
 }
 
-fun Context.startForegroundServiceCompat(intent: Intent) {
-    try {
-        startService(intent)
-    } catch (e: IllegalStateException) {
-        ContextCompat.startForegroundService(this, intent)
-    }
-}
-
 val Context.defaultSharedPreferences: SharedPreferences
     get() = PreferenceManager.getDefaultSharedPreferences(this)
 

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

@@ -1147,5 +1147,4 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>

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

@@ -1150,5 +1150,4 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>

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

@@ -1150,5 +1150,4 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>

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

@@ -1146,5 +1146,4 @@ Còn </string>
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>

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

@@ -1147,5 +1147,4 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>

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

@@ -1149,5 +1149,4 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>

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

@@ -1149,5 +1149,4 @@
     <string name="font_weight_text">中/粗/细</string>
     <string name="keep_swipe_tip">继续滑动以加载下一章…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -1150,5 +1150,4 @@
     <string name="font_weight_text">N/B/L</string>
     <string name="keep_swipe_tip">Keep swiping to load the next chapter…</string>
     <string name="enable_optimize_render">启用绘制优化</string>
-    <string name="ignore_battery_permission_rationale">阅读需要请求后台权限以保持服务正常运行</string>
 </resources>