From e2d3164c51b92f5cc4f0d9fdd2486de9ff146c5b Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Wed, 26 May 2021 16:35:43 -0400
Subject: [PATCH] target/compile to sdk 30

---
 app/build.gradle.kts                                      | 2 +-
 app/src/main/AndroidManifest.xml                          | 1 +
 .../kanade/tachiyomi/data/backup/BackupCreateService.kt   | 2 +-
 .../tachiyomi/data/notification/NotificationReceiver.kt   | 8 ++++----
 .../eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt | 4 +++-
 .../eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt     | 2 +-
 buildSrc/src/main/kotlin/Dependencies.kt                  | 4 ++--
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1f4c0c8786..4899e2caee 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -104,7 +104,7 @@ dependencies {
     implementation("androidx.browser:browser:1.3.0")
     implementation("androidx.biometric:biometric:1.1.0")
     implementation("androidx.palette:palette:1.0.0")
-    implementation("androidx.core:core-ktx:1.5.0-rc01")
+    implementation("androidx.core:core-ktx:1.5.0")
 
     implementation("androidx.constraintlayout:constraintlayout:2.0.4")
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4da9bb8c7a..c0790638c8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
 
     <!-- To view extension packages in API 30+ -->
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt
index 6b887a04b6..fb64bce5bf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt
@@ -111,7 +111,7 @@ class BackupCreateService : Service() {
                 else -> LegacyBackupManager(this)
             }
 
-            val backupFileUri = backupManager.createBackup(uri, backupFlags, false)?.toUri()
+            val backupFileUri = backupManager.createBackup(uri!!, backupFlags, false)?.toUri()
             val unifile = UniFile.fromUri(this, backupFileUri)
             notifier.showBackupComplete(unifile, backupType == BackupConst.BACKUP_TYPE_LEGACY)
         } catch (e: Exception) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
index 94cec8b6b6..43b53bd735 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
@@ -62,13 +62,13 @@ class NotificationReceiver : BroadcastReceiver() {
             // Launch share activity and dismiss notification
             ACTION_SHARE_IMAGE -> shareImage(
                 context,
-                intent.getStringExtra(EXTRA_FILE_LOCATION),
+                intent.getStringExtra(EXTRA_FILE_LOCATION)!!,
                 intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
             )
             // Delete image from path and dismiss notification
             ACTION_DELETE_IMAGE -> deleteImage(
                 context,
-                intent.getStringExtra(EXTRA_FILE_LOCATION),
+                intent.getStringExtra(EXTRA_FILE_LOCATION)!!,
                 intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
             )
             // Cancel library update and dismiss notification
@@ -79,7 +79,7 @@ class NotificationReceiver : BroadcastReceiver() {
             ACTION_SHARE_BACKUP ->
                 shareBackup(
                     context,
-                    intent.getParcelableExtra(EXTRA_URI),
+                    intent.getParcelableExtra(EXTRA_URI)!!,
                     intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
                 )
             // Open reader activity
@@ -106,7 +106,7 @@ class NotificationReceiver : BroadcastReceiver() {
             ACTION_SHARE_CRASH_LOG ->
                 shareFile(
                     context,
-                    intent.getParcelableExtra(EXTRA_URI),
+                    intent.getParcelableExtra(EXTRA_URI)!!,
                     "text/plain",
                     intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1)
                 )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt
index 75c636e8b5..9aa1a50b3c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt
@@ -129,7 +129,9 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
                 insets
             }
         } else {
-            binding.webview.restoreState(bundle)
+            bundle?.let {
+                binding.webview.restoreState(it)
+            }
         }
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
index 6f20135216..98db4bcaa2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
@@ -158,6 +158,6 @@ open class WebViewActivity : BaseWebViewActivity() {
     }
 
     private fun openInBrowser() {
-        openInBrowser(binding.webview.url)
+        binding.webview.url?.let { openInBrowser(it) }
     }
 }
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index a637f268b7..01e38ebf76 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -101,9 +101,9 @@ object LegacyPluginClassPath {
 }
 
 object AndroidVersions {
-    const val compileSdk = 29
+    const val compileSdk = 30
     const val minSdk = 23
-    const val targetSdk = 29
+    const val targetSdk = 30
     const val versionCode = 74
     const val versionName = "1.0.17"
     const val ndk = "22.0.7026061"