mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-20 07:52:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Tobias Kaminsky 2024-08-23 03:37:16 +02:00
commit 1d0f9b58b6
4 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/build.gradle
View file

@ -28,9 +28,9 @@ buildscript {
}
plugins {
id "org.jetbrains.kotlin.plugin.compose" version "2.0.10"
id "org.jetbrains.kotlin.plugin.compose" version "2.0.20"
id "com.diffplug.spotless" version "6.25.0"
id "org.jetbrains.kotlin.kapt" version "2.0.10"
id "org.jetbrains.kotlin.kapt" version "2.0.20"
id 'com.google.devtools.ksp' version '2.0.10-1.0.24' apply false
}
@ -269,7 +269,7 @@ dependencies {
}
// Jetpack Compose
implementation(platform("androidx.compose:compose-bom:2024.06.00"))
implementation(platform("androidx.compose:compose-bom:2024.08.00"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.material3:material3")
@ -382,7 +382,7 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation "androidx.test:rules:$androidxTestVersion"
// Android JUnit Runner
androidTestImplementation "androidx.test:runner:1.6.1"
androidTestImplementation "androidx.test:runner:1.6.2"
androidTestUtil "androidx.test:orchestrator:1.5.0"
androidTestImplementation "androidx.test:core-ktx:$androidxTestVersion"

11
app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
View file

@ -65,7 +65,6 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.lang.ref.WeakReference;
import java.net.URLEncoder;
import java.util.List;
import androidx.annotation.NonNull;
@ -73,7 +72,6 @@ import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.core.content.res.ResourcesCompat;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import kotlin.text.Charsets;
/**
* Manager for concurrent access to thumbnails cache.
@ -717,8 +715,9 @@ public final class ThumbnailsCacheManager {
// thumbnail
String uri;
if (file instanceof OCFile) {
uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" +
pxW + "/" + pxH + Uri.encode(file.getRemotePath(), "/");
uri = mClient.getBaseUri() + "/index.php/core/preview?fileId="
+ file.getLocalId()
+ "&x=" + pxW + "&y=" + pxH + "&a=1&mode=cover&forceIcon=0";
} else {
uri = mClient.getBaseUri() + "/index.php/apps/files_trashbin/preview?fileId=" +
file.getLocalId() + "&x=" + pxW + "&y=" + pxH;
@ -1400,8 +1399,8 @@ public final class ThumbnailsCacheManager {
if (mClient != null) {
GetMethod getMethod = null;
try {
String uri = mClient.getBaseUri() + "/index.php/core/preview.png?file="
+ URLEncoder.encode(file.getRemotePath(), Charsets.UTF_8.name())
String uri = mClient.getBaseUri() + "/index.php/core/preview?fileId="
+ file.getRemoteId()
+ "&x=" + (pxW / 2) + "&y=" + (pxH / 2) + "&a=1&mode=cover&forceIcon=0";
Log_OC.d(TAG, "generate resized image: " + file.getFileName() + " URI: " + uri);
getMethod = new GetMethod(uri);

4
build.gradle
View file

@ -10,7 +10,7 @@
*/
buildscript {
ext {
androidLibraryVersion ="15a1dacb4c917ff69accd268009260884ac1199e"
androidLibraryVersion ="2c62a70fc8dda04965700be481f75fb1e1d3c1f5"
androidPluginVersion = '8.5.2'
androidxMediaVersion = '1.4.0'
androidxTestVersion = "1.6.1"
@ -21,7 +21,7 @@ buildscript {
espressoVersion = "3.6.1"
fidoVersion = "4.1.0-patch2"
jacoco_version = '0.8.12'
kotlin_version = '2.0.10'
kotlin_version = '2.0.20'
markwonVersion = "4.6.2"
mockitoVersion = "4.11.0"
mockitoKotlinVersion = "4.1.0"

20
gradle/verification-metadata.xml
View file

@ -842,6 +842,11 @@
<sha256 value="1b391a969ff81c0bb43b3711e92d977e8bfa72457a11d8a37910a7051bdc3045" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.compose" name="compose-bom" version="2024.08.00">
<artifact name="compose-bom-2024.08.00.pom">
<sha256 value="8043e0a70d594c8e7bb9626aa23a3b3d6e550d17292718672262576d9e25a579" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.compose.animation" name="animation-core" version="1.0.0-beta03">
<artifact name="animation-core-1.0.0-beta03.aar">
<sha256 value="4626086855eb6582dda9c3050c05bb56632f5a0308a3bb71a0f58def958602ca" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -10296,6 +10301,11 @@
<sha256 value="c4a0586af77f0fb4f7e367033a02ac718beff0d0193cc7989583a982aa2752f2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.0.10">
<artifact name="kotlin-gradle-plugins-bom-2.0.10.pom">
<sha256 value="772e5ecadd154fdb1722b26401e3255475831bcb7992eb3c1cd68dc68164f5e4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="1.8.22">
<artifact name="kotlin-klib-commonizer-api-1.8.22.jar">
<sha256 value="1745cb0a3c1f71ab4e499677b3b1cc4bf94e684e0b112ace865b4e5fc5fac31f" origin="Generated by Gradle"/>
@ -10800,6 +10810,11 @@
<sha256 value="18cbcbce677800756a6e13974c61dd2b6e03a2fbdbbdbf6734babdc84c6057be" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="2.0.20">
<artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-2.0.20.pom">
<sha256 value="dec227b5326b3ff31632e62675eb0264eb738689ee1a81c76ceacfd341d00d3f" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin.plugin.compose" name="org.jetbrains.kotlin.plugin.compose.gradle.plugin" version="2.0.0">
<artifact name="org.jetbrains.kotlin.plugin.compose.gradle.plugin-2.0.0.pom">
<sha256 value="38e76d688eddcf2d92ab20838c0adf28d8fd5de2cc965edcd273a9b4f7d636de" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -10810,6 +10825,11 @@
<sha256 value="d43b8b65626680872f366b8cb92740827c96ee1b69434417e51196c28bafe054" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin.plugin.compose" name="org.jetbrains.kotlin.plugin.compose.gradle.plugin" version="2.0.20">
<artifact name="org.jetbrains.kotlin.plugin.compose.gradle.plugin-2.0.20.pom">
<sha256 value="a9820ac76de5e2c95fbd733fd32d0241044c58ca35702d49be9915780e048ada" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="org.jetbrains.kotlinx" name="atomicfu" version="0.16.1">
<artifact name="atomicfu-0.16.1.module">
<sha256 value="fdcf04fc25f6a43f557f341ee0053caa25e759f591169c86566f1dad37fc77a6" origin="Generated by Gradle"/>