diff --git a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java index d3c38c64b9..53096a098f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java +++ b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java @@ -9,6 +9,7 @@ import org.thoughtcrime.securesms.insights.InsightsOptOut; import org.thoughtcrime.securesms.jobmanager.JobManager; import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob; import org.thoughtcrime.securesms.keyvalue.SignalStore; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.migrations.ApplicationMigrations; import org.thoughtcrime.securesms.stickers.BlessedPacks; import org.thoughtcrime.securesms.util.TextSecurePreferences; @@ -21,9 +22,13 @@ import org.thoughtcrime.securesms.util.Util; */ public final class AppInitialization { + private static final String TAG = Log.tag(AppInitialization.class); + private AppInitialization() {} public static void onFirstEverAppLaunch(@NonNull Context context) { + Log.i(TAG, "onFirstEverAppLaunch()"); + InsightsOptOut.userRequestedOptOut(context); TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION); TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION); @@ -38,6 +43,8 @@ public final class AppInitialization { } public static void onPostBackupRestore(@NonNull Context context) { + Log.i(TAG, "onPostBackupRestore()"); + ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch(); SignalStore.onFirstEverAppLaunch(); ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java index 5dcaf0decc..3d24f2e19a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java @@ -165,6 +165,7 @@ public class FullBackupImporter extends FullBackupBase { ContentValues contentValues = new ContentValues(); contentValues.put(StickerDatabase.FILE_PATH, dataFile.getAbsolutePath()); + contentValues.put(StickerDatabase.FILE_LENGTH, sticker.getLength()); contentValues.put(StickerDatabase.FILE_RANDOM, output.first); db.update(StickerDatabase.TABLE_NAME, contentValues, diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java index 02a97c3dde..9283a9ecf5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java @@ -176,8 +176,7 @@ public class StickerPackDownloadJob extends BaseJob { public static final class Factory implements Job.Factory { @Override - public @NonNull - StickerPackDownloadJob create(@NonNull Parameters parameters, @NonNull Data data) { + public @NonNull StickerPackDownloadJob create(@NonNull Parameters parameters, @NonNull Data data) { return new StickerPackDownloadJob(parameters, data.getString(KEY_PACK_ID), data.getString(KEY_PACK_KEY),