diff --git a/Cargo.lock b/Cargo.lock index 863343c1c..51cbd0279 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -103,9 +103,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "animo-secure-env" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8d007a91a32fee1a7608d63411ca9aa6d6f4c30b321cc9f75fcfd2e6f416644" +checksum = "26d767c00865980cef4803ed5f2507e73a406aee0cb883fa8e79541eb52d3265" dependencies = [ "jni", "lazy_static", @@ -1544,9 +1544,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "md-5" diff --git a/askar-crypto/Cargo.toml b/askar-crypto/Cargo.toml index 4d43c62fb..5660fd524 100644 --- a/askar-crypto/Cargo.toml +++ b/askar-crypto/Cargo.toml @@ -101,7 +101,7 @@ p384 = { version = "0.13", default-features = false, features = [ "ecdh", ], optional = true } rand = { version = "0.8", default-features = false } -secure-env = { package = "animo-secure-env", version = "0.3.3", optional = true } +secure-env = { package = "animo-secure-env", version = "0.4", optional = true } serde = { version = "1.0", default-features = false, features = ["derive"] } serde-json-core = { version = "0.5", default-features = false } sha2 = { version = "0.10", default-features = false } diff --git a/src/ffi/key.rs b/src/ffi/key.rs index 675268678..ac4fce937 100644 --- a/src/ffi/key.rs +++ b/src/ffi/key.rs @@ -33,12 +33,12 @@ pub extern "C" fn askar_key_generate( trace!("Generate key: {} for {} backend", alg, backend); check_useful_c_ptr!(out); - let alg = KeyAlg::from_str(alg)?; + let alg = KeyAlg::from_str(alg).unwrap(); let key = match backend { KeyBackend::Software => LocalKey::generate_with_rng(alg, ephemeral != 0), KeyBackend::SecureElement => LocalKey::generate_for_hardware(alg, ephemeral != 0) - }?; + }.unwrap(); unsafe { *out = LocalKeyHandle::create(key) }; Ok(ErrorCode::Success) diff --git a/src/ffi/macros.rs b/src/ffi/macros.rs index 0f0410e78..97bb298f9 100644 --- a/src/ffi/macros.rs +++ b/src/ffi/macros.rs @@ -5,8 +5,9 @@ macro_rules! catch_err { Ok(Err(err)) => { // lib error $crate::ffi::error::set_last_error(Some(err)) } - Err(_) => { // panic error - let err: $crate::error::Error = err_msg!(Unexpected, "Panic during execution"); + Err(e) => { // panic error + let panic_msg = e.downcast_ref::<&str>().unwrap_or(&"no message"); + let err: $crate::error::Error = err_msg!(Unexpected, "Panic during execution: '{panic_msg}'"); $crate::ffi::error::set_last_error(Some(err)) } } diff --git a/wrappers/javascript/package.json b/wrappers/javascript/package.json index e53e6a0bf..321c7c0e2 100644 --- a/wrappers/javascript/package.json +++ b/wrappers/javascript/package.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "repository": { "type": "git", - "url": "https://github.com/hyperledger/aries-askar-rs", + "url": "https://github.com/hyperledger/aries-askar", "directory": "wrappers/javascript" }, "engines": { diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/.gitignore b/wrappers/javascript/packages/aries-askar-react-native-example/android/.gitignore deleted file mode 100644 index 8a6be0771..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -# OSX -# -.DS_Store - -# Android/IntelliJ -# -build/ -.idea -.gradle -local.properties -*.iml -*.hprof -.cxx/ - -# Bundle artifacts -*.jsbundle diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/build.gradle b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/build.gradle deleted file mode 100644 index ae46b64f9..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/build.gradle +++ /dev/null @@ -1,172 +0,0 @@ -apply plugin: "com.android.application" -apply plugin: "org.jetbrains.kotlin.android" -apply plugin: "com.facebook.react" - -def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath() - -/** - * This is the configuration block to customize your React Native Android app. - * By default you don't need to apply any configuration, just uncomment the lines you need. - */ -react { - entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", projectRoot, "android", "absolute"].execute(null, rootDir).text.trim()) - reactNativeDir = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile() - hermesCommand = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsolutePath() + "/sdks/hermesc/%OS-BIN%/hermesc" - codegenDir = new File(["node", "--print", "require.resolve('@react-native/codegen/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile() - - // Use Expo CLI to bundle the app, this ensures the Metro config - // works correctly with Expo projects. - cliFile = new File(["node", "--print", "require.resolve('@expo/cli', { paths: [require.resolve('expo/package.json')] })"].execute(null, rootDir).text.trim()) - bundleCommand = "export:embed" - - /* Folders */ - // The root of your project, i.e. where "package.json" lives. Default is '..' - // root = file("../") - // The folder where the react-native NPM package is. Default is ../node_modules/react-native - // reactNativeDir = file("../node_modules/react-native") - // The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen - // codegenDir = file("../node_modules/@react-native/codegen") - - /* Variants */ - // The list of variants to that are debuggable. For those we're going to - // skip the bundling of the JS bundle and the assets. By default is just 'debug'. - // If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants. - // debuggableVariants = ["liteDebug", "prodDebug"] - - /* Bundling */ - // A list containing the node command and its flags. Default is just 'node'. - // nodeExecutableAndArgs = ["node"] - - // - // The path to the CLI configuration file. Default is empty. - // bundleConfig = file(../rn-cli.config.js) - // - // The name of the generated asset file containing your JS bundle - // bundleAssetName = "MyApplication.android.bundle" - // - // The entry file for bundle generation. Default is 'index.android.js' or 'index.js' - // entryFile = file("../js/MyApplication.android.js") - // - // A list of extra flags to pass to the 'bundle' commands. - // See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle - // extraPackagerArgs = [] - - /* Hermes Commands */ - // The hermes compiler command to run. By default it is 'hermesc' - // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc" - // - // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" - // hermesFlags = ["-O", "-output-source-map"] -} - -/** - * Set this to true to Run Proguard on Release builds to minify the Java bytecode. - */ -def enableProguardInReleaseBuilds = (findProperty('android.enableProguardInReleaseBuilds') ?: false).toBoolean() - -/** - * The preferred build flavor of JavaScriptCore (JSC) - * - * For example, to use the international variant, you can use: - * `def jscFlavor = 'org.webkit:android-jsc-intl:+'` - * - * The international variant includes ICU i18n library and necessary data - * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that - * give correct results when using with locales other than en-US. Note that - * this variant is about 6MiB larger per architecture than default. - */ -def jscFlavor = 'org.webkit:android-jsc:+' - -android { - ndkVersion rootProject.ext.ndkVersion - - buildToolsVersion rootProject.ext.buildToolsVersion - compileSdk rootProject.ext.compileSdkVersion - - namespace 'org.hyperledger.ariesaskar.example' - defaultConfig { - applicationId 'org.hyperledger.ariesaskar.example' - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0.0" - } - signingConfigs { - debug { - storeFile file('debug.keystore') - storePassword 'android' - keyAlias 'androiddebugkey' - keyPassword 'android' - } - } - buildTypes { - debug { - signingConfig signingConfigs.debug - } - release { - // Caution! In production, you need to generate your own keystore file. - // see https://reactnative.dev/docs/signed-apk-android. - signingConfig signingConfigs.debug - shrinkResources (findProperty('android.enableShrinkResourcesInReleaseBuilds')?.toBoolean() ?: false) - minifyEnabled enableProguardInReleaseBuilds - proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" - } - } - packagingOptions { - jniLibs { - useLegacyPackaging (findProperty('expo.useLegacyPackaging')?.toBoolean() ?: false) - } - } -} - -// Apply static values from `gradle.properties` to the `android.packagingOptions` -// Accepts values in comma delimited lists, example: -// android.packagingOptions.pickFirsts=/LICENSE,**/picasa.ini -["pickFirsts", "excludes", "merges", "doNotStrip"].each { prop -> - // Split option: 'foo,bar' -> ['foo', 'bar'] - def options = (findProperty("android.packagingOptions.$prop") ?: "").split(","); - // Trim all elements in place. - for (i in 0.. 0) { - println "android.packagingOptions.$prop += $options ($options.length)" - // Ex: android.packagingOptions.pickFirsts += '**/SCCS/**' - options.each { - android.packagingOptions[prop] += it - } - } -} - -dependencies { - // The version of react-native is set by the React Native Gradle Plugin - implementation("com.facebook.react:react-android") - - def isGifEnabled = (findProperty('expo.gif.enabled') ?: "") == "true"; - def isWebpEnabled = (findProperty('expo.webp.enabled') ?: "") == "true"; - def isWebpAnimatedEnabled = (findProperty('expo.webp.animated') ?: "") == "true"; - - if (isGifEnabled) { - // For animated gif support - implementation("com.facebook.fresco:animated-gif:${reactAndroidLibs.versions.fresco.get()}") - } - - if (isWebpEnabled) { - // For webp support - implementation("com.facebook.fresco:webpsupport:${reactAndroidLibs.versions.fresco.get()}") - if (isWebpAnimatedEnabled) { - // Animated webp support - implementation("com.facebook.fresco:animated-webp:${reactAndroidLibs.versions.fresco.get()}") - } - } - - if (hermesEnabled.toBoolean()) { - implementation("com.facebook.react:hermes-android") - } else { - implementation jscFlavor - } -} - -apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim(), "../native_modules.gradle"); -applyNativeModulesAppBuildGradle(project) diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/debug.keystore b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/debug.keystore deleted file mode 100644 index 364e105ed..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/debug.keystore and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/proguard-rules.pro b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/proguard-rules.pro deleted file mode 100644 index 551eb41da..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/proguard-rules.pro +++ /dev/null @@ -1,14 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# react-native-reanimated --keep class com.swmansion.reanimated.** { *; } --keep class com.facebook.react.turbomodule.** { *; } - -# Add any project specific keep options here: diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/debug/AndroidManifest.xml b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/debug/AndroidManifest.xml deleted file mode 100644 index 3ec2507ba..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/AndroidManifest.xml b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index a2302a100..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/java/org/hyperledger/ariesaskar/example/MainActivity.kt b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/java/org/hyperledger/ariesaskar/example/MainActivity.kt deleted file mode 100644 index 327d7850b..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/java/org/hyperledger/ariesaskar/example/MainActivity.kt +++ /dev/null @@ -1,61 +0,0 @@ -package org.hyperledger.ariesaskar.example - -import android.os.Build -import android.os.Bundle - -import com.facebook.react.ReactActivity -import com.facebook.react.ReactActivityDelegate -import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled -import com.facebook.react.defaults.DefaultReactActivityDelegate - -import expo.modules.ReactActivityDelegateWrapper - -class MainActivity : ReactActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - // Set the theme to AppTheme BEFORE onCreate to support - // coloring the background, status bar, and navigation bar. - // This is required for expo-splash-screen. - setTheme(R.style.AppTheme); - super.onCreate(null) - } - - /** - * Returns the name of the main component registered from JavaScript. This is used to schedule - * rendering of the component. - */ - override fun getMainComponentName(): String = "main" - - /** - * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate] - * which allows you to enable New Architecture with a single boolean flags [fabricEnabled] - */ - override fun createReactActivityDelegate(): ReactActivityDelegate { - return ReactActivityDelegateWrapper( - this, - BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, - object : DefaultReactActivityDelegate( - this, - mainComponentName, - fabricEnabled - ){}) - } - - /** - * Align the back button behavior with Android S - * where moving root activities to background instead of finishing activities. - * @see onBackPressed - */ - override fun invokeDefaultOnBackPressed() { - if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) { - if (!moveTaskToBack(false)) { - // For non-root activities, use the default implementation to finish them. - super.invokeDefaultOnBackPressed() - } - return - } - - // Use the default back button implementation on Android S - // because it's doing more than [Activity.moveTaskToBack] in fact. - super.invokeDefaultOnBackPressed() - } -} diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/java/org/hyperledger/ariesaskar/example/MainApplication.kt b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/java/org/hyperledger/ariesaskar/example/MainApplication.kt deleted file mode 100644 index 44cd4dca9..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/java/org/hyperledger/ariesaskar/example/MainApplication.kt +++ /dev/null @@ -1,55 +0,0 @@ -package org.hyperledger.ariesaskar.example - -import android.app.Application -import android.content.res.Configuration - -import com.facebook.react.PackageList -import com.facebook.react.ReactApplication -import com.facebook.react.ReactNativeHost -import com.facebook.react.ReactPackage -import com.facebook.react.ReactHost -import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load -import com.facebook.react.defaults.DefaultReactNativeHost -import com.facebook.soloader.SoLoader - -import expo.modules.ApplicationLifecycleDispatcher -import expo.modules.ReactNativeHostWrapper - -class MainApplication : Application(), ReactApplication { - - override val reactNativeHost: ReactNativeHost = ReactNativeHostWrapper( - this, - object : DefaultReactNativeHost(this) { - override fun getPackages(): List { - // Packages that cannot be autolinked yet can be added manually here, for example: - // packages.add(new MyReactNativePackage()); - return PackageList(this).packages - } - - override fun getJSMainModuleName(): String = ".expo/.virtual-metro-entry" - - override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG - - override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED - override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED - } - ) - - override val reactHost: ReactHost - get() = ReactNativeHostWrapper.createReactHost(applicationContext, reactNativeHost) - - override fun onCreate() { - super.onCreate() - SoLoader.init(this, false) - if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { - // If you opted-in for the New Architecture, we load the native entry point for this app. - load() - } - ApplicationLifecycleDispatcher.onApplicationCreate(this) - } - - override fun onConfigurationChanged(newConfig: Configuration) { - super.onConfigurationChanged(newConfig) - ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig) - } -} diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-hdpi/splashscreen_image.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-hdpi/splashscreen_image.png deleted file mode 100644 index c52c2c680..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-hdpi/splashscreen_image.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-mdpi/splashscreen_image.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-mdpi/splashscreen_image.png deleted file mode 100644 index c52c2c680..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-mdpi/splashscreen_image.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png deleted file mode 100644 index c52c2c680..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png deleted file mode 100644 index c52c2c680..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png deleted file mode 100644 index c52c2c680..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable/rn_edit_text_material.xml b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable/rn_edit_text_material.xml deleted file mode 100644 index 5c25e728e..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable/rn_edit_text_material.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable/splashscreen.xml b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable/splashscreen.xml deleted file mode 100644 index c8568e162..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/drawable/splashscreen.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 3941bea9b..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 3941bea9b..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 0a61c1b27..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index ac03dbf69..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 26deb9725..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index fd1a2c712..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index e1173a94d..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 4d3ac7a4e..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index d57caa303..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index ff086fdc3..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 95ac5824e..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 0a07e73ac..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index f7f1d0690..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 6508f7420..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 499e372bd..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 49a464ee3..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index d54716bfa..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values-night/colors.xml b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values-night/colors.xml deleted file mode 100644 index 3c05de5be..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values-night/colors.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values/colors.xml b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values/colors.xml deleted file mode 100644 index f387b9011..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - #ffffff - #ffffff - #023c69 - #ffffff - \ No newline at end of file diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values/strings.xml b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values/strings.xml deleted file mode 100644 index ba497ca61..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - aries-askar-react-native-example - contain - false - \ No newline at end of file diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values/styles.xml b/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values/styles.xml deleted file mode 100644 index f03e23f85..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/build.gradle b/wrappers/javascript/packages/aries-askar-react-native-example/android/build.gradle deleted file mode 100644 index 932bf7b34..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext { - buildToolsVersion = findProperty('android.buildToolsVersion') ?: '34.0.0' - minSdkVersion = Integer.parseInt(findProperty('android.minSdkVersion') ?: '23') - compileSdkVersion = Integer.parseInt(findProperty('android.compileSdkVersion') ?: '34') - targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: '34') - kotlinVersion = findProperty('android.kotlinVersion') ?: '1.9.23' - - ndkVersion = "26.1.10909125" - } - repositories { - google() - mavenCentral() - } - dependencies { - classpath('com.android.tools.build:gradle') - classpath('com.facebook.react:react-native-gradle-plugin') - classpath('org.jetbrains.kotlin:kotlin-gradle-plugin') - } -} - -apply plugin: "com.facebook.react.rootproject" - -allprojects { - repositories { - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url(new File(['node', '--print', "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim(), '../android')) - } - maven { - // Android JSC is installed from npm - url(new File(['node', '--print', "require.resolve('jsc-android/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim(), '../dist')) - } - - google() - mavenCentral() - maven { url 'https://www.jitpack.io' } - } -} diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/gradle.properties b/wrappers/javascript/packages/aries-askar-react-native-example/android/gradle.properties deleted file mode 100644 index 41b173c48..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/gradle.properties +++ /dev/null @@ -1,56 +0,0 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m -org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true - -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true - -# Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true - -# Use this property to specify which architecture you want to build. -# You can also override it from the CLI using -# ./gradlew -PreactNativeArchitectures=x86_64 -reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 - -# Use this property to enable support to the new architecture. -# This will allow you to use TurboModules and the Fabric render in -# your application. You should enable this flag either if you want -# to write custom TurboModules/Fabric components OR use libraries that -# are providing them. -newArchEnabled=false - -# Use this property to enable or disable the Hermes JS engine. -# If set to false, you will be using JSC instead. -hermesEnabled=true - -# Enable GIF support in React Native images (~200 B increase) -expo.gif.enabled=true -# Enable webp support in React Native images (~85 KB increase) -expo.webp.enabled=true -# Enable animated webp support (~3.4 MB increase) -# Disabled by default because iOS doesn't support animated webp -expo.webp.animated=false - -# Enable network inspector -EX_DEV_CLIENT_NETWORK_INSPECTOR=true - -# Use legacy packaging to compress native libraries in the resulting APK. -expo.useLegacyPackaging=false diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/gradle/wrapper/gradle-wrapper.jar b/wrappers/javascript/packages/aries-askar-react-native-example/android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index d64cd4917..000000000 Binary files a/wrappers/javascript/packages/aries-askar-react-native-example/android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/gradle/wrapper/gradle-wrapper.properties b/wrappers/javascript/packages/aries-askar-react-native-example/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 2ea3535dc..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/gradlew b/wrappers/javascript/packages/aries-askar-react-native-example/android/gradlew deleted file mode 100755 index 1aa94a426..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/gradlew.bat b/wrappers/javascript/packages/aries-askar-react-native-example/android/gradlew.bat deleted file mode 100644 index 7101f8e46..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/wrappers/javascript/packages/aries-askar-react-native-example/android/settings.gradle b/wrappers/javascript/packages/aries-askar-react-native-example/android/settings.gradle deleted file mode 100644 index 1838faa30..000000000 --- a/wrappers/javascript/packages/aries-askar-react-native-example/android/settings.gradle +++ /dev/null @@ -1,18 +0,0 @@ -rootProject.name = 'aries-askar-react-native-example' - -dependencyResolutionManagement { - versionCatalogs { - reactAndroidLibs { - from(files(new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim(), "../gradle/libs.versions.toml"))) - } - } -} - -apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle"); -useExpoModules() - -apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim(), "../native_modules.gradle"); -applyNativeModulesSettingsGradle(settings) - -include ':app' -includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle-plugin/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile()) diff --git a/wrappers/javascript/packages/aries-askar-react-native/android/src/main/java/id/animo/SecureEnvironment.java b/wrappers/javascript/packages/aries-askar-react-native/android/src/main/java/id/animo/SecureEnvironment.java new file mode 100644 index 000000000..68031471e --- /dev/null +++ b/wrappers/javascript/packages/aries-askar-react-native/android/src/main/java/id/animo/SecureEnvironment.java @@ -0,0 +1,5 @@ +package id.animo; + +public class SecureEnvironment { + public static native void set_env(); +} diff --git a/wrappers/javascript/packages/aries-askar-react-native/android/src/main/java/org/hyperledger/ariesaskar/AriesAskarModule.java b/wrappers/javascript/packages/aries-askar-react-native/android/src/main/java/org/hyperledger/ariesaskar/AriesAskarModule.java index b7653ae81..790e836ed 100644 --- a/wrappers/javascript/packages/aries-askar-react-native/android/src/main/java/org/hyperledger/ariesaskar/AriesAskarModule.java +++ b/wrappers/javascript/packages/aries-askar-react-native/android/src/main/java/org/hyperledger/ariesaskar/AriesAskarModule.java @@ -4,23 +4,21 @@ import androidx.annotation.Keep; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.bridge.JavaScriptContextHolder; -import com.facebook.react.bridge.ReactContextBaseJavaModule; +import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContext; +import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactMethod; -import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.turbomodule.core.CallInvokerHolderImpl; -import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder; + +import id.animo.SecureEnvironment; @Keep @DoNotStrip public class AriesAskarModule extends ReactContextBaseJavaModule { static { - System.loadLibrary("ariesaskarreactnative"); + System.loadLibrary("ariesaskarreactnative"); } public static final String NAME = "AriesAskar"; @@ -41,16 +39,16 @@ public String getName() { @ReactMethod(isBlockingSynchronousMethod = true) public boolean install() { - try { - System.loadLibrary("ariesaskarreactnative"); - ReactContext context = getReactApplicationContext(); - long jsContextPointer = context.getJavaScriptContextHolder().get(); - CallInvokerHolderImpl holder = (CallInvokerHolderImpl) context.getCatalystInstance().getJSCallInvokerHolder(); - installNative(jsContextPointer, holder); - return true; - } catch (Exception exception) { - Log.e(NAME, "Failed to install JSI Bindings!", exception); - return false; - } + try { + SecureEnvironment.set_env(); + ReactContext context = getReactApplicationContext(); + long jsContextPointer = context.getJavaScriptContextHolder().get(); + CallInvokerHolderImpl holder = (CallInvokerHolderImpl) context.getCatalystInstance().getJSCallInvokerHolder(); + installNative(jsContextPointer, holder); + return true; + } catch (Exception exception) { + Log.e(NAME, "Failed to install JSI Bindings!", exception); + return false; + } } } diff --git a/wrappers/javascript/packages/aries-askar-react-native/cpp/ariesAskar.cpp b/wrappers/javascript/packages/aries-askar-react-native/cpp/ariesAskar.cpp index e32d56228..864877e80 100644 --- a/wrappers/javascript/packages/aries-askar-react-native/cpp/ariesAskar.cpp +++ b/wrappers/javascript/packages/aries-askar-react-native/cpp/ariesAskar.cpp @@ -598,7 +598,7 @@ jsi::Value keyFromSeed(jsi::Runtime &rt, jsi::Object options) { jsi::Value keyGenerate(jsi::Runtime &rt, jsi::Object options) { auto algorithm = jsiToValue(rt, options, "algorithm"); - auto keyBackend = jsiToValue(rt, options, "keyBackend"); + auto keyBackend = jsiToValue(rt, options, "keyBackend", true); auto ephemeral = jsiToValue(rt, options, "ephemeral"); LocalKeyHandle out;