Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade WatermelonDB to 0.27.1 #5865

Merged
merged 20 commits into from
Nov 5, 2024
Merged

chore: upgrade WatermelonDB to 0.27.1 #5865

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ae2a4c2
Migrate from db.action to db.write
diegolmello Sep 11, 2024
8538903
iOS building
diegolmello Sep 11, 2024
57a4bf4
Android building
diegolmello Sep 11, 2024
6fbaf20
Database might be querying correctly on iOS now
diegolmello Sep 13, 2024
b4c9b89
Decrypt push content working
diegolmello Sep 13, 2024
1439327
Backwards compat
diegolmello Sep 16, 2024
e7c1dd9
Cleanup
diegolmello Sep 17, 2024
7c18e59
Minor fix
diegolmello Sep 17, 2024
ce43e84
Fix reply encrypted from push
diegolmello Sep 17, 2024
7de7742
Fix backwards compat decrypt push
diegolmello Sep 17, 2024
bf57d7a
Fix database open from push on Android
diegolmello Sep 18, 2024
21e322b
Content decrypt
diegolmello Sep 18, 2024
f965238
Typo
diegolmello Sep 18, 2024
baf9980
Cleanup
diegolmello Sep 18, 2024
7db2ab1
Fix database queries on Watch
diegolmello Sep 19, 2024
200b17b
Refactor
diegolmello Sep 19, 2024
8953482
Merge branch 'develop' into chore.upgrade-wmdb
diegolmello Sep 19, 2024
2a74b5c
Merge branch 'develop' into chore.upgrade-wmdb
diegolmello Sep 26, 2024
d47a1ca
Merge branch 'develop' into chore.upgrade-wmdb
diegolmello Oct 22, 2024
dd44f13
Merge branch 'develop' into chore.upgrade-wmdb
diegolmello Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix database open from push on Android
  • Loading branch information
@diegolmello
diegolmello committed Sep 18, 2024
commit bf57d7a339875bb20ee5ce9f8e799efde113d6d7
7 changes: 6 additions & 1 deletion android/app/src/play/java/chat/rocket/reactnative/Encryption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.pedrouid.crypto.RSA;
import com.pedrouid.crypto.Util;

import java.io.File;
import java.lang.reflect.Field;
import java.security.SecureRandom;
import java.util.Arrays;
Expand Down Expand Up @@ -118,7 +119,11 @@ private String getDatabaseName(String serverUrl) {
if (!isOfficial) {
dbName += "-experimental";
}
return dbName + ".db";
// Old issue. Safer to accept it then to migrate away from it.
dbName += ".db.db";
// https://github.com/Nozbe/WatermelonDB/blob/a757e646141437ad9a06f7314ad5555a8a4d252e/native/android-jsi/src/main/java/com/nozbe/watermelondb/jsi/JSIInstaller.java#L18
File databasePath = new File(reactContext.getDatabasePath(dbName).getPath().replace("/databases", ""));
return databasePath.getPath();
}

public String readUserKey(final Ejson ejson) throws Exception {
Expand Down