From 4ff9f758f82a45a184bbbd81ce5843f465b922a1 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Thu, 7 Dec 2023 16:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                   | 4 ++--
 app/src/main/AndroidManifest.xml                   | 5 ++++-
 app/src/main/java/io/legado/app/App.kt             | 2 +-
 app/src/main/java/io/legado/app/help/IntentHelp.kt | 1 +
 build.gradle                                       | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c62252e1b..a04d407d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@ android {
     defaultConfig {
         applicationId "io.legado.app"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 10000 + gitCommits
         versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -200,7 +200,7 @@ dependencies {
     androidTestImplementation("androidx.room:room-testing:$room_version")
 
     //liveEventBus
-    implementation('io.github.jeremyliao:live-event-bus-x:1.8.0')
+    implementation('com.github.michaellee123:LiveEventBus:1.8.14')
 
     //规则相关
     implementation('org.jsoup:jsoup:1.16.2')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bac88833a..8f836071a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,6 +17,8 @@
         tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <application
         android:name=".App"
@@ -422,12 +424,13 @@
             android:foregroundServiceType="dataSync" />
         <service
             android:name=".service.WebService"
-            android:foregroundServiceType="connectedDevice" />
+            android:foregroundServiceType="dataSync" />
         <service
             android:name=".service.WebTileService"
             android:exported="true"
             android:icon="@drawable/ic_web_service_noti"
             android:label="legado Web Service"
+            android:foregroundServiceType="dataSync"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
diff --git a/app/src/main/java/io/legado/app/App.kt b/app/src/main/java/io/legado/app/App.kt
index 245a57904..1da6a4774 100644
--- a/app/src/main/java/io/legado/app/App.kt
+++ b/app/src/main/java/io/legado/app/App.kt
@@ -50,10 +50,10 @@ class App : Application() {
         //预下载Cronet so
         Cronet.preDownload()
         createNotificationChannels()
-        applyDayNight(this)
         LiveEventBus.config()
             .lifecycleObserverAlwaysActive(true)
             .autoClear(false)
+        applyDayNight(this)
         registerActivityLifecycleCallbacks(LifecycleHelp)
         defaultSharedPreferences.registerOnSharedPreferenceChangeListener(AppConfig)
         DefaultData.upVersion()
diff --git a/app/src/main/java/io/legado/app/help/IntentHelp.kt b/app/src/main/java/io/legado/app/help/IntentHelp.kt
index 5885e46c6..6ba7b347d 100644
--- a/app/src/main/java/io/legado/app/help/IntentHelp.kt
+++ b/app/src/main/java/io/legado/app/help/IntentHelp.kt
@@ -16,6 +16,7 @@ object IntentHelp {
 
     fun getBrowserIntent(uri: Uri): Intent {
         val intent = Intent(Intent.ACTION_VIEW)
+        intent.`package` = appCtx.packageName
         intent.data = uri
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         if (intent.resolveActivity(appCtx.packageManager) == null) {
diff --git a/build.gradle b/build.gradle
index 8077e0d6f..4d81a47ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         build_tool_version = '34.0.0'
         kotlin_version = '1.9.20'
         ksp_version = "1.0.13"
-        agp_version = '8.1.4'
+        agp_version = '8.2.0'
         media3_version = "1.2.0"
         splitties_version = '3.0.0'
         room_version = '2.6.1'