Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-24 11:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated emoji to version 14.0

Browse Source
This commit is contained in:
Greyson Parrelli
2022-04-22 11:40:07 -04:00
parent f15072bc8d
commit 530403ec04
21 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob.java
View File

@@ -75,10 +75,10 @@ public class DownloadLatestEmojiDataJob extends BaseJob {
}
}
public DownloadLatestEmojiDataJob(boolean force) {
public DownloadLatestEmojiDataJob(boolean ignoreAutoDownloadConstraints) {
this(new Job.Parameters.Builder()
.setQueue(QUEUE_KEY)
.addConstraint(force ? NetworkConstraint.KEY : AutoDownloadEmojiConstraint.KEY)
.addConstraint(ignoreAutoDownloadConstraints ? NetworkConstraint.KEY : AutoDownloadEmojiConstraint.KEY)
.setMaxInstancesForQueue(1)
.setMaxAttempts(5)
.setLifespan(TimeUnit.DAYS.toMillis(1))
@@ -126,10 +126,10 @@ public class DownloadLatestEmojiDataJob extends BaseJob {
EmojiData emojiData = downloadJson(context, targetVersion);
List<String> supportedDensities = emojiData.getDensities();
String format = emojiData.getFormat();
List<String> imagePaths = Stream.of(emojiData.getDataPages())
.map(EmojiPageModel::getSpriteUri)
.map(Uri::getLastPathSegment)
.toList();
List<String> imagePaths = Stream.of(emojiData.getDataPages())
.map(EmojiPageModel::getSpriteUri)
.map(Uri::getLastPathSegment)
.toList();
String density = resolveDensity(supportedDensities, targetVersion.getDensity());
targetVersion = new EmojiFiles.Version(targetVersion.getVersion(), targetVersion.getUuid(), density);

7
app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
View File

@@ -101,9 +101,10 @@ public class ApplicationMigrations {
static final int PNI_IDENTITY_2 = 57;
static final int PNI_IDENTITY_3 = 58;
static final int STORY_DISTRIBUTION_LIST_SYNC = 59;
static final int EMOJI_VERSION_7 = 60;
}
public static final int CURRENT_VERSION = 59;
public static final int CURRENT_VERSION = 60;
/**
* This *must* be called after the {@link JobManager} has been instantiated, but *before* the call
@@ -441,6 +442,10 @@ public class ApplicationMigrations {
jobs.put(Version.STORY_DISTRIBUTION_LIST_SYNC, new StorageServiceMigrationJob());
}
if (lastSeenVersion < Version.EMOJI_VERSION_7) {
jobs.put(Version.EMOJI_VERSION_7, new EmojiDownloadMigrationJob());
}
return jobs;
}