Bump dependencies for Kotlin 1.5.30 (#1497)

5 files changed, 13 insertions, 17 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
index 650c65de..10298dca 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
@@ -81,15 +81,13 @@ class DecryptActivity : BasePgpActivity(), OpenPgpServiceConnection.OnBound {
     }
   }
 
-  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
     menuInflater.inflate(R.menu.pgp_handler, menu)
     passwordEntry?.let { entry ->
-      if (menu != null) {
-        menu.findItem(R.id.edit_password).isVisible = true
-        if (!entry.password.isNullOrBlank()) {
-          menu.findItem(R.id.share_password_as_plaintext).isVisible = true
-          menu.findItem(R.id.copy_password).isVisible = true
-        }
+      menu.findItem(R.id.edit_password).isVisible = true
+      if (!entry.password.isNullOrBlank()) {
+        menu.findItem(R.id.share_password_as_plaintext).isVisible = true
+        menu.findItem(R.id.copy_password).isVisible = true
       }
     }
     return true
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpDecryptActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpDecryptActivity.kt
index b2e710f8..159354d2 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpDecryptActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpDecryptActivity.kt
@@ -56,15 +56,13 @@ class GopenpgpDecryptActivity : BasePgpActivity() {
     decrypt()
   }
 
-  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
     menuInflater.inflate(R.menu.pgp_handler, menu)
     passwordEntry?.let { entry ->
-      if (menu != null) {
-        menu.findItem(R.id.edit_password).isVisible = true
-        if (!entry.password.isNullOrBlank()) {
-          menu.findItem(R.id.share_password_as_plaintext).isVisible = true
-          menu.findItem(R.id.copy_password).isVisible = true
-        }
+      menu.findItem(R.id.edit_password).isVisible = true
+      if (!entry.password.isNullOrBlank()) {
+        menu.findItem(R.id.share_password_as_plaintext).isVisible = true
+        menu.findItem(R.id.copy_password).isVisible = true
       }
     }
     return true
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpPasswordCreationActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpPasswordCreationActivity.kt
index 2228a758..bbce67f3 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpPasswordCreationActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpPasswordCreationActivity.kt
@@ -207,7 +207,7 @@ class GopenpgpPasswordCreationActivity : BasePgpActivity() {
     updateViewState()
   }
 
-  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
     menuInflater.inflate(R.menu.pgp_handler_new_password, menu)
     return true
   }
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
index 91e375aa..cf34ac36 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
@@ -278,7 +278,7 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB
     updateViewState()
   }
 
-  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
     menuInflater.inflate(R.menu.pgp_handler_new_password, menu)
     return true
   }
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
index a009b701..cd720d3c 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
@@ -241,7 +241,7 @@ class PasswordStore : BaseGitActivity() {
     }
   }
 
-  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
     val menuRes =
       when {
         gitSettings.authMode == AuthMode.None -> R.menu.main_menu_no_auth