solve git conflict

Signed-off-by: alperozturk <[email protected]>
nextcloud · Feb 21, 2025 · 25233ac · 25233ac
1 parent 4946266
commit 25233ac
Showing 1 changed file with 88 additions and 0 deletions.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -111,6 +111,7 @@
             <trusting group="androidx.room"/>
             <trusting group="androidx.sqlite"/>
             <trusting group="androidx.tracing" name="tracing" version="1.2.0"/>
+            <trusting group="androidx.tracing" name="tracing-ktx" version="1.2.0"/>
             <trusting group="androidx.webkit"/>
             <trusting group="androidx.work"/>
          </trusted-key>
@@ -140,10 +141,12 @@
             <trusting group="androidx.fragment"/>
             <trusting group="androidx.graphics"/>
             <trusting group="androidx.lifecycle"/>
+            <trusting group="androidx.recyclerview"/>
             <trusting group="androidx.test"/>
             <trusting group="androidx.test.espresso" name="espresso-idling-resource" version="3.6.1"/>
             <trusting group="androidx.transition" name="transition" version="1.5.0"/>
             <trusting group="androidx.webkit" name="webkit" version="1.11.0"/>
+            <trusting group="androidx.work"/>
             <trusting group="androidx.work" name="work-runtime" version="2.9.1"/>
             <trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
             <trusting group="^com[.]android($|([.].*))" regex="true"/>
@@ -1533,6 +1536,11 @@
             <sha256 value="179fc4d2d022c0a8247e7612feab40b951bd8710f6b452e3ed6dc03a1e52769d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.recyclerview" name="recyclerview" version="1.4.0">
+         <artifact name="recyclerview-1.4.0.aar">
+            <sha256 value="0f32ccaffcda74c3f87f0b4cfe6ae78e8aa4eb3ad7dda4f2edf06eedc947a5cf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.recyclerview" name="recyclerview-selection" version="1.1.0">
          <artifact name="recyclerview-selection-1.1.0.aar">
             <sha256 value="9e2ba1c7d6b0eb5e64c10b1b0eb01b51e8511cee002c9bd56ce9cc138ebc4898" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5044,6 +5052,14 @@
             <sha256 value="218e72c721f79c57ce3bb77f5a2baa35e714175f1f6cc809dcafd65c5fecdf95" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-common" version="0.24.0">
+         <artifact name="android-common-0.24.0.jar">
+            <sha256 value="68f3bc612c5f802e216c92450b667bc93cba91c8bfb754c2b9420ce802bf46b6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-common-0.24.0.pom">
+            <sha256 value="a7f8261ce3bc9e7196280c135b993666ae2682c26d1a7cb613b9ac7e15eeddea" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud.android-common" name="core" version="0.14.0">
          <artifact name="core-0.14.0.aar">
             <sha256 value="d370010eeae5928f525f31c09e33f9c78ed5e610af4b9f84b1ba68ce0727267b" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5372,6 +5388,14 @@
             <sha256 value="971a297faf2daee03b71226d28fd6ca4a0c7ee422d31ec1ab3e746b1514352d5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann" name="android-commons" version="1.0.4">
+         <artifact name="android-commons-1.0.4.jar">
+            <sha256 value="560504b80c5c9b49cd730a49484bfcb126daf349b96f27d56e39bcefd01e9f60" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-commons-1.0.4.pom">
+            <sha256 value="fb46388c6c881bc1b232af12478143a66a597f53344de51aece48ab9f2cc6b38" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.android-commons" name="reactive-livedata" version="1.0.0">
          <artifact name="reactive-livedata-1.0.0.aar">
             <sha256 value="1066af08f3b5012b5e536e18ad4d28bf2241b4918485072bfdac0ff15696a4f2" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5388,6 +5412,14 @@
             <sha256 value="e6e8113634c5b57f39af97a33dfdad1831620b39691555f75b623636772e2fae" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.android-commons" name="reactive-livedata" version="1.0.4">
+         <artifact name="reactive-livedata-1.0.4.aar">
+            <sha256 value="a4142db1329b151611a947e8eeccc22a0736b1e02fa9e1b670865f21b26ded16" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="reactive-livedata-1.0.4.module">
+            <sha256 value="80ef426583b1c39abc4c772994d4d6250caaf5c61512165397ec0db7f9d95e28" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.android-commons" name="shared-preferences" version="1.0.0">
          <artifact name="shared-preferences-1.0.0.aar">
             <sha256 value="d93ca7a27ec93daf5bad558f25bb834fb802b6efcf8045c8e2d62d63511cb972" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5404,6 +5436,14 @@
             <sha256 value="5dab2c5bd96fd744c4fa37e7f744cb71eb6e596123a115f96efdb51fe71614f5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.android-commons" name="shared-preferences" version="1.0.4">
+         <artifact name="shared-preferences-1.0.4.aar">
+            <sha256 value="2c6f484a5e464c001dce6340ef7a73f88c298220773898aaf2b32e01530cbb03" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="shared-preferences-1.0.4.module">
+            <sha256 value="995bc95943b40db2b06cbcc6ed2491eedaa622038b8b72ffb51ff7e97fd46174" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.android-commons" name="util" version="1.0.0">
          <artifact name="util-1.0.0.aar">
             <sha256 value="01b6bd92d9be41b638344651d43ebe48e855aca8a3d83f00e73ecda3dcea65d4" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5420,6 +5460,14 @@
             <sha256 value="5a101de3906d3b21a8cb451460ee46ccb7d58c9183a5efd01e3b5a995844cf7f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.android-commons" name="util" version="1.0.4">
+         <artifact name="util-1.0.4.aar">
+            <sha256 value="2c42fae1eb2cbd8cc234a4daef0d7cf987cab3b4326c767bb5aa731bb985d049" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="util-1.0.4.module">
+            <sha256 value="c4fbe8d79d62c853e09aaaf7243df084ab002621e3ec03f2cf1038331c2c10a6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.nextcloud-commons" name="exception" version="2.0.1">
          <artifact name="exception-2.0.1.aar">
             <sha256 value="819c72bf825e650fbd39abc959f43a8a2809f0c45d9dce717ebbfc727e79f9f8" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5460,6 +5508,14 @@
             <sha256 value="ef19f3f37d22830af70692ada524c3feba3a52f8e30104009c3d6043aa8b7486" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="exception" version="2.3.5">
+         <artifact name="exception-2.3.5.aar">
+            <sha256 value="4aa0a60b8b468a123fbdf83d1576183b6efb2f55a18ee677c977a1463657b200" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="exception-2.3.5.module">
+            <sha256 value="6609d30a2df3cbc03aa62f42116c69566e72b67440c93f67972d8a7d1284b1eb" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.nextcloud-commons" name="markdown" version="2.1.0">
          <artifact name="markdown-2.1.0.aar">
             <sha256 value="588884e84e263e5a50b77cbb58eb06c2a48b73251195834b30659dfd18306153" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5492,6 +5548,14 @@
             <sha256 value="3de94ef528804ff9ee3e0d527596315a47f2e93e02d2b29c3badb3d865846d0f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="markdown" version="2.3.5">
+         <artifact name="markdown-2.3.5.aar">
+            <sha256 value="63459d23f17a2b3bec87d867c0e32fef2a090e79424962e0477bb8a0e4fc42e1" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="markdown-2.3.5.module">
+            <sha256 value="e589a3f9de77dd6fffd740daf71530817ec267d2b877352f09ed381847f682f9" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.nextcloud-commons" name="ocs" version="2.1.0">
          <artifact name="ocs-2.1.0.aar">
             <sha256 value="31f33b84bf0cbd1607dcbeffcd9ef52297e2d5c5a090e4e0992de16dc70f1589" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5524,6 +5588,14 @@
             <sha256 value="90f2dfa445d9a793c746dab3d3d9ea05b70832297f98e7bd17109336b8dd6b84" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="ocs" version="2.3.5">
+         <artifact name="ocs-2.3.5.aar">
+            <sha256 value="68d05984ed73143cbe61296236d5d8c91cfaae25a631e38b0969c1061e12e09d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="ocs-2.3.5.module">
+            <sha256 value="27a6fbdf3c95161caa57ea4128e0e3783df56ba13cf7c2a92df577a4541394d8" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-glide" version="2.1.0">
          <artifact name="sso-glide-2.1.0.aar">
             <sha256 value="8fb3d57f5878ae3ae3124dc541e717ba205830999c87bdc9a8ffd56df2152fba" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5556,6 +5628,14 @@
             <sha256 value="69cbaee6b8b86213990b52234efc98b48d57e6eb9f3b9c6710b7d6c22d17f939" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-glide" version="2.3.5">
+         <artifact name="sso-glide-2.3.5.aar">
+            <sha256 value="9662cd59068875eda5c6ee390b877c9e08fe633f7872bd0572536f67bae39703" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="sso-glide-2.3.5.module">
+            <sha256 value="f916fb15c51e673708691c8c517385a00a8b1d0abbd9021032faa3ac99872337" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-url-helper" version="2.1.0">
          <artifact name="sso-url-helper-2.1.0.aar">
             <sha256 value="6309e518b9637af17748b03d42f0306780bcd0c09d3ed338341b5a502d19292a" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -5588,6 +5668,14 @@
             <sha256 value="d7bc31e4e433640ef3596c36c1fd00fa9d2d5bca0a7602582f883c30cdecee20" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-url-helper" version="2.3.5">
+         <artifact name="sso-url-helper-2.3.5.aar">
+            <sha256 value="4773790b99f88bc99984fc59a76a919493f972b11d46b8ddc0769558d74aead2" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="sso-url-helper-2.3.5.module">
+            <sha256 value="a6c157f21b3ea72db370940043cc7f1281ec49121e44c69c3a5a70c3aded6933" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.google.android" name="annotations" version="4.1.1.4">
          <artifact name="annotations-4.1.1.4.jar">
             <sha256 value="ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15" origin="Generated by Gradle"/>