commit 73416aed800f507d6bee9c1bc437c84e333eece0
parent 898acd5231ac6f25f007cd46cc11f5b2c11d92e9
Author: triesap <137732411+triesap@users.noreply.github.com>
Date: Sun, 25 Aug 2024 12:08:23 +0000
Add preferences
Diffstat:
7 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -10,6 +10,7 @@ android {
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-dialog')
+ implementation project(':capacitor-preferences')
implementation project(':radroots-capacitor-sqlite')
implementation project(':radroots-capacitor-secure-storage')
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -5,6 +5,9 @@ project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm
include ':capacitor-dialog'
project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog/android')
+include ':capacitor-preferences'
+project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences/android')
+
include ':radroots-capacitor-sqlite'
project(':radroots-capacitor-sqlite').projectDir = new File('../../../packages/capacitor-sqlite/android')
diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -12,6 +12,7 @@ def capacitor_pods
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios'
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog'
+ pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences'
pod 'RadrootsCapacitorSqlite', :path => '../../../../packages/capacitor-sqlite'
pod 'RadrootsCapacitorSecureStorage', :path => '../../../../packages/capacitor-secure-storage'
end
diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -4,6 +4,8 @@ PODS:
- CapacitorCordova (6.1.2)
- CapacitorDialog (6.0.1):
- Capacitor
+ - CapacitorPreferences (6.0.2):
+ - Capacitor
- KeychainSwift (21.0.0)
- RadrootsCapacitorSecureStorage (6.0.1):
- Capacitor
@@ -23,6 +25,7 @@ DEPENDENCIES:
- "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios`)"
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios`)"
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog`)"
+ - "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences`)"
- RadrootsCapacitorSecureStorage (from `../../../../packages/capacitor-secure-storage`)
- RadrootsCapacitorSqlite (from `../../../../packages/capacitor-sqlite`)
@@ -39,6 +42,8 @@ EXTERNAL SOURCES:
:path: "../../../../node_modules/.pnpm/@capacitor+ios@6.1.2_@capacitor+core@6.1.2/node_modules/@capacitor/ios"
CapacitorDialog:
:path: "../../../../node_modules/.pnpm/@capacitor+dialog@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/dialog"
+ CapacitorPreferences:
+ :path: "../../../../node_modules/.pnpm/@capacitor+preferences@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences"
RadrootsCapacitorSecureStorage:
:path: "../../../../packages/capacitor-secure-storage"
RadrootsCapacitorSqlite:
@@ -48,12 +53,13 @@ SPEC CHECKSUMS:
Capacitor: 679f9673fdf30597493a6362a5d5bf233d46abc2
CapacitorCordova: f48c89f96c319101cd2f0ce8a2b7449b5fb8b3dd
CapacitorDialog: ad752191fdb22a8d0ac199b0754b8a021d86dbf9
+ CapacitorPreferences: e8284bf740cf8c6d3f25409af3c01df87dfeb5a1
KeychainSwift: 4a71a45c802fd9e73906457c2dcbdbdc06c9419d
RadrootsCapacitorSecureStorage: d95a1648c105ddf18a1b0612528e0ce1f77b789e
RadrootsCapacitorSqlite: 11b1be8786af151612ee8e058d16f4979c2e3b1c
SQLCipher: 77fbe633cd84db04b07876dd50766b4924b57d61
ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
-PODFILE CHECKSUM: abddc1680d6f1adb6422262db160c058b623a4d3
+PODFILE CHECKSUM: 14a558b382b7f20a2046b97a573c98b48162394f
COCOAPODS: 1.15.2
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
"@capacitor/android": "^6.0.0",
"@capacitor/core": "^6.1.2",
"@capacitor/dialog": "^6.0.0",
+ "@capacitor/preferences": "^6.0.0",
"@capacitor/ios": "^6.0.0",
"@ionic/pwa-elements": "^3.3.0",
"@radroots/capacitor-sqlite": "workspace:*",
diff --git a/src/lib/client.ts b/src/lib/client.ts
@@ -1,3 +1,5 @@
import { ClientCapacitor } from "@radroots/client";
+import { NostrTools } from "../../../../packages/utils";
export const cl = new ClientCapacitor();
+export const nt = new NostrTools();
+\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -67,9 +67,11 @@
if (!app_config) return;
app_sqlite.set(!!(await cl.db.connect(PUBLIC_DATABASE_NAME)));
- const nostr_key = await cl.keystore.get(`nostr:key`);
- if(typeof nostr_key === `string` && nostr_key) app_key.set(nostr_key);
+ const key_active = await cl.preferences.get("nostr:key:active");
+ console.log(`key_active `, key_active)
+ const nostr_key = await cl.keystore.get(`nostr:key:${key_active}`);
console.log(`nostr_key `, nostr_key);
+ if(typeof nostr_key === `string` && nostr_key) app_key.set(nostr_key);
} catch (e) {
console.log(`(app_config) error `, e);
} finally {
