From 4fbfb2875dcbe4d7b4655c21ea80777afd5106d5 Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 11 Oct 2023 12:03:51 -0700 Subject: [PATCH] stage --- .../java/ai/picovoice/rhino/exception/RhinoException.java | 2 -- binding/android/RhinoTestApp/build.gradle | 6 ++++++ binding/android/RhinoTestApp/rhino-test-app/build.gradle | 2 +- demo/android/Activity/build.gradle | 6 ++++++ demo/android/Activity/rhino-activity-demo-app/build.gradle | 7 +------ .../src/main/java/ai/picovoice/rhinodemo/MainActivity.java | 6 +----- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/binding/android/Rhino/rhino/src/main/java/ai/picovoice/rhino/exception/RhinoException.java b/binding/android/Rhino/rhino/src/main/java/ai/picovoice/rhino/exception/RhinoException.java index d3f614e0..288db3b2 100644 --- a/binding/android/Rhino/rhino/src/main/java/ai/picovoice/rhino/exception/RhinoException.java +++ b/binding/android/Rhino/rhino/src/main/java/ai/picovoice/rhino/exception/RhinoException.java @@ -47,8 +47,6 @@ public String getMessage() { for (int i = 0; i < messageStack.length; i++) { sb.append(String.format("\n [%d] %s", i, messageStack[i])); } - } else { - sb.append("."); } } return sb.toString(); diff --git a/binding/android/RhinoTestApp/build.gradle b/binding/android/RhinoTestApp/build.gradle index bdc4b580..9b5cae1c 100644 --- a/binding/android/RhinoTestApp/build.gradle +++ b/binding/android/RhinoTestApp/build.gradle @@ -7,6 +7,9 @@ buildscript { repositories { google() mavenCentral() + maven { + url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1264/' + } } dependencies { @@ -24,6 +27,9 @@ allprojects { repositories { google() mavenCentral() + maven { + url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1264/' + } } } diff --git a/binding/android/RhinoTestApp/rhino-test-app/build.gradle b/binding/android/RhinoTestApp/rhino-test-app/build.gradle index da7f012a..57947ec2 100644 --- a/binding/android/RhinoTestApp/rhino-test-app/build.gradle +++ b/binding/android/RhinoTestApp/rhino-test-app/build.gradle @@ -145,7 +145,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'com.google.code.gson:gson:2.10' - implementation 'ai.picovoice:rhino-android:2.2.2' + implementation 'ai.picovoice:rhino-android:3.0.0' // Espresso UI Testing androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/demo/android/Activity/build.gradle b/demo/android/Activity/build.gradle index bdc4b580..9b5cae1c 100644 --- a/demo/android/Activity/build.gradle +++ b/demo/android/Activity/build.gradle @@ -7,6 +7,9 @@ buildscript { repositories { google() mavenCentral() + maven { + url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1264/' + } } dependencies { @@ -24,6 +27,9 @@ allprojects { repositories { google() mavenCentral() + maven { + url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1264/' + } } } diff --git a/demo/android/Activity/rhino-activity-demo-app/build.gradle b/demo/android/Activity/rhino-activity-demo-app/build.gradle index f52f475d..92e06aad 100644 --- a/demo/android/Activity/rhino-activity-demo-app/build.gradle +++ b/demo/android/Activity/rhino-activity-demo-app/build.gradle @@ -11,11 +11,6 @@ android { targetSdkVersion defaultTargetSdkVersion versionCode 1 versionName "1.0" - testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' - - resValue 'string', 'pvTestingAccessKey', properties.getProperty("pvTestingAccessKey", "") - resValue 'string', 'numTestIterations', properties.getProperty("numTestIterations", "") - resValue 'string', 'performanceThresholdSec', properties.getProperty("performanceThresholdSec", "") } buildTypes { release { @@ -85,7 +80,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'com.google.code.gson:gson:2.10' - implementation 'ai.picovoice:rhino-android:2.2.2' + implementation 'ai.picovoice:rhino-android:3.0.0' } afterEvaluate { diff --git a/demo/android/Activity/rhino-activity-demo-app/src/main/java/ai/picovoice/rhinodemo/MainActivity.java b/demo/android/Activity/rhino-activity-demo-app/src/main/java/ai/picovoice/rhinodemo/MainActivity.java index b87b1330..9fcd4882 100644 --- a/demo/android/Activity/rhino-activity-demo-app/src/main/java/ai/picovoice/rhinodemo/MainActivity.java +++ b/demo/android/Activity/rhino-activity-demo-app/src/main/java/ai/picovoice/rhinodemo/MainActivity.java @@ -119,11 +119,7 @@ private void initRhino() { Log.i("RhinoManager", rhinoManager.getContextInformation()); } catch (RhinoInvalidArgumentException e) { - onRhinoError( - String.format( - "%s\nMake sure your AccessKey '%s' is a valid access key.", - e.getMessage(), - ACCESS_KEY)); + onRhinoError(e.getMessage()); } catch (RhinoActivationException e) { onRhinoError("AccessKey activation error"); } catch (RhinoActivationLimitException e) {