Merge pull request #13180 from nextcloud/renovate/androidpluginversion

Update dependency com.android.tools.build:gradle to v8.5.0

app/src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt

@@ -227,7 +227,7 @@ class ChooseAccountDialogFragment :
 
         binding.currentAccount.status.let {
             if (newStatus.message.isNullOrBlank()) {
-                it.text = ""
+                it.text = getString(R.string.empty)
                 it.visibility = View.GONE
             } else {
                 it.text = newStatus.message

app/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.kt

@@ -188,7 +188,7 @@ class PassCodeActivity : AppCompatActivity(), Injectable {
                     passCodeDigits?.set(passCodeIndex - 1, "")
                 }
 
-                passCodeEditTexts[passCodeIndex - 1]?.setText("")
+                passCodeEditTexts[passCodeIndex - 1]?.setText(R.string.empty)
 
                 changed = false
             } else if (!changed) {

app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.kt

@@ -92,7 +92,7 @@ class CreateFolderDialogFragment : DialogFragment(), DialogInterface.OnClickList
         val view: View = binding.root
 
         // Setup layout
-        binding.userInput.setText("")
+        binding.userInput.setText(R.string.empty)
         viewThemeUtils?.material?.colorTextInputLayout(binding.userInputContainer)
 
         val parentFolder = requireArguments().getParcelableArgument(ARG_PARENT_FOLDER, OCFile::class.java)

app/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.kt

@@ -112,7 +112,7 @@ class SharePasswordDialogFragment : DialogFragment(), Injectable {
         binding = PasswordDialogBinding.inflate(inflater, null, false)
 
         // Setup layout
-        binding?.sharePassword?.setText("")
+        binding?.sharePassword?.setText(R.string.empty)
         viewThemeUtils?.material?.colorTextInputLayout(binding!!.sharePasswordContainer)
 
         val neutralButtonTextId: Int

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt

@@ -402,7 +402,7 @@ class FileDetailsSharingProcessFragment :
             binding.noteText.setText(share?.note)
         } else {
             binding.shareProcessBtnNext.text = requireContext().resources.getString(R.string.send_share)
-            binding.noteText.setText("")
+            binding.noteText.setText(R.string.empty)
         }
         shareProcessStep = SCREEN_TYPE_NOTE
     }
@@ -447,7 +447,7 @@ class FileDetailsSharingProcessFragment :
     private fun showChangeNameInput(isChecked: Boolean) {
         binding.shareProcessChangeNameContainer.visibility = if (isChecked) View.VISIBLE else View.GONE
         if (!isChecked) {
-            binding.shareProcessChangeName.setText("")
+            binding.shareProcessChangeName.setText(R.string.empty)
         }
     }
 
@@ -474,7 +474,7 @@ class FileDetailsSharingProcessFragment :
         // reset the expiration date if switch is unchecked
         if (!isChecked) {
             chosenExpDateInMills = -1
-            binding.shareProcessSelectExpDate.text = ""
+            binding.shareProcessSelectExpDate.text = getString(R.string.empty)
         }
     }
 
@@ -483,7 +483,7 @@ class FileDetailsSharingProcessFragment :
 
         // reset the password if switch is unchecked
         if (!isChecked) {
-            binding.shareProcessEnterPassword.setText("")
+            binding.shareProcessEnterPassword.setText(R.string.empty)
         }
     }
 

build.gradle

@@ -11,7 +11,7 @@
 buildscript {
     ext {
         androidLibraryVersion ="451cddeba122ff4d17dc8f88feb2fd7589f77567"
-        androidPluginVersion = '8.4.0'
+        androidPluginVersion = '8.5.0'
         androidxMediaVersion = '1.3.1'
         androidxTestVersion = "1.5.0"
         appCompatVersion = '1.7.0'

gradle/verification-keyring.keys

@@ -4457,6 +4457,43 @@ HBhD37R+PsUfSEPep+pmyBlX2nrKxxoRNsl5KWNiQw==
 =Phg6
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    1669C4BB543E0445
+uid    Emily Johnston <epmjohnston@google.com>
+
+sub    5F6BA89D4B0869B9
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQGNBF3TQCcBDAD177B+Btl8XBEkBQ5jFSezFrpEl4arwCEa7htCp6T3h55HvYwz
+P7Y9zWYXfhAC8XJlPQJYpqaQiiYtdlmOrOS4wbp5Lr+z/0XpFlJFzdKglxKYcdfP
+ntnGyoj7Dz03v+SitL9Ct1YZmOGz6onlifXsCTkWraSJTqR6/y2dL0Beu7dLZp94
+fgf+FAfr77bwGhUhOh0pPI6ZK2VwNMiQN92jS/RYb6i7QjzO654ALTBR6R2sqx26
+C0NNsTUZ1WawPreT/rmR4vux1pvgbC8DcXqdptVb+iQPymnysEr69J0f7YC579+7
+itFIh6efV75W9nDqp9QB/1G808oYx1rglUstOCI0axSgSNyazbInW9qOI58rLQ4v
+wnCSTWvesVNq+uO6aVrfpXIO3uUTI3t4mpBZgVYZ+g30BlCPRx52YofvQzYbbk9d
+wCMUDQAzKGJi+mazkgBhcz+neEuNUlR/0fBMObzb7cAT4gGo/sSzYVNN5oT3u/Mi
+J4hfzYUTFMsJBp0AEQEAAbQnRW1pbHkgSm9obnN0b24gPGVwbWpvaG5zdG9uQGdv
+b2dsZS5jb20+uQGNBF3TQCcBDADJ17PQ4z5UVGBVUefEkTXeVlGX4oc+vUOVn8Z9
+B34sQkFmgsORuwm+/1rGthrMatro1Jka4UXSxYFMCt6XBz4/OdJbquxs6D85iuda
+Id9aozCOJypkfprp+ez2PK7pWeOq6DQ/lqqNGyoHxA703wshI38sNcKRcypn/vf1
+VJlO3ZjfLCVDQw4+yNrdWiwklb4QS0xwjK9Bw9m8g6HiQGil8V/kL9Avpa76rGqa
+P9YnkTo7NQG0cwEbpcxNUrkO7fFKjTOMTmfPkh5pHAHVS+FsrCsxhRs6Eb6u/qes
+tHjpYj6qtMJ5V7oXeUI3OZ9nAPctSxoNVn6f0otsaatoBwcJNNhO/6ZIFH7NlgYQ
+NN3a5Pz6NrU13+zMGbsxYzlL4/nVwhdn/kHPQ2tl4e2R79da7ModAjeafimikA3n
+GZj1Zvo1iXKLfguM+U90kTrPKSxcJqwgV4QvrO9Z9llRTzhdBmrFePFhlxN3JdpS
+KYXFInq6JwncmOAeIDhNYYcVXhcAEQEAAYkBvAQYAQoAJhYhBHYVrVYUTfI3b0nZ
+ixZpxLtUPgRFBQJd00AnAhsMBQkDwmcAAAoJEBZpxLtUPgRF32gMAJoI+6dvnT7G
+OJB4S0HAB2qhizmQ5MWiO7QE1HKQ6ShylihJfAIMnAMlLPhorr1ITZXaNMFO+rWN
+O76BdsBxAkd0rKIIjMTU5r1HuS+XCGFzitffkJ2TgQ2K4vKnSgEpCsBilgCJzdJe
+vrYoCAudkZAaeBcT0fsTtQDnWHUJSkyWro0ovaaPF5tJzMkFZQBlaNyb+DmWPyNt
+5TP6iORnmeLNE0OajrUawFUcLUITdutn2t/PRE9LBDSlewE9Gabv79z8ZGAw7jPK
+x/p+ePpIj6J05TM0BR9KLrk3avMIK+eKwcvm+nCyYA1jKr7c9E4bg+6sRbc6igvV
+L4QeKzjeGll3vjifmghVXVKVBOW1fk10cMNKaTEkGng8OfLhJDQDXuNz4m8/pMA/
+wyGfH3HBGSx+F3GZUb00kU0HbxV2Vt0QlyjwT9vJfVGQ4Y+GhnMF6qErtdX8cBIW
+FJXLEW77wWHN+QpRD6BShYZDvUA2mtO0zlB8reU+VCxgnFfm66DkUg==
+=jYDe
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    16F71868F1D3A389
 uid    Lukhnos Liu <lukhnos@lukhnos.org>
 

gradle/verification-metadata.xml

@@ -8,9 +8,6 @@
          <trust group="com.fasterxml.jackson" name="jackson-base" version="2.14.2" reason="no keys available, no pom artifact to create a checksum"/>
          <trust file=".*-sources[.]jar" regex="true"/>
       </trusted-artifacts>
-      <ignored-keys>
-         <ignored-key id="1669C4BB543E0445" reason="Key couldn't be downloaded from any key server"/>
-      </ignored-keys>
       <trusted-keys>
          <trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah" name="JavaEWAH" version="1.2.3"/>
          <trusted-key id="042B29E928995B9DB963C636C7CA19B7B620D787" group="com.github.stephenc.jcip" name="jcip-annotations" version="1.0-1"/>
@@ -81,7 +78,10 @@
          <trusted-key id="2E52CCA3842FA13C188F1DB50B45DDD344B5FFD1" group="tools.fastlane" name="screengrab" version="2.1.1"/>
          <trusted-key id="2E8191ADD82E5C6ABD8E24D802499A5DAEC7ADA9" group="^com[.]twelvemonkeys($|([.].*))" regex="true"/>
          <trusted-key id="2E92113263FC31C74CCBAAB20E91C2DE43B72BB1" group="org.ec4j.core"/>
-         <trusted-key id="3051D45031E13516A6E8FAFF280D66A55F5316C5" group="org.bitbucket.b_c" name="jose4j" version="0.7.0"/>
+         <trusted-key id="3051D45031E13516A6E8FAFF280D66A55F5316C5">
+            <trusting group="org.bitbucket.b_c" name="jose4j" version="0.7.0"/>
+            <trusting group="org.bitbucket.b_c" name="jose4j" version="0.9.5"/>
+         </trusted-key>
          <trusted-key id="31BAE2E51D95E0F8AD9B7BCC40A3C4432BD7308C" group="com.googlecode.juniversalchardet" name="juniversalchardet" version="1.0.3"/>
          <trusted-key id="3241A3ABA33FF6F69B75E2DDEC9458EED5C5AB12" group="id.zelory" name="compressor" version="3.0.1"/>
          <trusted-key id="324E460B9DB8F4515F3EAED9930C5B1EA41B1AA1" group="com.beust" name="jcommander" version="1.48"/>
@@ -241,11 +241,13 @@
             <trusting group="androidx.annotation"/>
             <trusting group="androidx.appcompat"/>
             <trusting group="androidx.core"/>
+            <trusting group="androidx.databinding"/>
             <trusting group="androidx.fragment"/>
             <trusting group="androidx.lifecycle"/>
             <trusting group="androidx.transition" name="transition" version="1.5.0"/>
             <trusting group="androidx.webkit" name="webkit" version="1.11.0"/>
             <trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
+            <trusting group="^com[.]android($|([.].*))" regex="true"/>
          </trusted-key>
          <trusted-key id="A6D6C97108B8585F91B158748671A8DF71296252" group="^com[.]squareup($|([.].*))" regex="true"/>
          <trusted-key id="A7892505CF1A58076453E52D7999BEFBA1039E8B" group="net.bytebuddy"/>
@@ -3941,6 +3943,14 @@
             <sha256 value="745894f1d15599871b1c3a6cc09f0da03268f1373ce937ce35942b933d6518e6" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="bundletool" version="1.16.0">
+         <artifact name="bundletool-1.16.0.jar">
+            <sha256 value="1ea2bf5274bbac7a3bb5618521d2fa11fb04e900e33a8a646029ec6332fc08c8" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="bundletool-1.16.0.pom">
+            <sha256 value="f2e8aad4455a42372462d5e18a26973d67571179a6757f3825f227e91af2f2db" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="gradle" version="8.2.2">
          <artifact name="gradle-8.2.2.jar">
             <sha256 value="ca50f47cd13d347de7c89ecb2bd06487b03a88687c46c2b776bc0a9323958955" origin="Generated by Gradle" reason="Artifact is not signed"/>