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

Allow multiple messages on the Generic Foreground Service. Show the oldest still active.

Browse Source
This commit is contained in:
Alan Evans
2019-06-27 12:18:52 -04:00
committed by GitHub
parent cfcb9a8cdb
commit c089d6cd43
6 changed files with 327 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java
View File

@@ -40,8 +40,8 @@ public class SQLCipherMigrationHelper {
@NonNull net.sqlcipher.database.SQLiteDatabase modernDb)
{
modernDb.beginTransaction();
int foregroundId = GenericForegroundService.startForegroundTask(context, context.getString(R.string.SQLCipherMigrationHelper_migrating_signal_database)).getId();
try {
GenericForegroundService.startForegroundTask(context, context.getString(R.string.SQLCipherMigrationHelper_migrating_signal_database));
copyTable("identities", legacyDb, modernDb, null);
copyTable("push", legacyDb, modernDb, null);
copyTable("groups", legacyDb, modernDb, null);
@@ -50,7 +50,7 @@ public class SQLCipherMigrationHelper {
modernDb.setTransactionSuccessful();
} finally {
modernDb.endTransaction();
GenericForegroundService.stopForegroundTask(context);
GenericForegroundService.stopForegroundTask(context, foregroundId);
}
}
@@ -65,8 +65,8 @@ public class SQLCipherMigrationHelper {
modernDb.beginTransaction();
int foregroundId = GenericForegroundService.startForegroundTask(context, context.getString(R.string.SQLCipherMigrationHelper_migrating_signal_database)).getId();
try {
GenericForegroundService.startForegroundTask(context, context.getString(R.string.SQLCipherMigrationHelper_migrating_signal_database));
int total = 5000;
copyTable("sms", legacyDb, modernDb, (row, progress) -> {
@@ -175,7 +175,7 @@ public class SQLCipherMigrationHelper {
modernDb.setTransactionSuccessful();
} finally {
modernDb.endTransaction();
GenericForegroundService.stopForegroundTask(context);
GenericForegroundService.stopForegroundTask(context, foregroundId);
}
}