Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
strategy:
fail-fast: false
matrix:
features: ["", "legacy,compile-tests,android-log"]
features: ["", "compile-tests,android-log"]
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
Expand All @@ -50,7 +50,7 @@ jobs:
strategy:
fail-fast: false
matrix:
features: ["", "legacy,compile-tests,android-log"]
features: ["", "compile-tests,android-log"]
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
CARGO_TARGET_X86_64_LINUX_ANDROID_RUSTFLAGS: -C instrument-coverage --cfg keyring_coverage
run: |
export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$ANDROID_HOME/ndk/28.2.13676358/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"
cargo build --target x86_64-linux-android --features legacy,compile-tests,android-log
cargo build --target x86_64-linux-android --features compile-tests,android-log
mkdir -p keyring-tester/app/src/main/jniLibs/x86_64
cp target/x86_64-linux-android/debug/libandroid_native_keyring_store.so keyring-tester/app/src/main/jniLibs/x86_64/
- name: Build keyring-tester
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:
with:
toolchain: stable
target: aarch64-linux-android
- run: cargo doc --no-deps --target aarch64-linux-android --features legacy
- run: cargo doc --no-deps --target aarch64-linux-android
env:
RUSTDOCFLAGS: -D warnings -D missing_docs
2 changes: 1 addition & 1 deletion .github/workflows/emulator-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Build the library for the emulator
run: |
export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$ANDROID_HOME/ndk/28.2.13676358/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"
cargo build --release --target x86_64-linux-android --features legacy,compile-tests,android-log
cargo build --release --target x86_64-linux-android --features compile-tests,android-log
mkdir -p keyring-tester/app/src/main/jniLibs/x86_64
cp target/x86_64-linux-android/release/libandroid_native_keyring_store.so keyring-tester/app/src/main/jniLibs/x86_64/
- name: Build keyring-tester
Expand Down
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ exclude = ["keyring-tester"]
crate-type = ["lib", "cdylib"]

[features]
legacy = []
compile-tests = ["android_log-sys"]
user-auth-tests = ["compile-tests"]
android-log = ["android_log-sys", "tracing-subscriber/env-filter"]
Expand All @@ -43,4 +42,3 @@ undocumented_unsafe_blocks = "deny"

[package.metadata.docs.rs]
targets = ["aarch64-linux-android"]
features = ["legacy"]
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,7 @@ The second is the `Keyring Demo` [Tauri 2.0](https://v2.tauri.app) application w

## Upgrading from v0.5.x or earlier

Starting with release v0.6.0 of this crate, the storage conventions for credentials have changed. If your application has stored credentials using an earlier version of this crate, you can still access those credentials by using the function `LegacyStore::from_ndk_context` to create your credential store (rather then `Store::new` as you did before).

However! In order to get access to the `LegacyStore` implementation, you will need to compile this crate with the `legacy` feature enabled, and you are strongly encouraged not to keep using the legacy implementation as it is deprecated and may be removed in future versions. Instead, your application should use the default store based on the current implementation (or create a named store of its own to use), and it should migrate any needed credentials from the legacy store to the current one.

See the crate docs for more about this.
Versions 0.5 and earlier stored credentials in one SharedPreferences file and Keystore entry per service. This version no longer reads that layout. If your application still has such credentials, migrate them to a named store with a 1.x release of this crate, as its [migration guide](https://docs.rs/android-native-keyring-store/1.0.0/android_native_keyring_store/by_service/index.html#migration-guide) describes, before upgrading.

## Changelog

Expand Down
151 changes: 0 additions & 151 deletions src/by_service/cred.rs

This file was deleted.

79 changes: 0 additions & 79 deletions src/by_service/mod.rs

This file was deleted.

92 changes: 0 additions & 92 deletions src/by_service/store.rs

This file was deleted.

Loading
Loading