Merge pull request #16260 from nextcloud/depocc/DownloadFile

DownloadFileOperation uses now NextcloudClient

Author: tobiasKaminsky

app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java

@@ -18,7 +18,9 @@
 import android.webkit.MimeTypeMap;
 
 import com.nextcloud.client.account.User;
+import com.nextcloud.common.NextcloudClient;
 import com.nextcloud.utils.extensions.ContextExtensionsKt;
+import com.nextcloud.utils.extensions.OwnCloudClientExtensionsKt;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -42,7 +44,6 @@
 import java.lang.ref.WeakReference;
 import java.nio.file.Files;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -205,7 +206,8 @@ protected RemoteOperationResult run(OwnCloudClient client) {
             dataTransferListeners.forEach(downloadOperation::addDatatransferProgressListener);
         }
 
-        result = downloadOperation.execute(client);
+        NextcloudClient nextcloudClient = OwnCloudClientExtensionsKt.toNextcloudClient(client, operationContext);
+        result = downloadOperation.execute(nextcloudClient);
 
 
 

gradle/libs.versions.toml

@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "0.33.2"
 androidGifDrawableVersion = "1.2.31"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion ="eacc5b6d375cacaae8efa27d35519b27a9ce5da2"
+androidLibraryVersion ="83b68e9ee3c91e146585ea4dff8872bacfce160a"
 androidPluginVersion = "9.1.1"
 androidsvgVersion = "1.4"
 androidxMediaVersion = "1.5.1"

gradle/verification-metadata.xml

@@ -20814,6 +20814,14 @@
             <sha256 value="1766b0b02fe18a2f24687a75e350c157eeb1bcb5a5f13b0c9bb01d88709e842f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="08bd486478f27fdd839431bf1a78b29ec9308689">
+         <artifact name="android-library-08bd486478f27fdd839431bf1a78b29ec9308689.aar">
+            <sha256 value="b2887e0c9f8ff1112e39a43f9341d5738c5d0180544b665a8df7731b7b9ea8e4" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-08bd486478f27fdd839431bf1a78b29ec9308689.module">
+            <sha256 value="16e10011c4e370870570943f137589f391160bcf907915ab8de5b3b009795160" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="0bc996e6b6">
          <artifact name="android-library-0bc996e6b6.aar">
             <sha256 value="944bc1de6496e567dd53573007a81102788f869d6ad83f6690f3cb4a156e1280" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -21382,6 +21390,14 @@
             <sha256 value="d52aea880fbf27f6ef86e0d757dfc5c3b2af695b23ee05b1c0a78fa74b6fc4e4" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="83b68e9ee3c91e146585ea4dff8872bacfce160a">
+         <artifact name="android-library-83b68e9ee3c91e146585ea4dff8872bacfce160a.aar">
+            <sha256 value="ba80c815b048d809db5acb00039626694e223ef8b12aed8f56d7492c0c7b6dc0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-83b68e9ee3c91e146585ea4dff8872bacfce160a.module">
+            <sha256 value="1b36e65cab3cdaf1c7d03ba4e0bf868d30284126f28ca4a804ea7a31e2843929" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="84711877b4703f8df3d638a016419b4aa731db2b">
          <artifact name="android-library-84711877b4703f8df3d638a016419b4aa731db2b.aar">
             <sha256 value="d801b368fc7d4d5d2d2852765442ccbf7df21f0a9198d369181637a8142914cc" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -26090,6 +26106,11 @@
             <sha256 value="77ed42c8c8b2cebbb93ac9e07543ff6418aa24bdb8517580cf5324e9a6510956" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava" version="33.6.0-jre">
+         <artifact name="guava-33.6.0-android.jar">
+            <sha256 value="9532ca9ba8aceb4cd2067171f981c799988b7f5844e3e274811a3bb757034bc4" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="guava-parent" version="26.0-android">
          <artifact name="guava-parent-26.0-android.pom">
             <sha256 value="f8698ab46ca996ce889c1afc8ca4f25eb8ac6b034dc898d4583742360016cc04" origin="Generated by Gradle"/>