mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Revert "Upgrade to Glide 4.14.2" 

This reverts commit 3ee889cb79.
main
Greyson Parrelli 2023-01-31 14:47:52 -05:00 zatwierdzone przez Nicholas Tinsley
rodzic eceed641bf
commit 670b6c4c56
5 zmienionych plików z 59 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
Wyświetl plik

@ -39,6 +39,7 @@ import org.thoughtcrime.securesms.migrations.AvatarMigrationJob;
import org.thoughtcrime.securesms.migrations.BackupNotificationMigrationJob;
import org.thoughtcrime.securesms.migrations.BlobStorageLocationMigrationJob;
import org.thoughtcrime.securesms.migrations.CachedAttachmentsMigrationJob;
import org.thoughtcrime.securesms.migrations.ClearGlideCacheMigrationJob;
import org.thoughtcrime.securesms.migrations.DatabaseMigrationJob;
import org.thoughtcrime.securesms.migrations.DeleteDeprecatedLogsMigrationJob;
import org.thoughtcrime.securesms.migrations.DirectoryRefreshMigrationJob;
@ -209,6 +210,7 @@ public final class JobManagerFactories {
put(BackupNotificationMigrationJob.KEY, new BackupNotificationMigrationJob.Factory());
put(BlobStorageLocationMigrationJob.KEY, new BlobStorageLocationMigrationJob.Factory());
put(CachedAttachmentsMigrationJob.KEY, new CachedAttachmentsMigrationJob.Factory());
put(ClearGlideCacheMigrationJob.KEY, new ClearGlideCacheMigrationJob.Factory());
put(DatabaseMigrationJob.KEY, new DatabaseMigrationJob.Factory());
put(DeleteDeprecatedLogsMigrationJob.KEY, new DeleteDeprecatedLogsMigrationJob.Factory());
put(DirectoryRefreshMigrationJob.KEY, new DirectoryRefreshMigrationJob.Factory());

7
app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
Wyświetl plik

@ -118,9 +118,10 @@ public class ApplicationMigrations {
static final int OPTIMIZE_MESSAGE_FTS_INDEX = 74;
static final int REACTION_DATABASE_MIGRATION = 75;
static final int REBUILD_MESSAGE_FTS_INDEX_2 = 76;
static final int GLIDE_CACHE_CLEAR = 77;
}
public static final int CURRENT_VERSION = 76;
public static final int CURRENT_VERSION = 77;
/**
* This *must* be called after the {@link JobManager} has been instantiated, but *before* the call
@ -526,6 +527,10 @@ public class ApplicationMigrations {
jobs.put(Version.REBUILD_MESSAGE_FTS_INDEX_2, new RebuildMessageSearchIndexMigrationJob());
}
if (lastSeenVersion < Version.GLIDE_CACHE_CLEAR) {
jobs.put(Version.GLIDE_CACHE_CLEAR, new ClearGlideCacheMigrationJob());
}
return jobs;
}

35
app/src/main/java/org/thoughtcrime/securesms/migrations/ClearGlideCacheMigrationJob.kt 100644
Wyświetl plik

@ -0,0 +1,35 @@
package org.thoughtcrime.securesms.migrations
import com.bumptech.glide.Glide
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.jobmanager.Data
import org.thoughtcrime.securesms.jobmanager.Job
/**
* Clears the Glide disk cache.
*/
internal class ClearGlideCacheMigrationJob(
parameters: Parameters = Parameters.Builder().build()
) : MigrationJob(parameters) {
companion object {
val TAG = Log.tag(ClearGlideCacheMigrationJob::class.java)
const val KEY = "ClearGlideCacheMigrationJog"
}
override fun getFactoryKey(): String = KEY
override fun isUiBlocking(): Boolean = false
override fun performMigration() {
Glide.get(context).clearDiskCache()
}
override fun shouldRetry(e: Exception): Boolean = false
class Factory : Job.Factory<ClearGlideCacheMigrationJob> {
override fun create(parameters: Parameters, data: Data): ClearGlideCacheMigrationJob {
return ClearGlideCacheMigrationJob(parameters)
}
}
}

2
dependencies.gradle
Wyświetl plik

@ -10,7 +10,7 @@ dependencyResolutionManagement {
version('androidx-navigation', '2.5.2')
version('androidx-window', '1.0.0')
version('exoplayer', '2.18.1')
version('glide', '4.14.2')
version('glide', '4.13.2')
version('kotlin', '1.6.21')
version('libsignal-client', '0.21.1')
version('mp4parser', '1.9.39')

36
gradle/verification-metadata.xml
Wyświetl plik

@ -1593,35 +1593,29 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="de70d0f1e971b662f5b5bf138a467b671fd50b2dbf7dea5c1cc3b33ad7d5d06b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.bumptech.glide" name="annotations" version="4.14.2">
<artifact name="annotations-4.14.2.jar">
<sha256 value="8419bf262be70edeb6b9582b386546be66d2e8659c7aae65fd69a9ede02c4877" origin="Generated by Gradle"/>
</artifact>
<artifact name="annotations-4.14.2.module">
<sha256 value="6ec1255219b1532ad3c3eb508227cbc5a1a946900ab7bf87d0961de83d105323" origin="Generated by Gradle"/>
<component group="com.github.bumptech.glide" name="annotations" version="4.13.2">
<artifact name="annotations-4.13.2.jar">
<sha256 value="05514bb1624cafe33827e6f0206b3d3d859342cac94bcdb152dc18ea582833c0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.bumptech.glide" name="compiler" version="4.14.2">
<artifact name="compiler-4.14.2.jar">
<sha256 value="315b1325283c3d0cf9bc0599c1ecdb85e5f7863b1aa25991b63d616b13930cb6" origin="Generated by Gradle"/>
</artifact>
<artifact name="compiler-4.14.2.module">
<sha256 value="a13cbc509236301211e8f681470a4e8fc6a69b50ced61de96b576516789778f3" origin="Generated by Gradle"/>
<component group="com.github.bumptech.glide" name="compiler" version="4.13.2">
<artifact name="compiler-4.13.2.jar">
<sha256 value="6f6354d8d7746b4c565a1c37aa4991b378f944546e8bea7f4125c701b43f21d4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.bumptech.glide" name="disklrucache" version="4.14.2">
<artifact name="disklrucache-4.14.2.jar">
<sha256 value="4cb0820231899087a3642b49f9bb67a6e53e81fbac6ffed8176260775a4fce4d" origin="Generated by Gradle"/>
<component group="com.github.bumptech.glide" name="disklrucache" version="4.13.2">
<artifact name="disklrucache-4.13.2.jar">
<sha256 value="ebdfd73c09663061fe62727d3cca4c23f383e966ed064cd1ea0e085d2e1e72dc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.bumptech.glide" name="gifdecoder" version="4.14.2">
<artifact name="gifdecoder-4.14.2.aar">
<sha256 value="d021eee1ac1a036fcdc377b6dc3b218f4a0cc2bc2f096d69b474198b635e8302" origin="Generated by Gradle"/>
<component group="com.github.bumptech.glide" name="gifdecoder" version="4.13.2">
<artifact name="gifdecoder-4.13.2.aar">
<sha256 value="f1e5aa8749657fb97dedd143eb396d1716ec2913c6e8364fd3f19237da5c0937" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.bumptech.glide" name="glide" version="4.14.2">
<artifact name="glide-4.14.2.aar">
<sha256 value="ec32c33f5b289fd7b0a54485e27392f896b239cefd533385e262de1530190c3f" origin="Generated by Gradle"/>
<component group="com.github.bumptech.glide" name="glide" version="4.13.2">
<artifact name="glide-4.13.2.aar">
<sha256 value="bf8a3894e7ba8844d4633497da6e774322e10eb0956be5814497bdd381ed8113" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.chrisbanes" name="PhotoView" version="2.3.0">