Merge remote-tracking branch 'origin/master' into dev

.github/workflows/autoApproveDependabot.yml

@@ -25,6 +25,6 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: hmarr/auto-approve-action@44888193675f29a83e04faf4002fa8c0b537b1e4 # v3.2.1
+      - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/autoApproveSync.yml

@@ -24,6 +24,6 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ contains(github.event.pull_request.labels.*.name, 'sync') && github.actor == 'nextcloud-android-bot' }}
     steps:
-      - uses: hmarr/auto-approve-action@44888193675f29a83e04faf4002fa8c0b537b1e4 # v3.2.1
+      - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/codeql.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK 17
@@ -46,4 +46,4 @@ jobs:
           echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
           ./gradlew assembleDebug
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0

.github/workflows/scorecard.yml

@@ -37,6 +37,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
         with:
           sarif_file: results.sarif

app/build.gradle

@@ -19,7 +19,7 @@ buildscript {
 
 plugins {
     id "com.diffplug.spotless" version "6.20.0"
-    id 'com.google.devtools.ksp' version '1.8.22-1.0.11' apply false
+    id 'com.google.devtools.ksp' version '1.9.22-1.0.17' apply false
 }
 
 apply plugin: 'com.android.application'
@@ -255,16 +255,16 @@ dependencies {
     implementation 'com.google.android.material:material:1.11.0'
     implementation 'com.jakewharton:disklrucache:2.0.2'
     implementation "androidx.appcompat:appcompat:$appCompatVersion"
-    implementation 'androidx.webkit:webkit:1.7.0'
+    implementation 'androidx.webkit:webkit:1.10.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.7'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
     implementation "androidx.work:work-runtime:$workRuntime"
     implementation "androidx.work:work-runtime-ktx:$workRuntime"
-    implementation "androidx.fragment:fragment-ktx:1.6.1"
+    implementation "androidx.fragment:fragment-ktx:1.6.2"
     implementation 'com.github.albfernandez:juniversalchardet:2.0.3' // need this version for Android <7
     compileOnly 'com.google.code.findbugs:annotations:3.0.1u2'
-    implementation 'commons-io:commons-io:2.13.0'
+    implementation 'commons-io:commons-io:2.15.1'
     implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.12.0'
     implementation 'org.lukhnos:nnio:0.3'
@@ -280,7 +280,7 @@ dependencies {
     }
     implementation 'com.caverock:androidsvg:1.4'
     implementation 'androidx.annotation:annotation:1.7.1'
-    implementation 'com.vanniktech:emoji-google:0.17.0'
+    implementation 'com.vanniktech:emoji-google:0.18.0'
 
     implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$fidoVersion"
     implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido2:$fidoVersion"
@@ -351,7 +351,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation "androidx.test:rules:$androidxTestVersion"
     // Android JUnit Runner
-    androidTestImplementation "androidx.test:runner:$androidxTestVersion"
+    androidTestImplementation "androidx.test:runner:1.5.2"
     androidTestUtil "androidx.test:orchestrator:1.4.2"
     androidTestImplementation "androidx.test:core-ktx:$androidxTestVersion"
 
@@ -390,7 +390,7 @@ dependencies {
     ksp "androidx.room:room-compiler:$roomVersion"
     androidTestImplementation "androidx.room:room-testing:$roomVersion"
 
-    implementation "io.coil-kt:coil:2.4.0"
+    implementation "io.coil-kt:coil:2.5.0"
 
     // splash screen dependency ref: https://developer.android.com/develop/ui/views/launch/splash-screen/migrate
     implementation 'androidx.core:core-splashscreen:1.0.1'
@@ -399,7 +399,7 @@ dependencies {
 configurations.configureEach {
     resolutionStrategy {
         cacheChangingModulesFor 0, 'seconds'
-        force 'org.objenesis:objenesis:2.6'
+        force 'org.objenesis:objenesis:3.3'
         eachDependency { details ->
             if ('org.jacoco' == details.requested.group) {
                 details.useVersion "$jacoco_version"

app/src/main/res/values-nb-rNO/strings.xml

@@ -934,6 +934,7 @@
     <string name="uploads_view_upload_status_fetching_server_version">Henter serverversjon...</string>
     <string name="uploads_view_upload_status_service_interrupted">Appen ble avsluttet</string>
     <string name="uploads_view_upload_status_succeeded">Ferdig</string>
+    <string name="uploads_view_upload_status_succeeded_same_file">Samme fil funnet på ekstern, dropper opplasting</string>
     <string name="uploads_view_upload_status_unknown_fail">Ukjent feil</string>
     <string name="uploads_view_upload_status_virus_detected">Virus oppdaget. Opplasting kan ikke fullføres.</string>
     <string name="uploads_view_upload_status_waiting_exit_power_save_mode">Venter på å gå ut av strømsparingsmodus</string>

build.gradle

@@ -3,12 +3,12 @@ buildscript {
         androidPluginVersion = '8.2.2'
         appCompatVersion = '1.6.1'
         jacoco_version = '0.8.11'
-        kotlin_version = '1.8.22'
+        kotlin_version = '1.9.22'
         androidxTestVersion = "1.5.0"
         daggerVersion = "2.50"
         markwonVersion = "4.6.2"
         prismVersion = "2.0.0"
-        androidLibraryVersion ="9bfb85025719c4d3a5734c13eaa5fa02a958a05c"
+        androidLibraryVersion = "9bfb850257"
         mockitoVersion = "4.11.0"
         mockitoKotlinVersion = "4.1.0"
         mockkVersion = "1.13.9"
@@ -18,7 +18,7 @@ buildscript {
         checkerVersion = "3.21.2"
         exoplayerVersion = "2.19.1"
         documentScannerVersion = "1.1.1"
-        roomVersion = "2.5.2"
+        roomVersion = "2.6.1"
 
         ciBuild = System.getenv("CI") == "true"
     }

gradle/verification-metadata.xml

@@ -8,10 +8,8 @@
          <trust group="com.fasterxml.jackson" name="jackson-base" version="2.14.2" reason="no keys available, no pom artifact to create a checksum"/>
       </trusted-artifacts>
       <ignored-keys>
-         <ignored-key id="3D12CA2AC19F3181" reason="Key couldn't be downloaded from any key server"/>
-         <ignored-key id="991EFB94DB91127D" reason="Key couldn't be downloaded from any key server"/>
-         <ignored-key id="F13D3E721D56BD54" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="4F91D100EB1F597B" reason="Key couldn't be downloaded from any key server"/>
+         <ignored-key id="59E05CE618187ED4" 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"/>
@@ -59,7 +57,10 @@
          <trusted-key id="26CCB560222376C280C15DAC453A03A250A2F726" group="com.github.fondesa" name="kpermissions" version="3.3.0"/>
          <trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181" group="^com[.]fasterxml($|([.].*))" regex="true"/>
          <trusted-key id="2B34821418CF19CF1F2A8352953E02E4F573B46F" group="jakarta.platform"/>
-         <trusted-key id="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD" group="org.sonatype.oss"/>
+         <trusted-key id="2BCBDD0F23EA1CAFCC11D4860374CF2E8DD1BDFD">
+            <trusting group="net.java" name="jvnet-parent" version="1"/>
+            <trusting group="org.sonatype.oss"/>
+         </trusted-key>
          <trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB">
             <trusting group="commons-codec"/>
             <trusting group="commons-io"/>
@@ -153,7 +154,14 @@
          <trusted-key id="8461EFA0E74ABAE010DE66994EB27DB2A3B88B8B">
             <trusting group="androidx.activity"/>
             <trusting group="androidx.annotation"/>
+            <trusting group="androidx.collection"/>
             <trusting group="androidx.core"/>
+            <trusting group="androidx.fragment"/>
+            <trusting group="androidx.lifecycle"/>
+            <trusting group="androidx.room"/>
+            <trusting group="androidx.sqlite"/>
+            <trusting group="androidx.webkit" name="webkit" version="1.10.0"/>
+            <trusting group="androidx.recyclerview" name="recyclerview" version="1.3.2"/>
          </trusted-key>
          <trusted-key id="84789D24DF77A32433CE1F079EB80E92EB2135B1" group="org.apache" name="apache"/>
          <trusted-key id="8569C95CADC508B09FE90F3002216ED811210DAA" group="io.github.detekt.sarif4k"/>
@@ -250,7 +258,10 @@
          <trusted-key id="EBB241A545CB17C87FACB2EBD0BF1D737C9A1C22" group="net.sourceforge.pmd"/>
          <trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320" group="com.google.errorprone"/>
          <trusted-key id="F1A51E051F527E0C8E24D54D4B1E11D5A4B91E89" group="com.google.protobuf"/>
-         <trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146" group="org.codehaus.mojo"/>
+         <trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146">
+            <trusting group="org.apache" name="apache" version="13"/>
+            <trusting group="org.codehaus.mojo"/>
+         </trusted-key>
          <trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9" group="org.jsoup" name="jsoup" version="1.15.3"/>
          <trusted-key id="F3BD845679DD6A30F3F50F91597852B0B140F0BC" group="com.caverock" name="androidsvg" version="1.4"/>
          <trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A" group="org.apache" name="apache"/>
@@ -410,6 +421,11 @@
             <sha256 value="0361d1526a4d7501255e19779e09e93cdbd07fee0e2f5c50b7a137432d510119" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.annotation" name="annotation-experimental" version="1.1.0-rc01">
+         <artifact name="annotation-experimental-1.1.0-rc01.module">
+            <sha256 value="d45ac493e84d968aabb2bea2b7744031a98cf5074447c0f3b862d600fc44b55c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="androidx.annotation" name="annotation-experimental" version="1.3.0">
          <artifact name="annotation-experimental-1.3.0.aar">
             <sha256 value="abfd29c8556e5bd0325a9f769ab9e9d154ff4a5515c476cdd5a2a8285b1b19dc" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1086,6 +1102,11 @@
             <sha256 value="6d7b619cb122a4a8a20920871db6a886f38843f69d2eaa9521271c2c08b636a0" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.fragment" name="fragment" version="1.6.2">
+         <artifact name="fragment-1.6.2.aar">
+            <sha256 value="df7ba73f377dbd7ccd28b112afd08d28b60ec2c6bc91ec658609c845442ace08" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.fragment" name="fragment-ktx" version="1.3.2">
          <artifact name="fragment-ktx-1.3.2.aar">
             <sha256 value="29af1e9ee0e93b5fc638600c230705584aecc49205c363f0923ba1e5be675533" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1221,12 +1242,17 @@
       </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.6.1">
          <artifact name="lifecycle-livedata-2.6.1.aar">
-            <sha256 value="67359f609dfc2bf65da1270b23033f856064ec279f058e0a70c715f7c9003031" origin="Generated by Gradle"/>
+            <sha256 value="67359f609dfc2bf65da1270b23033f856064ec279f058e0a70c715f7c9003031" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
          <artifact name="lifecycle-livedata-2.6.1.module">
             <sha256 value="e2659e87e890b52b66f300471828b387a205e5387a392713190166f399ecf641" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.7.0">
+         <artifact name="lifecycle-livedata-2.7.0.aar">
+            <sha256 value="9affa24c6160dc8cadaac9422d4f714e5009537d0243afc4bc74b5b7cf0de4ad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.0.0">
          <artifact name="lifecycle-livedata-core-2.0.0.aar">
             <sha256 value="fde334ec7e22744c0f5bfe7caf1a84c9d717327044400577bdf9bd921ec4f7bc" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1398,12 +1424,17 @@
       </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.6.1">
          <artifact name="lifecycle-viewmodel-2.6.1.aar">
-            <sha256 value="e4ff4338999e1c6c9c724719f5d4aa7dd61bf6f545d5256a27a9d375df9f2330" origin="Generated by Gradle"/>
+            <sha256 value="e4ff4338999e1c6c9c724719f5d4aa7dd61bf6f545d5256a27a9d375df9f2330" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
          <artifact name="lifecycle-viewmodel-2.6.1.module">
             <sha256 value="2b406faea5c12f2b8df4b7a60931f846648f2e1f4d78361e198d1184f19a4797" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.7.0">
+         <artifact name="lifecycle-viewmodel-2.7.0.aar">
+            <sha256 value="4e1d92e289920cd7b50e3671b9191bd413407349cda6f602b0285464f41c1c82" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.3.1">
          <artifact name="lifecycle-viewmodel-ktx-2.3.1.aar">
             <sha256 value="5fb3591b6a54eeb3e204be0125d48eb987b8ea45a5048140036865482ccf9de9" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1685,7 +1716,7 @@
       </component>
       <component group="androidx.recyclerview" name="recyclerview" version="1.3.0">
          <artifact name="recyclerview-1.3.0.aar">
-            <sha256 value="d65928a00f63589a49e21925412e0f48852f89254b07b03c030d560f91effc88" origin="Generated by Gradle"/>
+            <sha256 value="d65928a00f63589a49e21925412e0f48852f89254b07b03c030d560f91effc88" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
          <artifact name="recyclerview-1.3.0.module">
             <sha256 value="7fa22bf1ab1a8d1544622076e2ad8454e2bef1402b3298b5b4079ab732e38845" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -2174,6 +2205,14 @@
             <sha256 value="4063bca7fe94fe65c98f4168f97ae10e02da0248598ad3ac21c432c7f608a17a" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.viewpager2" name="viewpager2" version="1.1.0-beta02">
+         <artifact name="viewpager2-1.1.0-beta02.aar">
+            <sha256 value="bafac3ca991ed68a2c7ca6ff352966d200b12e66a342d10f497cb8168f59054a" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="viewpager2-1.1.0-beta02.module">
+            <sha256 value="1dd2ebd9c18d7299ac9c8d331ae39f2a38fa0c9ed32d6606e041ac34d0c38a3d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="androidx.webkit" name="webkit" version="1.7.0">
          <artifact name="webkit-1.7.0.aar">
             <sha256 value="e72e4a3886a701a07b066acb269dcc0a1a9a143610731f7b1255b2938d969f37" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -3011,12 +3050,12 @@
             <sha256 value="6a91a2139a3cae8126c509cf65d136d49c35cb032b581ac1a56cb6a649cc0245" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.nextcloud" name="android-library" version="008d82ae1c">
-         <artifact name="android-library-008d82ae1c.aar">
+      <component group="com.github.nextcloud" name="android-library" version="9bfb850257">
+         <artifact name="android-library-9bfb850257.aar">
             <sha256 value="bdc44e874f1e14338213ae5723e71710940a31416ff1c52c9eb2f282e5d3f29a" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
-         <artifact name="android-library-008d82ae1c.module">
-            <sha256 value="f28a1132b6a425d00bca507cadc1520d8f6805893a99feec8eb2b3228416dea1" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         <artifact name="android-library-9bfb850257.module">
+            <sha256 value="0e0d1ffe9999460fe3ce76a8044e203d37007cf226a5daeb7b35c44030ac28c9" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
       <component group="com.github.nextcloud-deps" name="qrcodescanner" version="0.1.2.4">
@@ -6886,6 +6925,11 @@
             <sha256 value="b925aa988c40a5c7aa0c77b21373feb18c39414926bd51c76ef44434f5bae9c2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.7.3">
+         <artifact name="kotlinx-coroutines-bom-1.7.3.pom">
+            <sha256 value="4e5d1900e6379ef3f5970d04a8f30529adc82f859e8cc107c21ce8149ef666c4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.4.1">
          <artifact name="kotlinx-coroutines-core-1.4.1.module">
             <sha256 value="3c00e44941f134b18cadbc5f18ab7b7f23d3ef1f78af95e344cb9c605db21a44" origin="Generated by Gradle"/>
@@ -7532,6 +7576,14 @@
             <sha256 value="5de44b2e52170f577408c64a8c88c93db77336c765ffbc15736ff5ad9da6ff1d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.xerial" name="sqlite-jdbc" version="3.41.2.2">
+         <artifact name="sqlite-jdbc-3.41.2.2.jar">
+            <sha256 value="0cdab410947e04b6743df99cf1543267ddd107357d6f76948d145be590fd497d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="sqlite-jdbc-3.41.2.2.pom">
+            <sha256 value="ae11a3b11dcbac1b6403689e3fd8d82b2ceea55e82dbfc4bb32aededf8ccac8e" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.xmlresolver" name="xmlresolver" version="4.4.3">
          <artifact name="xmlresolver-4.4.3-data.jar">
             <sha256 value="a57db23d75c3580cb15eb6e1a854683f4579cfd265f5cf1011a6983d9aed0f1f" origin="Generated by Gradle"/>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail