Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
TobiasFella committed Oct 16, 2024
1 parent 7caf316 commit f6829ee
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ jobs:

- name: Configure libQuotient
run: |
cmake -S $GITHUB_WORKSPACE -B build $CMAKE_ARGS -DQuotient_INSTALL_TESTS=ON
cmake -S $GITHUB_WORKSPACE -B build $CMAKE_ARGS -DQuotient_INSTALL_TESTS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=1
- name: Regenerate API code
if: matrix.update-api
Expand Down Expand Up @@ -238,7 +238,6 @@ jobs:
SONAR_SERVER_URL: 'https://sonarcloud.io'
run: |
mkdir .coverage && pushd .coverage
ls ..
find ../build -name '*.gcda' -print0 \
| xargs -0 gcov$GCC_VERSION -s $GITHUB_WORKSPACE -pr
# Coverage of the test source code is not tracked, as it is always 100%
Expand Down
4 changes: 3 additions & 1 deletion Quotient/connection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,9 @@ void Connection::Private::completeSetup(const QString& mxId, bool newLogin,
<< "by user" << data->userId()
<< "from device" << data->deviceId();
connect(qApp, &QCoreApplication::aboutToQuit, q, &Connection::saveState);
const QString databasePath{ QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) % u'/' % mxId % u'/' % *deviceId };
auto mxIdForDb = mxId;
mxIdForDb.replace(u':', u'_');
const QString databasePath{ QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) % u'/' % mxIdForDb % u'/' % *deviceId };
cryptoMachine = crypto::init(stringToRust(mxId), stringToRust(*deviceId), stringToRust(databasePath));

if (accessToken.has_value()) {
Expand Down
1 change: 1 addition & 0 deletions matrix-rust-sdk-crypto/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ fn init(user_id: String, device_id: String, path: String) -> Box<CryptoMachine>
let device_id: Box<DeviceId> = device_id.into();

//TODO: use real pickle key
println!("path: {path}");
let store = SqliteCryptoStore::open(Path::new(&path), "123123123".into()).await.unwrap();

OlmMachine::with_store(&user_id, &device_id, store)
Expand Down

0 comments on commit f6829ee

Please sign in to comment.