Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-08 09:18:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Put guard against self-foreign-keys causing infinite recursion.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-04-15 15:28:47 -04:00
committed by Cody Henthorne
parent 646f79be7d
commit deeaf2ba2e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
+4 -1
View File
@@ -332,7 +332,10 @@ public class FullBackupExporter extends FullBackupBase {
Map<String, Set<String>> dependsOn = new LinkedHashMap<>(); Map<String, Set<String>> dependsOn = new LinkedHashMap<>();
for (String table : tables) { for (String table : tables) {
dependsOn.put(table, SqlUtil.getForeignKeyDependencies(input, table)); Set<String> dependencies = SqlUtil.getForeignKeyDependencies(input, table);
dependencies.remove(table);
dependsOn.put(table, dependencies);
} }
for (String table : tables) { for (String table : tables) {
app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
+4 -1
View File
@@ -324,7 +324,10 @@ public class FullBackupImporter extends FullBackupBase {
Map<String, Set<String>> dependsOn = new LinkedHashMap<>(); Map<String, Set<String>> dependsOn = new LinkedHashMap<>();
for (String table : tables) { for (String table : tables) {
dependsOn.put(table, SqlUtil.getForeignKeyDependencies(input, table)); Set<String> dependencies = SqlUtil.getForeignKeyDependencies(input, table);
dependencies.remove(table);
dependsOn.put(table, dependencies);
} }
for (String table : tables) { for (String table : tables) {